Commit Graph

944 Commits

Author SHA1 Message Date
Saxon e0039da2e4 cmd/revid-cli & revid: moved ringBuffer to earlier in pipeline
Removed packetization flag for revid-cli as no longer required.
Packetization will be decided based on outputs.
Removed buffer type definition and Write receiver func in
mtsSender_test.go as this is now defined in revid.go.
Made ringbuffer size and element size consisten no matter the
output methods, as we're now going to only be putting h264 in there.
Modified H264 lex function to take an io.Writer rather than an
Encoder.
Removed destination []loadSender slice from revids fields and
added an encoder []stream.Encoder slice to hold encoders used
during a particular configuration. Each encoder will write to
the desired outputs.
Modified logic regarding encoder and sender setup. We now check
what outputs we have and add encoders to revid's encoder slice
depending on what each output requires.
Modified outputClips routine such that it ranges through revid's
encoders and encodes to them. They then write to the senders and
they handle logic regarding the amount of data they send out
and when. They also handle actions to perform on send failures.
Wrote multiSender struct which will be written to from encoders.
It will then use it's senders to distribute the data accordingly
to senders that work with the encoding from said encoders.
Modified senders so that their load methods no longer take ring
chunks, but rather slices.
Modified senders such that their release methods no longer
perform chunk closing.
2019-03-09 15:28:07 +10:30
Saxon Milton cfb4946588 Merged in video-rotate (pull request #158)
Video rotate

Approved-by: Alan Noble <anoble@gmail.com>
2019-03-08 23:33:40 +00:00
scruzin 437470b53f Only dump stack for Fatal log messages. 2019-03-09 06:57:55 +10:30
scruzin db265404eb Skip if raspivid not present. 2019-03-08 20:43:01 +10:30
scruzin e0471d5e2c Initial revision. 2019-03-08 17:45:38 +10:30
Saxon 0962b1047d revid: removed udp sender and anything pertainent to it 2019-03-07 20:14:50 +10:30
Saxon 6fa9f37972 revid: remove ffmpegSender and any code pertaining to it. 2019-03-07 19:15:39 +10:30
Saxon Milton a7ae1aa643 revid: fixed raspivid flag usage for vertical and horizontal flipping - tested and working 2019-03-06 01:38:13 +00:00
Saxon 3a9e90dcf8 cmd/revid-cli & revid: added back vertical and horizontal flip options 2019-03-06 11:51:55 +10:30
Saxon Milton 768ea3a007 Merged in csv-output-var (pull request #160)
revid: handling csv output var in revid's update function

Approved-by: Alan Noble <anoble@gmail.com>
2019-03-05 06:44:27 +00:00
Saxon Milton 5280f037ca Merged in mts-chunking (pull request #146)
Mts chunking

Approved-by: kortschak <dan@kortschak.io>
2019-03-05 06:15:03 +00:00
Saxon 79d0dad757 revid: checking for changes to rtp address in vars now 2019-03-05 16:38:32 +10:30
Saxon 003808858b revid: handling csv output var in revid's update function 2019-03-05 10:50:31 +10:30
Saxon d9ca76159e Merge branch 'master' into mts-chunking 2019-03-04 15:01:41 +10:30
Saxon e06465e46b revid: config defaulting messages no longer warning level but rather info level 2019-03-04 12:47:57 +10:30
Saxon Milton 0767f41d4a revid: corrected spelling error in netreceiver var check 2019-03-04 01:52:39 +00:00
Saxon cfcb899bcb revid & cmd/revid-cli: rotate => rotation 2019-03-04 12:11:34 +10:30
Saxon 2d229077a2 revid & cmd/revid-cli: removed any mention of horizontal and vertical flip and replaced with rotate 2019-03-04 12:07:28 +10:30
Saxon 8606320731 revid: ignoring rtmp.ErrInvalidFlvTag error and checking that rtmp conn is not closed before we try to close it 2019-03-03 18:24:54 +10:30
Saxon 9c59c5b9d3 Merge branch 'master' into start-in-paused-state 2019-03-03 17:44:32 +10:30
Alan Noble b1dcb9d6a7 gofmt 2019-03-03 07:11:35 +00:00
Alan Noble 32280cb9d6 Declare error. 2019-03-03 07:09:50 +00:00
Alan Noble c15c57f15f Don't fail if Close() returns an error, since it just means there is no connection, and don't call Close when Dial fails. 2019-03-03 07:04:33 +00:00
Saxon 03f83032a5 revid: ignore error from close in rtmpSender.Restart() 2019-03-03 17:17:25 +10:30
Saxon c60ec9fbd8 revid: moved messaged regarding restart of rtmp session 2019-03-03 16:41:16 +10:30
Saxon b92466bab8 revid: defaulting to sendRetry on for Rtmp output 2019-03-03 16:38:03 +10:30
Saxon b5954d3f53 revid: if start not successfull stop is called to stop output clips routine 2019-03-03 13:46:02 +10:30
Saxon cb206ff92b revid: adjust ringBuffer element size for flv 2019-03-03 13:35:25 +10:30
Saxon bd3f89978e revid/mtsSender_test.go: updated comment for buffer.Write() 2019-03-02 20:41:58 +10:30
Saxon e0c7f3074d revid: corrected conflict 2019-03-02 20:41:19 +10:30
Saxon 246f4f33be revid/mtsSender_test.go: created type buffer based on ring.Buffer that may be written to to perform a ringBuffer write and flush 2019-03-02 20:37:04 +10:30
Saxon c07946fa76 revid: fixed conflict 2019-03-02 17:46:20 +10:30
Saxon 5dd3045db2 revid: checking that we have more than 0 destinations before we write to the ring buffer 2019-03-02 13:08:48 +10:30
Saxon c3f846379d revid: removed in response to error in log message in handleErrors if failed to start() revid 2019-03-02 12:50:43 +10:30
Saxon 4e1ceb140d revid: if start is called when revid is already running an error is no longer returned 2019-03-02 12:49:09 +10:30
Saxon c9996cbae5 revid: stop() no longer returns error, just logs if stop is called when revid is not running. 2019-03-02 12:42:36 +10:30
Saxon abe9722350 revid: relaxed error handling in handleErrors routine 2019-03-01 21:01:33 +10:30
Saxon 7619f5b921 revid: mtsSender_test.go corrected comment 2019-03-01 15:35:54 +10:30
Saxon 8452d8f3d1 revid: cleaned up code structure in mtsSender_test.go 2019-03-01 15:28:40 +10:30
Saxon ef5e43dac7 revid: improved code layout in mtsSender_test.go 2019-03-01 15:15:44 +10:30
Saxon 2570cb6ecb revid: simplified some mtsSender logic 2019-03-01 15:14:01 +10:30
Saxon ff4778945e revid: not doing redundant conversions 2019-03-01 14:48:26 +10:30
Saxon 7070c4e434 revid: in TestSendFailDiscontinuity disconClipNo const => clipWithDiscontinuity 2019-03-01 13:35:22 +10:30
Saxon 88eac4900d revid: discarding error from loadSender.send() in mtsSender_test.go TestSendFailDiscontinuity 2019-03-01 13:32:58 +10:30
Saxon b1b5ff2f49 revid: fixed import stanzas in senders.go 2019-03-01 13:30:06 +10:30
Saxon 5eb832e6c3 revid: cleaned up documentation in senders.go and mtsSender_test.go 2019-03-01 13:28:34 +10:30
Saxon 8baff93918 revid: renamed fields of sender in mtsSender_test.go 2019-03-01 11:17:40 +10:30
Saxon b3f2439c5b revid: unexported buf in sender within mtsSender_test.go 2019-03-01 11:11:20 +10:30
Saxon 74110dee31 revid: sender interface renamed to Sender and tstSender in mtsSender_test.go renamed to sender 2019-03-01 10:16:54 +10:30
Saxon 91d21f1da8 revid: fixed import stanzas in mtsSender_test.go file header 2019-03-01 10:03:39 +10:30
Saxon 559d15d6eb revid & stream/mts: fixed file headers in mtsSender_test.go and discontinuity.go regarding licensing location 2019-03-01 10:02:43 +10:30
Saxon 6188d756fd revid: moved some mtsSender logic into load rather than send so that we're not doing the same work over and over again in the case of send failure and retry 2019-03-01 10:01:52 +10:30
Saxon ae4debd388 revid & stream/mts: fixed file headers regarding licensing location 2019-03-01 10:00:33 +10:30
Saxon ee915b58ac stream/mts: fixed conflict 2019-02-28 16:47:24 +10:30
Saxon Milton b6a3e062b5 Merged in path-flag-fix (pull request #143)
revid: got rid of OutputFileName and InputFileName
2019-02-28 03:04:05 +00:00
Alan Noble 8a13bb7007 Temporary fix: Make ringBufferSize size larger for RTMP to work over flaky networks. 2019-02-27 05:53:49 +00:00
Saxon 796bc12e09 Merge branch 'master' into improve-defaulting 2019-02-25 18:43:16 +10:30
Dan Kortschak 8240fea9ab revid: fix build 2019-02-25 18:39:01 +10:30
Saxon 7d3d8c3374 revid: change ring buffer size depending on output type 2019-02-25 18:36:39 +10:30
Saxon 2818f308df revid: defaulting to Mpegts packetization if output is Http or Rtp and Defaulting to Flv packetization if output is Rtmp 2019-02-25 18:26:20 +10:30
Alan Noble a90b35b319 Only log a debug message when ring.ErrTimeout occurs, not a warning. 2019-02-25 07:14:30 +00:00
Saxon Milton c247e63bd0 Merged in default-mode-crash-fix (pull request #150)
revid-cli: initialising config.Output slice when no outputs are defined so that a default output can still be set

Approved-by: Alan Noble <anoble@gmail.com>
2019-02-25 06:42:38 +00:00
Saxon 5d5af5601f revid: not closing destinations on call to revid.Reset() anymore 2019-02-25 17:00:31 +10:30
Saxon 7f2d53e778 revid: now checking for Packetization var from netreceiver 2019-02-25 16:29:44 +10:30
Saxon b7d1bd17a7 revid: initialising ring buffer in different location 2019-02-25 16:03:28 +10:30
Saxon be6e168774 revid: fixed quantization and bitrate logic in config.Validate() 2019-02-25 15:56:51 +10:30
Saxon cc4d683ba6 revid: calling reset inside revid.Update once config is updated 2019-02-25 15:47:43 +10:30
Saxon 5a2d89ef8f revid: using only one output when we're getting config from netreceiver 2019-02-25 15:31:42 +10:30
Saxon e118a639d4 revid: outputting config when we update 2019-02-25 15:28:19 +10:30
Alan Noble 01d85af133 Removed incorrect Close upon Dial error. 2019-02-22 20:45:13 +00:00
saxon f1625d27f5 revid: fixed destination slice bug 2019-02-17 13:11:17 +10:30
saxon ca0a008c59 revid: correct cc logic is discontinuity.go 2019-02-17 12:50:33 +10:30
saxon 819c9a784c revid: mtsSender_test.go passing segmenting and discontinuity tests 2019-02-17 05:32:44 +10:30
saxon 3f3d587eeb revid: mtsSender test for segmenting actually working now 2019-02-17 03:35:59 +10:30
saxon b3b8c6bb44 stream/mts: checking data is also good in mts segment test 2019-02-17 00:31:30 +10:30
saxon a5cb1c5abb stream/mts: made modifications such that the segment test is passing 2019-02-16 23:52:40 +10:30
saxon 3356457c71 revid: not wrapping t.Errorf 2019-02-16 16:43:15 +10:30
saxon bb091f5961 revid: wrote test for mtsSender_test.go to see if the mtsSender is segmenting properly 2019-02-16 16:33:39 +10:30
saxon 361f5edbc9 stream/mts: wrote sender interface and a minimalHttpSender type 2019-02-16 14:26:51 +10:30
saxon 281aa47fd5 stream/mts: fixing discontinuities that could be caused by ringbuffer 2019-02-16 01:40:35 +10:30
saxon bea0000340 stream/mts: creating ring.Chunk so that we can use another loadSender 2019-02-15 23:55:51 +10:30
saxon b6bf41b17d stream/mts: made mtsSender more general
The mtsSender can now use any loadSender to send fixed and segmented mts data to.
2019-02-15 23:35:45 +10:30
saxon 31d36577b1 stream/mts: ausOceanSender => mtsSender 2019-02-15 23:17:13 +10:30
saxon 3aa94887eb revid/senders.go: commenting of ausOceanSender 2019-02-15 14:33:18 +10:30
saxon d3a8bb20de revid: using ausOceanSender if we're doing http output with mpegtrs packetization 2019-02-15 13:05:48 +10:30
saxon 7d03830a4e revid & stream/mts: senders now handle clip duration and cc fixing for mts.
Removed rtpSender as we now put in loadSender slice. Removed packer write method as no longer required to do clip duration logic. For initialisation of encoders, they are now no longer writing
to packer, but now straight to the ring buffer. Wrote ausOceanSender which will deal with clip logic and cc fixing for mts. Added some functionality to mts/mpegts.go that allows adding
of adaptation fields to mts packets.
2019-02-15 12:01:07 +10:30
saxon 3ee2683ca9 cmd/revid-cli & revid: outputFileNamePtr => outputPathPtr, config.OutputFileName=>config.OutputPath, inputFileNamePtr=>inputPathPtr and finally, config.InputFileName=>config.InputPath 2019-02-12 18:22:46 +10:30
saxon ad04893432 revid/revid.go: intialising err from rtp send 2019-02-08 18:14:33 +10:30
saxon f4be7e72d7 Merge branch 'cpu-fix' of http://bitbucket.org/ausocean/av into cpu-fix 2019-02-08 18:12:29 +10:30
saxon 020428db62 revid/revid.go: checking err from ring buffer write within destinations length check 2019-02-08 18:12:03 +10:30
Saxon Milton bc1cb5245a Merged master into cpu-fix 2019-02-08 18:09:25 +10:30
saxon b28a75d665 av/revid: removed test commands that we're not using anymore 2019-02-08 18:07:43 +10:30
Saxon Milton 0bb1006c19 Merged in metadata-refactor (pull request #131)
Metadata Refactor

Approved-by: kortschak <dan@kortschak.io>
2019-02-08 01:20:08 +00:00
Saxon Milton 3a05fd533c Merged in mem-leak-debug (pull request #136)
Mem usage fix

Approved-by: kortschak <dan@kortschak.io>
2019-02-08 01:18:26 +00:00
saxon f0fc399d47 revid/revid.go: removed space 2019-02-08 11:24:41 +10:30
saxon 8bdfed9960 stream/mts: fixing conflicts 2019-02-08 10:13:51 +10:30
saxon 734cf8cca9 revid/cmd: merged in master and again removed cmds 2019-02-07 23:49:10 +10:30
saxon c7f1acac26 doesn't look like it worked 2019-02-07 18:19:38 +10:30
saxon 3f72e21970 revid: reducing ring buffer size 2019-02-07 18:03:59 +10:30
saxon 628adee49a commenting out things i don't want to run 2019-02-07 16:42:39 +10:30
Saxon Milton ccb8a52db1 revid/revid.go: removing shorthand initialisations for vars already declared 2019-02-06 05:28:57 +00:00
Saxon Milton 87cb303935 revid/revid.go: again checking to see we actually have destinations before putting anything into the ring buffer 2019-02-06 05:27:35 +00:00
saxon ef4aa8efd1 revid/revid.go: reverted change regarding putting things in ringbuffer when we won't use it 2019-02-06 15:52:59 +10:30
saxon cdd6703930 } 2019-02-06 15:45:14 +10:30
saxon de4f471201 revid/revid.go: defer r.wg.Done() in revid.outputClips routine 2019-02-05 10:50:21 +10:30
saxon a4d179039b revid/revid.go: removed default case in switch with revid.Update() 2019-02-05 10:49:05 +10:30
saxon bd2958ba4e cmd/revid-cli & revid: added TODO for the use of Run() instead of send in cmd/revid-cli/main.go. Fixed filename in revid/revid.go file header. Renamed ret to cfg in revid.Config(). Catching error from call to revid.Stop() in revid.Udate() 2019-02-04 19:14:02 +10:30
saxon 8978f9edc5 cmd/revid-cli & revid: using goto to sleep for monitor period, and using wg.Done() at the end of output routine. 2019-02-04 17:12:30 +10:30
saxon ee7eb84d26 revid-cli: correctly using ns.Mode() and ns.SetMode() 2019-02-04 13:25:37 +10:30
saxon 6171c4e999 revid: added handling of burstPeriod to config 2019-02-03 23:43:51 +10:30
saxon 1010721dd0 cmd/revid-cli & revid: Checking revid mode differently - now using ns.Mode(), which should soon be an available feature. Also now using ns.SetMode() - which tells netreceiver that we've changed mode. 2019-02-03 23:37:38 +10:30
saxon 9095044e23 revid: using waitgroups so that revid.Stop() is safer - we can wait until the input and output routines are done before we do anything, like touch the revid config. Also started modifying revid.Update() to remove errors introduced after the copy of updateRevid from revid-cli to revid.go in the previous commit. 2019-02-03 21:55:40 +10:30
saxon 1af4b25030 cmd/revid-cli & revid: removed startRevid and stopRevid as shouldn't be required when we have revid.Start() and revid.Stop(). Created revid.Config() which returns copy of config safely using mutex. removed updateRevid in revid-cli and move to fun revid.Update() - as there's no reason why it can't just be a receiver func - even better considering we want to start moving alot of stuff from revid-cli to the revid-api anyways. 2019-02-03 21:17:44 +10:30
saxon bad68923e6 Merge branch 'master' into metadata-refactor 2019-02-01 15:11:57 +10:30
saxon c44d6bbfd3 revid/revid.go: not during time.Duration conversion 2019-02-01 10:08:49 +10:30
saxon 9bddf343f5 revid/revid.go: moved revid.mu declaration
. Updated todo owner
2019-02-01 10:07:00 +10:30
saxon d26aa8643a revid: renamed transcode to processFrom. Using mutex for isRunning flag. Created setIsRunning func to set state of isRunning. 2019-02-01 09:47:31 +10:30
saxon 1f1546a284 revid: updated code in senders.go to work with meta changes 2019-01-31 21:30:08 +10:30
saxon 051263c144 revid/revid.go: revid.lex to revid.transcode 2019-01-31 19:58:25 +10:30
saxon 1e307fc37b revid/revid.go: made routines named rather than anonymous 2019-01-31 19:42:20 +10:30
saxon e18b1f51f0 revid/revid.go: capture error from r.Start() in error handling routine 2019-01-31 15:49:44 +10:30
saxon d53eafe215 revid/revid.go: not running r.setupInput() as routine - now getting error an returning 2019-01-31 15:15:38 +10:30
saxon ed4d97f893 stream/mts: patch for revid.Start() no exit bug 2019-01-31 15:03:50 +10:30
Dan Kortschak 58102e5587 revid: fix http destination assignment 2019-01-30 13:19:00 +10:30
Dan Kortschak 071e6fd0f7 revid: honour difference between rtmp dst and others 2019-01-29 19:56:02 +10:30
saxon 37bdb2cf8e av/revid: removed test commands that we're not using anymore 2019-01-22 14:31:42 +10:30
Dan Kortschak 92ba9c89a2 cmd/revid-cli,revid: use a slice for output destination flags 2019-01-19 20:01:42 +10:30
scruzin fd903b4add rtmp.Session now rtmp.Conn and rtmp.NewSession() and Open() replaced with Dial(). 2019-01-19 13:10:38 +10:30
Dan Kortschak 35d63f664f revid: add v4l properties and fix default device handling
Also fix logging typos found during work.
2019-01-17 17:04:59 +10:30
Saxon Milton ddb8fc1e1c Merged in rtp-ringbuff-bypass (pull request #88)
Rtp ringbuff bypass

Approved-by: Alan Noble <anoble@gmail.com>
Approved-by: kortschak <dan@kortschak.io>
2019-01-16 23:22:18 +00:00
Saxon Milton a58a784a16 Merged in clean-up-revid-consts (pull request #111)
revid: clean up some revid constants

Approved-by: kortschak <dan@kortschak.io>
2019-01-16 07:37:07 +00:00
saxon 95349f461d revid/revid.go: removed unused logging consts 2019-01-16 17:52:49 +10:30
saxon d3c8f31c08 revid/revid.go: actually fixed conflict 2019-01-16 17:49:22 +10:30
saxon 606c1a5885 revid/revid.go: fixed conflict 2019-01-16 17:47:57 +10:30
saxon 59024fea79 revid/revid.go: further split up miscy consts 2019-01-16 17:46:17 +10:30
Saxon Milton ef6811d3b8 Merged in webcam (pull request #86)
revid: addition of webcam input

Approved-by: kortschak <dan@kortschak.io>
2019-01-16 07:12:30 +00:00
saxon 582f12d157 revid/revid.go: in execution of ffmpeg, the device path is replaced by r.config.InputFileName 2019-01-16 17:29:56 +10:30
saxon e184b091d3 revid/revid.go: rtmp connection properties comment changed to RTMP 2019-01-16 16:42:37 +10:30
saxon 59cc2d409a Revert "revid: removed redundant error logging"
This reverts commit eacbfb9ee3.
2019-01-14 16:37:18 +10:30
saxon eacbfb9ee3 revid: removed redundant error logging 2019-01-14 16:31:43 +10:30
Saxon Milton ae34ebe368 Merged in revid-start-stop-errors (pull request #114)
Return errors from revid.Start and revid.Stop

Approved-by: kortschak <dan@kortschak.io>
2019-01-14 04:27:34 +00:00
Saxon Milton 137943af82 Merged in revid-config-safer (pull request #112)
Made revid's Config() func safer

Approved-by: kortschak <dan@kortschak.io>
2019-01-13 23:57:27 +00:00
saxon 5ae1e41e38 revid: start and stop now return errors 2019-01-13 22:01:04 +10:30
saxon ba54974de9 revid: removed Config() func from revid because it's not being used 2019-01-13 21:50:47 +10:30
saxon a0d7681d5f revid: not wrapping webcam args in string to pass to func 2019-01-13 20:52:09 +10:30
saxon fc06ec235e revid: checking for webcam input in config.go validate() 2019-01-13 19:33:07 +10:30
saxon 07307ed492 updating webcam branch
Merge branch 'master' into webcam
2019-01-13 19:29:32 +10:30
saxon aa5d316816 revid: made revid.Config() return copy of revid's config rather than pointer so that mutation isn't possible 2019-01-13 19:15:02 +10:30
saxon 08069e22d1 revid: sectioned constants and added some commenting 2019-01-13 17:17:35 +10:30
saxon 9365c4a1de revid: removed unused consts 2019-01-13 17:10:17 +10:30
saxon bf8d85d0ba revid: removed unused loglevels 2019-01-13 17:03:58 +10:30
Dan Kortschak 7f07c4cb20 revid,stream/flv: add back initial header write 2019-01-11 13:53:05 +10:30
saxon 9ca7288622 psi: removed conflict with master 2019-01-11 13:17:14 +10:30
saxon 4e62606622 updating this branch with master
Merge branch 'master' into psi-pr-cleanup
2019-01-11 13:15:23 +10:30
saxon 0d6aac0247 revid: fixed build errors by updating calls to mts.MetaData.SetLocation() and mts.MetaData.SetTimeStamp() 2019-01-11 11:53:41 +10:30
saxon ebd6d5816d psi: full stop at end of comment, made lastTime belong to packer and moved some vars to a more appropriate location 2019-01-08 19:39:22 +10:30
scruzin cbe6149c8f Added proper logging. 2019-01-07 23:59:41 +10:30
saxon 703f0a0523 revid: cleaned up send logic in httpSender send func 2019-01-07 10:45:22 +10:30
saxon 8878063dc8 revid: clean up vars for use in calculation of time between writes to packer 2019-01-07 10:43:30 +10:30
Dan Kortschak 05e0672e89 stream/flv: remove unnecessary header write on creation 2019-01-05 17:56:55 +10:30
saxon 26a43d54bb rtp: updated error message to suit new rtpSender.send() function 2019-01-03 13:01:35 +10:30
saxon 5f20086440 rtp: removed code in rtpSender relating to chunks - something we're not using anymore in this case 2019-01-03 12:57:50 +10:30
saxon 4da0bddf2f revid: improved error message in rtpSender.send when there is no data provided but also when there is no data in the senders chunk 2019-01-03 12:08:41 +10:30
saxon a934e02e9a revid: using switch in rtpSender.send logic rather than if-else 2019-01-03 12:06:51 +10:30
saxon e12f3e0b41 revid: updated comment above revid.rtpSender declaration 2019-01-03 12:03:06 +10:30
saxon 53d737d426 revid: missed a rtpSndr 2019-01-03 11:59:29 +10:30
saxon 12c8c604e0 Updating branch with master
Merge branch 'master' into rtp-ringbuff-bypass
2019-01-03 11:57:48 +10:30
saxon 496fa994bd revid: rtpSndr=>rtpSender 2019-01-03 11:57:43 +10:30
saxon 325067ac1f revid: linuxWebcam to startWebcam to keep less specific to particular platform as we may eventually stream from webcam on windows 2019-01-03 11:49:02 +10:30
saxon 03a88313d1 revid: fixed build errors 2019-01-03 11:25:06 +10:30
saxon d4e0fb516b Fixing smartlogger errors
Merge branch 'master' into webcam
2019-01-03 10:35:29 +10:30
saxon fd3c4010e4 revid: add old webcam starting code and renamed func to LinuxWebcam considering this will only work on linux 2019-01-03 10:35:22 +10:30
saxon 5b73c2c2ba revid: using simple startWebcam func considering it's only for testing purposes and works 2019-01-03 10:11:42 +10:30
saxon cec95cd652 rtmp: using TCP rather IP 2019-01-02 21:54:01 +10:30
saxon cca95f1c5d revid: fixed cmds used for testing 2019-01-02 17:32:20 +10:30
saxon a4c73cf6c5 av: updated logging to suit changes made on iot and utils 2019-01-02 15:39:47 +10:30
saxon aefdc46273 revid: updated some comments 2019-01-02 08:50:59 +10:30
saxon d0d9e20c87 revid: if no data is provided to rtpSender.send() then we check if the rtpSenders chunk is not nil, if it is, then return error 2019-01-01 16:11:32 +10:30
saxon ccd4c32ff6 revid: revid now has it's own rtpSender seperate from the loadSender slice used for multiple outputs, therefore, we can now bypass the ringbuffer in this case with a check if the rtpSender exists in the packer write method 2019-01-01 16:03:04 +10:30
Saxon Milton ebccfa1a54 Merged in raspivid-no-start-fatal (pull request #87)
revid: fatal when raspivid cannot be started

Approved-by: kortschak <dan@kortschak.io>
2018-12-29 10:57:49 +00:00
saxon e4e4e217c6 revid: using smarter startWebcam func as suggested by Dan 2018-12-29 17:04:35 +10:30
Dan Kortschak 1e3b4b1ab8 cmd/revid-cli,revid: reduce stringly typing in config/flags 2018-12-28 13:43:21 +10:30
Saxon Milton 5a181f3576 revid: fix rtmp sending
Approved-by: kortschak <dan@kortschak.io>
2018-12-28 03:09:41 +00:00
saxon ca681a6176 revid: fatal when raspivid cannot be started 2018-12-28 10:53:10 +10:30
saxon f9c1231cc4 revid: added input flag for webcam input and added func to handle webcam input using ffmpeg 2018-12-28 10:48:21 +10:30
saxon 7118f1566c revid: added input flag for webcam input and added func to handle webcam input using ffmpeg 2018-12-28 10:44:53 +10:30
saxon 32e2d61ec1 revid: fixed rtmp problem by adding extra check of output to figure out clip duration before send 2018-12-28 10:31:50 +10:30
saxon 1095f32ae4 revid: added send retry flag 2018-12-14 20:50:26 +10:30
saxon ab643f2b97 revid: set default bitrate to 400000 2018-12-14 20:38:53 +10:30
saxon 618fadd90b revid: trying to fix jumpy rtp 2018-12-14 20:05:10 +10:30
saxon c7f55c3c43 revid: using NewJSONDecoder rather than newJsonDecoder to be consistent with changes in iot 2018-12-14 16:58:02 +10:30
saxon fbdce669e7 revid: cleaned and added commenting 2018-12-14 16:46:36 +10:30
saxon 21dd2f4b70 revid: using location instead of gps in names 2018-12-14 16:02:47 +10:30
saxon e79f6d191d revid: made extractMeta a function of httpSender 2018-12-14 16:01:10 +10:30
saxon f1ee09ad7b revid: improved naming of encoder globals for location and timestamp 2018-12-14 15:59:44 +10:30
saxon 798add533b revid + mts +psi: wrote func to find pmt in byte slice, wrote func to get gps, changed the way in which psi are insterted, based no of mpgets packets to send on time, i.e. per second 2018-12-14 13:35:56 +10:30
saxon b78904ac72 revid + psi: getting metadata from replies now 2018-12-13 15:51:51 +10:30
saxon ce036abf8b revid: changed request time to recv 2018-12-13 12:59:40 +10:30
saxon 9a7d7a9ab3 revid: modified http sender to look at reply of send and get time and gps data to mts package 2018-12-13 12:59:40 +10:30
saxon f5a571547d revid: using config to define default packetsPerClipValue 2018-12-08 01:54:20 +10:30
saxon cfff3316b4 revid: updated revid packetsPerClip const from 7 to 560 to speed up data sending 2018-12-08 01:43:10 +10:30
saxon f89e0aefb5 revid: increased number of mpegts packets per clip so that we can send more 2018-12-08 01:14:42 +10:30
saxon 05bcfdc1b1 revid: changed request type to recv in order to be copmatible with new netsender and netreceiver function 2018-12-07 16:26:36 +10:30
Dan Kortschak 00216b444b cmd/revid-cli,revid: clean up flags handling
This is a first step in simplifying and cleaning up the logic for config
and flag handling for revid.
2018-12-05 19:54:52 +10:30
saxon 402f2fb165 revid: revert so that netsender pull request can be done first 2018-12-04 10:14:45 +10:30
saxon 0f273e42b6 revid: using RequestRecv for http sender 2018-12-04 10:13:18 +10:30
saxon e0207d979f revid: fixed test cases to use output1 to fix build errors 2018-12-01 11:17:12 +10:30
saxon 1c105405e8 revid: changed request type back to poll so that build compiles on master 2018-11-30 22:25:38 +10:30
saxon 2c2be84499 revid: iterating through destinations and using destination.release() instead of directly talking to ringbuffer chunks 2018-11-29 14:22:39 +10:30
saxon 14f4bb0e63 revid: changed back to requestVideo 2018-11-29 14:06:16 +10:30
saxon d32a715549 revid: testing request poll instead of requestvideo 2018-11-29 13:50:17 +10:30
saxon 89b7a0acfa revid: reverted section of code which deals with failed restart of connection 2018-11-28 15:33:56 +10:30
saxon 1824273f8c revid: undoing logging changes, removed chunk closing in http sender send method 2018-11-28 15:26:17 +10:30
saxon 227f25a3fb revid: improved some naming and revmoed uneeded const 2018-11-26 00:40:18 +10:30
saxon 98eb2c64e8 revid: revid output check and destination setting cleaner. Also changed destination release to single chunk.Close() so that chunks aren't closed more than once 2018-11-25 23:45:38 +10:30
saxon 5920d1c8d7 revid: made destination for revid a []loadSender and change code such that iterate through this when performing actions relating to destinations like write, send and close. Also created new sender call rtp sender that has a inherent rtp encoder 2018-11-25 23:10:38 +10:30
saxon a4ded5337d revid: changed close operation on destination to close operpation on slice ofoperations in reset() 2018-11-25 17:24:52 +10:30
saxon 4ce4525a1c revid: removed blank line under newUdpSender 2018-11-24 15:20:26 +10:30
saxon 5eb7225da9 revid & rtp: fixed up some logging, line breaks, and simplified some decrements/increments 2018-11-24 12:14:44 +10:30
saxon a231d57f06 revid: usage of nil error in logging message 2018-11-22 10:21:25 +10:30
saxon 4f4bebae25 revid: removed revid's overwnship of rtp encoder 2018-11-21 21:34:28 +10:30
saxon 92294aed70 rtp: assert that udp with no packetization works 2018-11-21 20:43:17 +10:30
saxon 1cebc821d1 revid and rtp: simplified relationship between mts encoder and rtp encoder and revmoed queue 2018-11-21 20:23:02 +10:30
saxon cedc63a0b5 revid: got rid of debug prints 2018-11-21 18:16:10 +10:30
saxon 315ba6bd76 revid: back to working state 2018-11-21 18:14:36 +10:30
saxon f53c866311 revid-cli: using MpegtsRtp to representation packetization under mpegtsrtp packetization 2018-11-21 17:30:46 +10:30
saxon 589ec15259 revid-cli: made -Output=Rtp to mean rtp over udp 2018-11-21 17:30:46 +10:30
saxon 8be3c4de23 revid-cli: allow setting of udp address through revid-cli options 2018-11-21 17:30:46 +10:30
saxon 16614df9f5 rtp: started using mpegts encoder inside rtp encoder so that fragmentation i.e. smaller rtp packets is easier. Streams fine. 2018-11-21 17:30:46 +10:30
saxon 42097ddef7 rtp: added print messages for debugging purposes
rtp: added print messages for debugging purposes

rtp: removed binaries
2018-11-21 17:30:46 +10:30
saxon fce0937810 rtp: wrote some code so that config validated udp and rtp stuff as well 2018-11-21 17:30:46 +10:30
saxon c0e6ba2a5b rtp: checking for udp output and rtp packetisation in revid such that the right sender and encoder is selected 2018-11-21 17:30:46 +10:30
saxon 3515958a99 rtp: added rtp and udp options to the revid config 2018-11-18 13:22:48 +10:30
saxon d291744f63 revid: wrote loadsender implementation for udp sending for the rtp - need to test 2018-11-18 12:32:11 +10:30
Dan Kortschak 57caef8937 revid: clean up output clips some more
The low volume throttle is removed since that's the job of the kernel's scheduler.
2018-10-19 21:11:02 +10:30
kortschak cec4f3803f Merged in remove-stream-chan (pull request #68)
revid: remove stream chan

* revid,stream: factor chan operations out into a separate type

* revid: remove stream chan

* revid: reduce label length

Approved-by: Alan Noble <anoble@gmail.com>
2018-10-19 00:50:08 +00:00
Dan Kortschak 4f5a47b1e5 revid: fix logging for completed stream with error 2018-10-05 08:21:21 +09:30
Dan Kortschak 81997cd68e revid: self-document and harmonize arguments to raspivid 2018-10-05 08:20:27 +09:30
Dan Kortschak c20ed48c40 revid: move command creation and logging out of switch 2018-10-05 08:20:27 +09:30
Dan Kortschak aba6ab1645 stream,revid: clean up data flow and docs 2018-10-04 10:35:43 +09:30
Saxon Milton 6a0c9941ea revid: capturing any errors from r.lexTo 2018-09-28 04:23:43 +00:00
saxon 0c2ccf55fa revid: move initialisation of revids netsender up higher in New so that we don't get nil pointer deference 2018-09-25 17:10:35 +09:30
saxon e6d0ee035e revid: added yet another message 2018-09-24 20:27:43 +09:30
saxon 9b7b88be98 revid: adding another debug print to make sure we're flushing ring buffer 2018-09-24 20:24:15 +09:30
saxon 195f52ae16 revid: adding debug prints 2018-09-24 20:21:49 +09:30
saxon 724042baeb revid: change no of frames per clip to 25 for http 2018-09-24 19:56:05 +09:30
saxon ed8613a255 revid: return any errors from conversion of frame rate to int 2018-09-24 16:09:03 +09:30
Saxon Milton 0cf6014887 revid: passing delay corresponding to fps into lexTo - fixing quality issue when streaming from raspivid (not sending stuff too fast) 2018-09-24 15:57:00 +09:30
saxon 8df244891a revid: used args... in exec rather than strings.join to fix bug 2018-09-24 13:21:03 +09:30
saxon b210530330 revid: change Verbosity to LogLevel in config.go 2018-09-22 14:46:54 +09:30
saxon 8f56a82053 revid: fixed log messages in config.go to make easier to understand 2018-09-22 14:45:07 +09:30
saxon 108344f882 revid: fixed case and removed exclamation marks in error/logging messages in config.go 2018-09-20 11:34:17 +09:30
saxon 6e773abd4e revid: made logging messages lowercase and removed exclamation marks 2018-09-20 11:23:52 +09:30
saxon e31678dc9b revid: moved pkg const declaration to revid.go and removed space in pkg string 2018-09-20 11:17:08 +09:30
saxon 0efb2abd6c revid: added pkg to logging messages in senders.go 2018-09-20 11:15:27 +09:30
saxon 0f24e19a2a revid: added pkg name to logging messages in revid.go and senders.go 2018-09-19 22:35:15 +09:30
saxon 5c94f556b4 revid: added pkg name to logging messages in config.go 2018-09-19 22:31:58 +09:30
saxon 534610f6b8 revid: removed revid_test.go 2018-09-19 22:15:00 +09:30
saxon d17f7c87e9 revid: fixed raspivid args and logging 2018-09-19 22:02:50 +09:30
saxon d697b4013d revid: cleaned up key value pairs in config.go 2018-09-15 12:26:05 +09:30
saxon b3a8f2bca3 revid: improved logging key value pairs in revid.go 2018-09-14 12:17:29 +09:30
saxon 043ff7779a main: updated logging in h264 file to mpegts file driver for revid 2018-09-11 18:40:45 +09:30
saxon 547e24da7d main: actually used logger in driver for h264 file to flv rtmp 2018-09-11 18:39:52 +09:30
saxon 03eb68d774 main: added new logger to revid driver file for h264 file to flv rtmp 2018-09-11 18:36:13 +09:30
saxon 35cb30ccf9 revid: updated logging in senders.go 2018-09-11 17:15:45 +09:30
saxon 85ab3a5744 revid: updated logging messages in config.go and revid.go to use new logger 2018-09-11 16:56:33 +09:30
kortschak ea33007173 Merged in deshim (pull request #47)
revid,stream: improve package organisation

Approved-by: saxon.milton@gmail.com <saxon.milton@gmail.com>
2018-08-24 21:17:17 +00:00
saxon.milton@gmail.com d813a56ad6 Merged in librtmpPorting (pull request #41)
LibrtmpPorting

Approved-by: saxon.milton@gmail.com <saxon.milton@gmail.com>
2018-08-23 20:55:15 +00:00
Dan Kortschak b8bf44f57e parse=>stream/lex: move lexing to better location and name 2018-08-23 15:06:32 +09:30
Dan Kortschak eedc473125 revid,parse: remove io.Writer/stream.Encoder shim 2018-08-23 14:51:12 +09:30
saxon 1b4db5b0dc Removed session interface and mad session struct exported 2018-08-20 10:22:36 +09:30
Dan Kortschak 05ba19e4aa encoding->stream: rename packages 2018-08-20 07:49:02 +09:30
Dan Kortschak 7e1d7f77b8 revid,encoding/{flv,mts}: remove in-bound chans for packet encoders 2018-08-19 21:28:20 +09:30
Dan Kortschak 437c7756df flv: rename encoder type 2018-08-19 21:05:04 +09:30
Dan Kortschak 5d8eca850c mts: rename encoder type 2018-08-19 20:39:57 +09:30
Dan Kortschak c0f9f7bf7b encoding: restructure packages handling stream encoding 2018-08-19 20:29:22 +09:30
saxon 9f61f33deb deleting binary 2018-08-19 13:35:22 +09:30
Dan Kortschak ddb78a6234 generator: clean up MPEG-TS encoding
This deletes or marks unused cruft, removes internal chans and makes
interface chans single item long to make way for removal.
2018-08-18 11:27:39 +09:30
saxon 6b2644a517 Fixed problems with mpegts generator 2018-08-18 00:48:13 +09:30
Raul Vera dc1d09f8ae Separate the revid -t argument from the raspivid -t argument. 2018-08-10 04:37:54 +00:00
saxon 21e80b483c Taking out linker option I don't need 2018-07-13 20:20:12 +09:30
saxon.milton@gmail.com 5861fe64d0 Merged in revidTestingImrpovement (pull request #37)
RevidTestingImprovement

Approved-by: kortschak <dan@kortschak.io>
2018-07-10 03:15:13 +00:00
Dan Kortschak 372c42d5aa flv,generator: clean up FLV handling 2018-07-07 15:27:59 +09:30
Dan Kortschak db6ca2922a revid,parse: wire parse.H264 to revid
Through experimentation I have realised the previous ordering of NALU
types does not work with YouTube. I have also exhaustively checked the
requirement for each of the 3 NALU types that are checked and all are
needed. Finally, I have checked whether 7 is needed because of its
inclusion in a parallel branch; checking for this type prevents this
code from working.
2018-07-05 19:10:17 +09:30
saxon 419ee0e76e Deleting stuff I don't need 2018-07-05 09:49:30 +09:30
saxon 1f6c2cf466 Getting rid of tests I don't need atm 2018-07-05 09:30:47 +09:30
saxon cac22540c0 Using flag for rtmp url 2018-07-04 22:44:39 +09:30
saxon c861862ff7 Got rtmp test working 2018-07-04 16:39:09 +09:30
saxon 0f47256297 Got h264 file to flv rtmp test driver built 2018-07-04 13:34:09 +09:30
Saxon Milton 79710f27f6 Trying to get it to build 2018-07-02 13:12:11 +09:30
Dan Kortschak 353d2cfcc7 revid,revid-cli: remove non-functional RTP mention and add MPEGTS config option 2018-06-30 21:50:55 +09:30
Saxon Milton 94a9f8fe77 no message 2018-06-29 03:31:05 +09:30
Saxon Milton 0cae97b9ee removing stuff we don't need 2018-06-29 01:06:40 +09:30
Saxon Milton bbb3ddf00f changing package names to hopefully something more go idiomatic 2018-06-28 22:54:20 +09:30
Saxon Milton ede44cefe1 for some reason didn't track changes, committing again 2018-06-28 21:56:06 +09:30
Saxon Milton f1aefcdfeb added appropriate test files and ran go fmt over av 2018-06-28 21:52:48 +09:30
Alan Noble 99ef1d0727 PR feedback and some other clean-up. 2018-06-27 07:50:05 +09:30
Alan Noble 1645b759f1 Added ns to Revid struct, so it could be exposed as a httpSender, and refactored revid-cli accordingly. 2018-06-26 15:53:55 +09:30
Alan Noble 9d113cc498 Renamed NativeRtmp to just Rtmp - since it is exposed to clients. FfmpegRtmp should be deprecated. 2018-06-25 10:53:26 +09:30
Dan Kortschak 647641bed6 revid: clean up input handling 2018-06-24 21:31:09 +09:30
Alan Noble 60c09c2800 Merge branch 'master' of https://bitbucket.org/ausocean/av 2018-06-22 15:57:33 +09:30
Alan Noble a8b56ddb19 Moved test data to test repo. 2018-06-22 15:53:13 +09:30
Dan Kortschak fba613ab60 revid: make FramesPerClip an int 2018-06-20 14:38:34 +09:30
Dan Kortschak ec3eefeb37 revid: do not double report returned error 2018-06-20 13:59:38 +09:30
Dan Kortschak 090ad746a6 revid: change default frames/clip to 7 for http
This increases effective bitrate to 88kpbs from 12kbps with fpc=1.
2018-06-20 12:48:12 +09:30
Dan Kortschak 89e5178fde revid: release ring resource quickly for httpSender 2018-06-20 12:42:36 +09:30
kortschak 5840e483b8 Merged in ring/bytes (pull request #35)
revid: use direct access to ring.Chunk bytes
2018-06-18 22:52:55 +00:00
kortschak 74a2891ed7 Merged in revid/httpaddress (pull request #32)
revid: use correct address for HTTP
2018-06-18 22:49:24 +00:00
Dan Kortschak 1800d2f6da revid: use direct access to ring.Chunk bytes 2018-06-18 19:30:00 +09:30
Dan Kortschak ca5eefa4c3 generator,parser: remove Get prefix from read accessors
Also make user-facing chan exposure a little safer.
2018-06-17 21:52:55 +09:30
Dan Kortschak b66abcbfec revid: improve doc comment 2018-06-17 21:11:44 +09:30
Dan Kortschak a7d3edbe57 revid: rename ChangeConfig to SetConfig 2018-06-17 21:10:27 +09:30
Dan Kortschak ed923ed256 revid: rename GetConfigRef to Config 2018-06-17 21:08:37 +09:30
Dan Kortschak 6de4f8c9a6 revid: rename GetBitrate to Bitrate
Also change to int; when we get more than 2Gbs^-1, we'll probably be
using 64 bit devices.
2018-06-17 20:57:52 +09:30
Dan Kortschak 5bdd66e22b rtmp: rename StartSession to Open 2018-06-17 20:45:58 +09:30
Alan Noble 05c6c376b4 Payload data has now moved onto Pin struct. 2018-06-16 19:04:32 +09:30
kortschak 4c0d219fbf Merged in revid/nilcheck (pull request #33)
revid: fix nil dereference on RTMP reconnect
2018-06-16 04:10:17 +00:00
Dan Kortschak 36ebb5d58a revid: remove unused field in Revid 2018-06-15 21:18:22 +09:30
Alan Noble 53f923afb1 netsender.MakePins() now takes a 2nd arg. 2018-06-15 19:34:50 +09:30
Alan Noble 5ba5327f33 httpSender now implemented as a NetSender client, rather than a generic HTTP client. 2018-06-15 16:42:29 +09:30
Dan Kortschak a995a36ad7 revid: fix nil dereference on RTMP reconnect 2018-06-14 22:54:44 +09:30
Dan Kortschak 3e6a3283e1 revid: use correct address for HTTP 2018-06-14 13:42:54 +09:30
kortschak b72d9bdd0d Merged in config/ctrlCctrlV (pull request #31)
revid: fix incorrect assignment
2018-06-13 05:25:35 +00:00
Dan Kortschak b89514847d revid: fix incorrect assignment 2018-06-13 14:45:03 +09:30
Dan Kortschak f953216f31 revid: fix nil dereference panic 2018-06-13 12:42:33 +09:30
Dan Kortschak 820dae7b4c revid: various cleanups 2018-06-09 14:58:33 +09:30
Dan Kortschak 1105ee3ea9 revid: use loadSender for clip sending 2018-06-09 14:08:48 +09:30
Dan Kortschak 3881cb9712 revid: avoid monomorphic interface 2018-06-09 11:31:21 +09:30
Dan Kortschak 3da57cbe46 revid: use time.Duration for durations 2018-06-08 12:48:11 +09:30
Dan Kortschak 902ac744fe revid: address review comments 2018-06-08 09:32:13 +09:30
Dan Kortschak dee6dec8d4 revid: wait for URL from netreceiver 2018-06-07 21:50:01 +09:30
Dan Kortschak 71a30bcc67 revid: lower-case names 2018-06-07 20:32:53 +09:30
Dan Kortschak 123cf9c7cf ring: migrate package to utils/ring 2018-06-07 15:45:14 +09:30
Dan Kortschak b7b000aeac revid,ring: plumb in ring buffer with WriteTo
There is a residual scar of an intermediate []byte copy because of the
signature of http.NewRequest, but this can be addressed later. The rtmp
interface needed alteration so that rtmp.Session satisfies io.Writer.
2018-06-06 17:55:10 +09:30
Dan Kortschak 2791939f34 ring: reverse time discounting 2018-06-06 17:53:15 +09:30
Dan Kortschak 04df5c2aa2 revid: plumb ring.Buffer into clip handling
This drops ringbuffer and changes the behaviour from purging old
unhandled clips to dropping new unhandled clips.
2018-06-06 17:53:15 +09:30
Alan Noble 9e5e10f413 Changed defaultRtmpUrl to use the endpoint for rig0@ausocean.org, rather than the main AusOcan YouTube channel. 2018-06-02 16:40:41 +09:30
Dan Kortschak d6fd3d4539 all: manual clean up of imports 2018-05-30 16:53:57 +09:30
Dan Kortschak 173d7c3879 rtmp: clean up session handling and CGO interface
* Make C compilation arch-independent, including shared lib use and fix
  for broken librtmp include install.
* Provide package-root level makefile for building C lib.
* Remove package global.
* Use Go-idiomatic naming for methods.
* Restucture flow to reduce indentation.
* Use []byte len in place of additional param.
* Use unix-idiomatic return status values.
2018-05-29 15:36:28 +09:30
richardsonjack c08a2c079f rename smartlogger 2018-05-24 13:05:29 +09:30
richardsonjack 898b231521 Update log API call 2018-05-24 12:20:41 +09:30
richardsonjack 63f56a964f Merge branch 'master' of https://bitbucket.org/ausocean/av/src 2018-05-24 12:13:05 +09:30
richardsonjack 9b4d2127b0 fix spelling error 2018-05-24 12:12:53 +09:30
Saxon1 074eab0fb2 Merge branch 'master' of https://bitbucket.org/ausocean/av/src 2018-05-24 11:59:12 +09:30
richardsonjack 7dbb48f5c1 Update to use new logger 2018-05-24 11:58:53 +09:30
Saxon1 8282cd3880 printing clearing output chan less 2018-05-24 11:58:49 +09:30
Saxon1 e76deb3864 Merge branch 'master' of https://bitbucket.org/ausocean/av/src 2018-05-24 11:52:50 +09:30
Saxon1 2ff683160a changing verbosity 2018-05-24 11:52:24 +09:30
Saxon Milton 0741643ac6 fix bitrate update 2018-05-17 16:39:36 +09:30
Saxon Milton 8e806b59dc Merge branch 'master' of https://bitbucket.org/ausocean/av 2018-05-14 16:24:45 +09:30