Commit Graph

493 Commits

Author SHA1 Message Date
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
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 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 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
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
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 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 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 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 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
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 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
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
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 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
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 70802022bb revid/revid.go MPEG lexer enabled and encoder options set for v4l 2019-12-04 11:40:12 +10:30
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
scruzin 7aa774a6c7 Make audio platform specific. 2019-11-22 13:22:23 +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 91e5e765f5 fix webcam bug and also consider webcam Input var value 2019-11-13 14:11:29 +10:30
Saxon 866e398496 revid: move processFrom func and deletec inputs.go file
inputs.go can now go considering it only held "start functions" which have been replaced
by the AVDevice and it's implementations.
2019-11-13 14:11:29 +10:30
Saxon dec39a3636 revid: now using AVDevice implementations
Also renamed constructors of devices to reduce stutter e.g. raspivid.NewRaspivid to
raspivid.New
2019-11-13 14:11:29 +10:30
Saxon fa5585271e revid: audio input meta addition moved to Revid.setupPipeline() 2019-11-09 22:49:04 +10:30
Saxon 57d73a8d0a created av/device package and sub packages raspivid, geovision, webcam and file
av/device/device.go now contains the AVDevice interface and implementations of this
interface, namely, raspivid, geovision, webcam and file are contained in the packages
av/device/raspivid, av/device/geovision, av/device/webcam and av/device/file
respctively. config.go and testing was also moved to a new package called config.go in
order to remove would be circular dependency between AVDevice implementations and revid.
Modifications were made elsewhere expecting config.Config to be part of the revid package.
2019-11-06 17:44:50 +10:30
Saxon 924858c1c0 revid: added raspivid.go file to hold Raspivid implementation of AVDevice interface
Wrote consts for default values, wrote global errors, wrote multiError type (might move)
wrote Set method.
2019-11-01 21:49:30 +10:30
Saxon 47f6dcfe51 codec/h264/extract.go: extracter->extractor everywhere 2019-10-28 08:41:49 +10:30
Saxon 7dac9799be revid/revid.go: break if the given saturation or brightness vars are invalid 2019-10-26 08:24:53 +10:30
Saxon f1c0fc1dbf revid: created CameraChan config field to allow selection of GeoVision camera channel 2019-10-25 12:12:30 +10:30
Saxon 38cfad7b67 revid: fixing some more bugs
Fixed H264 RTP extractor. Fine tuned some timing regarding geovision setup. Added some more
logging to geovision setup.
2019-10-23 12:48:22 +10:30
Saxon f336a03d7a revid: general bug fixing
Use http instead of https in gvctrl getLogin request. Gave RTP client a close method so that the conn can
be closed after we're done with the client. Put timeout on reading from the RTP client PacketConn so that
we don't hang on the ReadFrom call if the conn is closed. Closing the RTSP and RTP clients when
startRTSPCamera is returned.
2019-10-22 23:04:33 +10:30
Saxon 504179c03b revid: added code to deal with Input var 2019-10-22 16:17:35 +10:30
Saxon 8c1c192218 revid: revid config to update geovision configuration using gvctrl
Added required new params to config structure, and therefore also added new defaults and validation checking.
Also updated revid's update func so that we can control new parameters using vars. Now using gvctrl in
startRTSPCamera function and interpreting revid config to configure camera.
2019-10-22 14:54:38 +10:30
Saxon 8837dce389 revid: write timeouts for ringbuffer are just int to avoid overflow when converting duration to int on pi for the purpose of logging 2019-10-15 11:02:28 +10:30
Saxon Milton 5642af9cc5 Merged in gv-h264-rtmp-fix (pull request #262)
revid: fix GeoVision H264 over RTMP to youtube

Approved-by: Alan Noble <anoble@gmail.com>
2019-10-12 10:43:16 +00:00
Saxon 874b9639cf revid: made RTMP and MTS sender ring buffer write timeouts configurable 2019-10-12 21:10:48 +10:30
Saxon 8489d615d8 revid: panic if invalid input, or invalid input codec for corresponding input 2019-10-12 20:54:32 +10:30
Saxon fc4e88bce6 fixed bugs causing problems with GeoVision H264 RTMP to youtube streaming.
Two fixes were involved, firstly, access unit delimeters were used to denote access units and the Write timeout on rtmpSender's ringBuffer was
increased to stop the 'unable to dump old write' errors. Also made some small changes elsewhere that should fix future issues, particular with
MTS output.
2019-10-07 14:18:20 +10:30
Saxon 6df95886dd revid: using mutex to synchronise usage of Start and Stop 2019-10-01 23:44:38 +09:30
Saxon a37b250e3c revid: moved code relating to inputs to separate file called inputs.go 2019-09-25 11:30:56 +09:30
Saxon 38f2d691cf revid: now using correct consts to indicate codec 2019-09-24 17:35:17 +09:30