mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,876 Commits 320 Branches 50 Tags 119 MiB
Commit Graph

1101 Commits

Author SHA1 Message Date
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
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
Trek H b6dd737034 device: audio package name changed to alsa 
yobert/alsa imports changed to yalsa
directory and file names changed to reflect package name change
 2019-11-12 13:28:53 +10:30
Trek Hopton cbbf3deef8 Merged in audio-avdevice (pull request #277) 
Audio implementing AVDevice

Approved-by: Saxon Milton <saxon.milton@gmail.com>
Approved-by: Alan Noble <anoble@gmail.com>
 2019-11-11 12:13:42 +00:00
Trek H c4134fd30e audio: renamed ADPCMDevice to ALSA 2019-11-11 22:26:53 +10:30
Trek H 733785254e audio: renamed AudioDevice to ADPCMDevice 2019-11-11 19:39:10 +10:30
Trek H b66f415e1c audio: renamed Device to AudioDevice 2019-11-11 17:50:46 +10:30
Trek H 3df9300c1c audio: updated startAudioDevice to use AVDevice implementation 2019-11-11 17:05:10 +10:30
Saxon 6b5911633a revid/config/config.go: decrease default ring buffer size and increase MTS ring buffer element size 2019-11-11 14:32:24 +10:30
Saxon fa5585271e revid: audio input meta addition moved to Revid.setupPipeline() 2019-11-09 22:49:04 +10:30
Saxon ff54b40bd2 revid/inputs.go: using alias avconfig for revid/config package 2019-11-08 17:35:44 +10:30
Saxon 772c381293 device/geovision: renamed gvctrl package to config 2019-11-08 17:29:01 +10:30
Saxon 53dc629fb1 revid: sender ring buffers flush only if write was successful 2019-11-08 10:06:51 +10:30
Saxon 9314e0d32e revid/config/config.go: fixed constant names in comments for Input and Outputs fields of Config 2019-11-06 21:26:39 +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 9a93e92b50 revid/webcam.go: fixed error messages in Webcam.Stop 2019-11-06 11:31:12 +10:30
Saxon a02ea397d5 revid/geovision.go: fixed GeoVision constructor name, NewGeovision->NewGeoVision 2019-11-06 10:45:48 +10:30
Saxon bc7f450c5f revid: fixed AVDevice comment 2019-11-06 08:48:18 +10:30
Saxon a6aef125fd revid: cleaned up AVDevice implementations and added documentation to them 2019-11-05 20:14:04 +10:30
Saxon 50c7fe139b revid/file.go: wrote AVDevice implementation for file containing audio or video media 2019-11-05 12:36:27 +10:30
Saxon 81d168a277 revid/webcam.go: wrote implementations of Start, Stop and Read methods 2019-11-05 11:56:34 +10:30
Saxon 8302e959d9 revid/webcam.go: started writing implementation of AVDevice for webcams 2019-11-05 10:57:12 +10:30
Saxon 5afad9c5aa revid/geovision.go: wrote Read method implementation 2019-11-04 19:43:02 +10:30
Saxon ce8dc9a4b3 revid/geovision.go: wrote Stop method implementation 2019-11-04 19:27:05 +10:30
Saxon 1497f4a575 revid/geovision.go: wrote Start method implementation 2019-11-04 19:12:13 +10:30
Saxon bea4d46c72 revid/geovision.go: added geovision.go file and started geovision implementation of AVDevice interface 2019-11-04 15:47:18 +10:30
Saxon d5aa968a27 revid/geovision.go: created file geovision.go to hold geovision implementation of AVDevice and wrote Set function 2019-11-02 10:54:50 +10:30
Saxon 82903681ee revid/raspivid.go: wrote Stop implementation for Raspivid AVDevice implementation 2019-11-02 10:42:56 +10:30
Saxon b2a9dbf17d revid/raspivid.go: wrote Read implementatino for io.Reader interface 2019-11-02 10:36:55 +10:30
Saxon b554c2820a revid: wrote implementation of Start method for Raspivid implementation 2019-11-02 10:31:40 +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 20bf962fa3 revid: added AVDevice interface 2019-10-29 19:02:55 +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 2b52266407 revid/inputs.go: corrected ipCamPass value 2019-10-23 14:06:16 +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 ee1bea3f77 revid: fixed crash: converting durations to int before giving to logger as args 2019-10-15 10:52:48 +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