Commit Graph

1148 Commits

Author SHA1 Message Date
Saxon Milton 3a076cd9c0 Merged in sort-out-rb-capacity (pull request #397)
revid: get rid of output specific ring buffer parameters and use only RBCapacity and RBWriteTimeout

Approved-by: Trek Hopton <trek.hopton@gmail.com>
2020-04-27 03:49:23 +00:00
Saxon Nelson-Milton 4d5a85b853 revid/senders.go: remember previously adjusted RB element sizes 2020-04-10 17:32:44 +01:00
Saxon Nelson-Milton 2bfb4d6b95 revid: fix logging control
Setting log level at end of Revid.setConfig. Revid variable Logging to logging.
2020-04-10 16:22:04 +01:00
Saxon Milton cc467243ea revid/senders.go: reduce max buff len 2020-04-10 07:05:45 +00:00
Saxon c0614c3456 revid: reverted to fixed element size ring buffer 2020-04-09 15:55:01 +09:30
Saxon Milton 09a763728e Merged in h265-lex-to-extract (pull request #392)
codec/h265: rename Lexer to Extractor

Approved-by: Trek Hopton <trek.hopton@gmail.com>
2020-03-29 00:29:47 +00:00
Saxon Milton f9dc1d0139 Merged in remove-logging-pkg-prefix (pull request #393)
revid: no longer prepending package name before log messagges

Approved-by: Trek Hopton <trek.hopton@gmail.com>
2020-03-29 00:28:45 +00:00
Saxon b8a135e0d0 revid/config: adding Bitrate to TypeData map 2020-03-28 01:10:28 +10:30
Saxon f1c1339e9f revid: no longer prepending package name before log messagges 2020-03-28 01:08:09 +10:30
Saxon 7afc71b33e revid: using h265.Extractor instead of h265.Lexer 2020-03-28 00:45:46 +10:30
Saxon 8f5ee3184b revid: added ring buffer write timeout to TestMtsSenderDiscontinuity 2020-03-27 23:56:36 +10:30
Saxon Milton 0fa50d1a46 Merged in improve-logging (pull request #389)
Improve debug and info logging quality and frequency

* cmd/rv: added some more debug and info logging

* revid: improving logging in revid.go

* revid: improved logging in senders.go

* revid: don't need to set log level as netsender does it

* added some extract log messages

Approved-by: Trek Hopton <trek.hopton@gmail.com>
2020-03-27 12:20:51 +00:00
Scott 8f589c8cff revid/config: add package comments to config package 2020-02-26 14:32:08 +10:30
Scott Barnard 24a4654f6b Merged in time-filter (pull request #379)
filter: time based motion filter

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-02-17 00:04:13 +00:00
Scott 57b3f53bf3 filter: time based filter for overcoming discontinuities
When the filter has short discontinuities in detection, those frames are sent so that the video is more continuous.
2020-02-17 09:41:07 +10:30
Saxon Milton e312bca992 Merged in validate-before-set (pull request #378)
revid/config/parameter: validate set val passed and then only if good we set receiver

Approved-by: kortschak <dan@kortschak.io>
2020-02-16 22:25:43 +00:00
Saxon Milton 81aa35b586 Merged in parameter-implementations (pull request #376)
revid/config/parameter: wrote code for the generation of Parameter interface implementations and commit resulting code

Using a template, code has been created to generate repetitive implementations of an interface name Parameter. The code iterates through a list of params and creates implementations for each one.

Approved-by: Scott Barnard <scott@ausocean.org>
2020-02-12 00:27:08 +00:00
Scott fa15d92388 filter: Difference → Diff 2020-02-10 15:29:20 +10:30
Scott 5f02bb3829 filter: combine common filter variables 2020-02-07 14:34:43 +10:30
Scott Barnard bb5618f3c7 Merged in filter-debug-tag (pull request #370)
filter: use build tags to separate debug code from release code

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-02-07 03:20:46 +00:00
Scott 7192c392b2 revid: remove cmd field from revid struct 2020-02-05 09:49:21 +10:30
Scott 86ec511697 revid: remove ShowWindows variable 2020-02-04 13:32:45 +10:30
Scott b6d6090e25 filter: implement debug builds for basic motion filter 2020-02-04 13:22:15 +10:30
Scott 5917f35ccd filter: use build tags to separate debug code from release code 2020-02-04 13:22:15 +10:30
Scott 72a5c31588 filter: add option to reduce resolution of frames for KNN motion filter
This makes the same changes as for the MOG but for the KNN filter.
2020-02-04 11:47:24 +10:30
Scott 10bfc296be filter: add option to reduce resolution of frames for MOG motion filter
A new netsender variable, FilterDownscaling is used for reducing the resolution of frames within the MOG motion filter.
This does not affect the resolution of the video output, it is only used to speed up calculations.
A FilterDownscaling factor of 2 is equivalent to skipping every 2nd pixel in the image.
2020-02-04 11:47:09 +10:30
Ella Pietraroia c90cc40949 Merged in basic-filter (pull request #366)
Basic filter

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-02-03 07:04:59 +00:00
Ella Pietraroia 02777c4dd5 filter: change names so that they don't have filter in them 2020-02-03 10:14:33 +10:30
Ella Pietraroia 2c947edc2b iteration error fix 2020-01-31 15:23:18 +10:30
Scott 5502eea661 revid: remove Burst method's duration parameter 2020-01-31 14:31:17 +10:30
Ella Pietraroia e107b682bb NewBasicFilter to NewBasic as we already know its a filter 2020-01-31 14:23:33 +10:30
Ella Pietraroia d8c611de52 double newKNNFilter fix 2020-01-31 11:19:47 +10:30
Ella Pietraroia bf71d8b4a1 added 4x goroutines with mutex lock and waitgroups 2020-01-31 11:11:03 +10:30
Ella Pietraroia ed35bd83cb basic filter that does not use gocv for motion detection 2020-01-31 11:11:00 +10:30
Scott 054f0a5e77 revid: add Burst method to revid 2020-01-30 13:20:44 +10:30
Saxon a0204392c5 cmd/rvcl: added command line interface for controlling revid API 2020-01-29 09:59:06 +10:30
Scott Barnard f9d33f008e Merged in consistent-config-msgs (pull request #357)
revid/config: make config error messages more consistent

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-01-28 22:48:55 +00:00
Scott 5951dbcd2b revid/config: FileFps → FileFPS
This corrects the case of the FileFPS string literal.
2020-01-29 09:17:58 +10:30
Scott 5ff90e4411 make config error messages more consistent 2020-01-28 16:09:16 +10:30
Saxon ed626e02ab cmd/rv: did some cleaning and commenting
Modified profile.go file header. Updated binary name in run.sh.
2020-01-27 15:50:24 +10:30
Saxon 7033d62cc6 cmd/rv: created new revid binary that is only netsender client, not CLI as well 2020-01-27 13:55:09 +10:30
Saxon cae7e55723 revid/revid.go: added handling for FileFPS var from vidgrind 2020-01-27 13:54:43 +10:30
Scott Barnard 755545c80b Merged in frame-diff-filter (pull request #347)
Simple difference filter using gocv.

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-01-27 00:58:24 +00:00
Scott e0fa474906 filter: DiffFilter → Difference 2020-01-27 10:51:06 +10:30
Scott ced8727c07 filter: create a simple difference motion filter using gocv 2020-01-27 10:50:27 +10:30
Scott Barnard 2084753985 Merged in bitrate-calc (pull request #336)
Bitrate calculations in revid.

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-01-27 00:16:26 +00:00
Saxon cfd3f0fc3c revid: consider when r.cfg.FileFPS ==0 2020-01-25 10:15:27 +10:30
Saxon a0a99e17db revid/revid.go: logging unexpected EOF from input source 2020-01-25 09:42:32 +10:30
Saxon f82ab42246 revid & cmd/revid-cli: InputFPS field now FileFPS and added check so that only used with File input 2020-01-25 09:39:42 +10:30
Saxon 64754f7e0f revid: use loop in processFrom instead of goto 2020-01-24 21:58:57 +10:30
Saxon 4e7e5ebca3 revid/revid.go: cleaned up prcoessFrom (added deger for waitgroup.Done and added info log) 2020-01-24 20:15:40 +10:30
Saxon 0f5aaf6cb5 revid & cmd/revid-cli: added InputFPS config.Config field
The InputFPS field can control rate at which we lex frames from the input source. This has
not been a useful feature until now; we now want to simulate realtime input device using file
input. This requires firstly the Loop mode, and now also realistic input rate.
2020-01-24 20:05:43 +10:30
Saxon 99b931f948 revid & cmd/revid-cli: added loop mode so that input may be restarted after completion
Loop flag has been added to command line flags and in turn sets the Loop field that has been
added to the config.Config struct. mode variable now also checked to see if value set to
Loop, in which case revid config.Config.Loop = true. Revid.processFrom modified so that
when input source has completed Revid.cfg.Loop is checked and input restarted if true.
2020-01-24 19:21:18 +10:30
Scott 1876fe9dea Added bitrate reporting to RTP sender. 2020-01-24 15:46:14 +10:30
Scott cdd74c7a22 revid/senders.go: reportSent -> report 2020-01-24 15:46:14 +10:30
Scott 9a0fa09879 revid/senders.go,revid.go: Added bitrate calculations to revid. 2020-01-24 15:46:14 +10:30
Saxon Milton c2329b3a3f Merged in lexers-return-ioeof (pull request #330)
codec: lexers return ioeof

Approved-by: Alan Noble <anoble@gmail.com>
Approved-by: kortschak <dan@kortschak.io>
2020-01-23 03:23:03 +00:00
Scott 207e96b999 KNN filter detects motion on an interval 2020-01-23 12:45:00 +10:30
Scott 3c0076751e Fixed variables 2020-01-23 12:15:07 +10:30
Ella Pietraroia 92b2040360 Merged in less-frames (pull request #343)
Less frames

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-01-22 05:35:25 +00:00
Ella Pietraroia c3f1d957e3 formatting 2020-01-22 15:43:10 +10:30
Ella Pietraroia 963b74bed0 change variable name FilterFrames to MotionFilter 2020-01-22 14:57:35 +10:30
Saxon 9b8667e56c fixed handling of errors from lex methods 2020-01-22 13:45:01 +10:30
Ella Pietraroia d5e0bf7731 remove all tests 2020-01-20 16:19:04 +10:30
Saxon 2d2e1b0ad1 revid/revid.go: added logger message back 2020-01-20 16:10:10 +10:30
Scott eea0f2d9dc revid/config/config.go: added vartype mode 2020-01-20 11:51:30 +10:30
Saxon 399ecb8874 revid: do more thinking about errors in processFrom 2020-01-17 16:23:28 +10:30
Ella Pietraroia 61bb0b68f6 adding staright to file testing in, need to remove 2020-01-16 15:57:57 +10:30
Ella Pietraroia b0dd41dcf0 back to no testing 2020-01-16 14:39:44 +10:30
Alan Noble 3a743ea917 revid/config/config.go: reverted incorrect change 2020-01-15 13:58:51 +10:30
Alan Noble ea42a532d7 Merge branch 'master' of https://bitbucket.org/ausocean/av 2020-01-15 13:47:37 +10:30
Alan Noble 4bfad21003 revid/config/config.go: fixed typo in outputs data type (enums->enum) 2020-01-15 13:46:56 +10:30
Ella Pietraroia 6f16f68611 adding variable to choose how many frames to skip before filtering 2020-01-13 10:49:01 +10:30
Ella Pietraroia b39a440105 making mog filter that only dectects motion on every 5 frame (will make this a var) 2020-01-13 10:49:01 +10:30
Scott 6d2c58cd66 CameraIP variable added 2020-01-09 15:28:49 +10:30
Saxon 78bb0db323 revid: removed comment no longer needed 2020-01-09 14:04:37 +10:30
Saxon d90d2203bd revid: only using one set of ring buffer parameters rather than MTS and RTMP 2020-01-09 13:58:44 +10:30
Saxon 7086960e66 revid/revid.go: fixed ring buffer related string literal confusion 2020-01-09 13:38:23 +10:30
Saxon 0f9eba4bb1 revid/config/config.go: updated ring buffer variable names in TypeData map 2020-01-09 13:38:23 +10:30
Saxon e9bd2fc0d1 revid: now using variable ring buffer 2020-01-09 13:31:03 +10:30
Scott 1b45c52379 Added motion filter variables. 2020-01-09 11:41:09 +10:30
Saxon Milton 36220e967f Merged in rtp-jpeg-extractor (pull request #289)
codec/mjpeg: RTP/JPEG extractor

Approved-by: Alan Noble <anoble@gmail.com>
2020-01-07 04:43:07 +00:00
Ella Pietraroia ba1c304281 no looging messages 2020-01-07 13:44:48 +10:30
Ella Pietraroia 492e5025de revid/revid.go adding info messages 2020-01-07 11:10:04 +10:30
Ella Pietraroia 04b7a79055 revid/revid.go adding CBR=true for MJPEG encoded video for RaspiVid and RSTP 2020-01-07 10:45:45 +10:30
Saxon 2d824707ee Fixed bugs, now working 2020-01-03 17:15:06 +10:30
Ella Pietraroia b9df8e388a all mjpeg input codecs will have constant bitrate, as variable bitrate is only for h264 2020-01-03 16:47:38 +10:30
Scott 523dfab86b revid/config/config.go: Added full stop. 2020-01-02 17:05:50 +10:30
Scott d853860526 Added type data for filters variable 2020-01-02 16:14:37 +10:30
Scott f74e08d70a Filter safely closes. 2020-01-02 16:12:48 +10:30
Scott 15efc8331d Initial implementation 2020-01-02 16:12:48 +10:30
Scott Barnard c2df8a8fc1 Merged in enums-var-type (pull request #320)
Outputs variable uses the enums var type

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-01-02 05:41:42 +00:00
Scott 1f8ef44216 revid/config/config.go: Made string a const, removed redundant == true 2020-01-02 15:13:39 +10:30
Scott 442ad27e98 revid/config/config.go: Validation for ShowWindows, so that windows cannot be opened on the raspberry pi. 2020-01-02 15:03:43 +10:30
Scott 55981f8ae9 Made variable for showing windows 2020-01-02 13:48:23 +10:30
Scott d7fa1569a4 revid/revid.go: Disabled windows 2020-01-02 13:47:02 +10:30
Scott 90f448170f revid/revid.go: Full stops at the end of comments. 2020-01-02 13:38:31 +10:30
Scott cf51d07532 revid/revid.go: Separated const block into 3 sections 2020-01-02 13:35:03 +10:30
Scott c7fa55a993 revid/revid.go: Renamed constants to be more specific to the MOG filter 2020-01-02 13:27:38 +10:30
Scott 9d857b8a66 Created constants for the MOG filter 2020-01-02 13:25:21 +10:30
Scott 322ebcfa81 Outputs variable uses the enums var type 2020-01-02 10:24:58 +10:30
Ella Pietraroia 8ebfa0a7fb adding constants for the integer arguments 2019-12-31 15:21:34 +10:30
Ella Pietraroia 197fbcf242 chaning parameters of filter 2019-12-31 15:21:34 +10:30
Ella Pietraroia d44e795ea2 making new knn file, plus adding knn option into variables 2019-12-31 15:21:34 +10:30
Scott Barnard 7c42f9dc1b Merged in motion-filter-variable-fps (pull request #314)
Created motion filter that has a minimum frame rate.

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2019-12-31 03:59:52 +00:00
Scott Barnard edcb8090ff Merged in revid-output-var (pull request #312)
revid: Output var

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2019-12-31 03:56:13 +00:00
Scott 62af00ff4f PR changes #1 2019-12-31 10:54:13 +10:30
Scott 5286ded51f Small fixes and simplifications 2019-12-27 13:51:50 +10:30
Scott 9876b0cd35 Created motion filter that has a minimum frame rate. 2019-12-24 14:08:42 +10:30
Scott af2de3f938 Created singular Output var 2019-12-23 16:55:40 +10:30
Scott b8f70ddaa1 revid/config/config.go Changed case of logging variable. 2019-12-23 16:21:49 +10:30
Ella Pietraroia 51709d2fd3 Documentation comments 2019-12-23 12:01:27 +10:30
Ella Pietraroia 6d5acb8941 Documentation comments 2019-12-23 11:59:17 +10:30
Scott 7364174858 Filters shall close when revid stops.
The Stop method for revid calls the filter's Close method to free filter resources.
2019-12-20 15:37:49 +10:30
Scott cbe36f03b0 revid/revid.go Added MOGFilter as Filter option 2019-12-20 12:10:49 +10:30
Ella Pietraroia c4d809be27 Filter interface take 2
This branch was made because we were having problems with rebasing the original filter-interface branch. Filter-interface was used to make interface for filters and adding into pipeline made a new file (filter.go) that conatins package Filter. This package has the filter interface, with one filter, NoOp. More filters can be added. The filtering stage was placed inbetween lexing and encoding by changing the LexTo function to have the filter as it's destination and making the destination of the filter to be r.encoders
2019-12-20 10:42:51 +10:30
Ella Pietraroia a16d37f19e Merged in timebasedpsi (pull request #306)
making a time based psi method for when to send packets

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2019-12-19 03:54:40 +00:00
Scott d0adae710e PR fixes 2019-12-19 14:21:32 +10:30
Ella Pietraroia 0ec0a08e0e comments and some other small changes made to revid.go encoder.go and config.go 2019-12-19 11:15:47 +10:30
Ella Pietraroia 222864108f making a time based psi method for when to send packets
Added a case that allows packets to be sent by unit of time (in seconds) rather than by number of packets or nal methods. Also made a variable that can be changed in vidgrinder to choose the amount of time, called PsiTime
2019-12-19 09:56:24 +10:30
Scott b59b342bee revid/config/config.go Alphabetically ordered type data 2019-12-18 16:02:20 +10:30
Scott f00918a73d Revid uses netsender to report variable types
Variable type data kept in revid/config/config.go
Supports variadic new function in netsender
Updated revid to use iot v1.2.9
2019-12-18 09:34:04 +10:30
Scott c11444f043 FlipHorizontal & FlipVertical variables renamed 2019-12-06 16:36:29 +10:30
Frank Cui 73398f96a7 Merged in ParseInt-to-Atoi (pull request #297)
revid/revid.go: Replaced ParseInt with Atoi

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2019-12-05 09:36:42 +00:00
Frank Cui fe22d55050 revid/revid.go: Changed remaining ParseUint to Atio 2019-12-05 14:50:44 +10:30
Scott ad7af04f13 revid/revid.go Added file as a valid value to the input variable 2019-12-05 10:43:28 +10:30
Frank Cui 6e2dcc4b4d revid/revid.go: Replaced ParseInt with Atoi 2019-12-05 09:55:11 +10:30
Frank Cui f88c6fc096 revid/config: Simplfied LogLevel check 2019-12-05 09:30:51 +10:30
Scott Barnard 8fa9f7df48 Merged in revid-crash-file-input (pull request #294)
Revid crash on file input fixed

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2019-12-04 07:16:16 +00:00
Scott f8fc5156f1 revid/revid.go Revid crash on file input fixed
Now the file input has the lexer set to config's codec
2019-12-04 16:17:51 +10:30
Scott e116e197ae Changed all %v's to %w's where appropriate 2019-12-04 14:12:20 +10:30
Scott Barnard 94380ef17e Merged in mjpeg-output-v4l (pull request #292)
Mjpeg output v4l

Approved-by: Saxon Milton <saxon.milton@gmail.com>
2019-12-04 01:55:41 +00:00
Scott 70802022bb revid/revid.go MPEG lexer enabled and encoder options set for v4l 2019-12-04 11:40:12 +10:30
Frank Cui b49e722c0b revid/config.go: define max value for MinFrames 2019-12-03 16:00:58 +11:00
Saxon a6797a929d revid: defaulting to VBR for camera devices
Easiest way to do this is change VBR config field to CBR (therefore CBR defaults to false without having to do anything).
2019-11-22 17:38:30 +10:30
Alan Noble 41945c9868 Merged in additional-logging (pull request #283)
Log size along with ring buffer error

Approved-by: kortschak <dan@kortschak.io>
Approved-by: Saxon Milton <saxon.milton@gmail.com>
Approved-by: Alan Noble <anoble@gmail.com>
2019-11-22 03:28:05 +00:00
scruzin e233ac8fd8 Remove unused code. 2019-11-22 13:30:27 +10:30
scruzin d8ce6faa3c Remove unused package. 2019-11-22 13:27:25 +10:30
scruzin b67944b356 Fix name and remove comments. 2019-11-22 13:25:43 +10:30
scruzin 0cffead826 Remove unused package. 2019-11-22 13:25:24 +10:30
scruzin 7aa774a6c7 Make audio platform specific. 2019-11-22 13:22:23 +10:30
Alan Noble db02c8daa2 Log n with ring buffer errors (in addition to size). 2019-11-22 02:19:21 +00:00
scruzin 980e48c22c Log size along with ring buffer error. 2019-11-22 10:10:02 +10:30
Trek H cd63d0d95a alsa: unexported ringbuffer chunksize
Chunksize can be calculated without needing an ALSA device instance.

Added a DataSize function to pcm package for calculating size of pcm data given relevant attributes.

Removed ChunkSize from config revid config struct.

Changed NewByteLexer to accept an in rather than a pointer.
2019-11-13 19:56:13 +10:30
Saxon 9fc60a6842 revid: updated revid to use alsa package instead of audio (renamed audio->alsa) 2019-11-13 16:31:07 +10:30
Saxon 527472e934 revid/config/config.go: checking WriteRate as we need that for encoders 2019-11-13 14:11:29 +10:30
Saxon cf130de752 revid/config/config.go: need to check frame rate here too as revid needs it 2019-11-13 14:11:29 +10:30
Saxon 91e5e765f5 fix webcam bug and also consider webcam Input var value 2019-11-13 14:11:29 +10:30
Saxon 1a65dc9da4 fixing build errors and testing bugs + removed config_test.go as not relevant anymore 2019-11-13 14:11:29 +10:30
Saxon 0a059058a1 revid/config/config.go & config_test.go: simplified config and its validation
Not that alot of configuration is done by the device implementations, including validation,
we can remove alot of this from the config package here.
2019-11-13 14:11:29 +10:30