Commit Graph

273 Commits

Author SHA1 Message Date
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 )
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 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 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 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 e0c7f3074d revid: corrected conflict 2019-03-02 20:41:19 +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 ee915b58ac stream/mts: fixed conflict 2019-02-28 16:47:24 +10:30
Saxon Milton b6a3e062b5 Merged in path-flag-fix (pull request )
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
Alan Noble a90b35b319 Only log a debug message when ring.ErrTimeout occurs, not a warning. 2019-02-25 07:14:30 +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 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
saxon f1625d27f5 revid: fixed destination slice bug 2019-02-17 13:11:17 +10:30
saxon a5cb1c5abb stream/mts: made modifications such that the segment test is passing 2019-02-16 23:52:40 +10:30
saxon 361f5edbc9 stream/mts: wrote sender interface and a minimalHttpSender type 2019-02-16 14:26: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 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 3f72e21970 revid: reducing ring buffer size 2019-02-07 18:03:59 +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 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 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
Dan Kortschak 92ba9c89a2 cmd/revid-cli,revid: use a slice for output destination flags 2019-01-19 20:01:42 +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 )
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 )
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 )
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 )
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 )
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 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 4e62606622 updating this branch with master
Merge branch 'master' into psi-pr-cleanup
2019-01-11 13:15:23 +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
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 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