Commit Graph

1982 Commits

Author SHA1 Message Date
Saxon 1c75867ba5 revid: simplified logic for setup of senders and encoders in revid.reset 2019-03-12 12:59:10 +10:30
Saxon cce05db3f2 revid: changes made to stream/flv regarding last commit for removal of flv header bytes 2019-03-12 12:58:31 +10:30
Saxon 9d010ed76c revid & stream/flv: removed writing of 'flv header' in the flv encoder
We are now only employing flv encoding for use with rtmp, and rtmp does not like the inclusion of the 'flv header' at the start of a
stream, so this functionality has been removed along with error handling of the invalidFlvTag error from rtmp in the rtmp sender.
2019-03-12 12:47:08 +10:30
Saxon 6c29b362c9 revid: sendRetry check is now in if rather than loop 2019-03-12 09:45:00 +10:30
Saxon a726acf520 revid: enc=>e 2019-03-12 03:05:36 +10:30
Saxon 652a5ab173 revid: made logic regarding sender and encoder selection more readable, and added more commenting 2019-03-12 03:01:43 +10:30
Saxon 2588a125a9 revid: don't write to rtmp connection unless it's not nil 2019-03-10 17:48:18 +10:30
Saxon 48c7a1f21d revid: fixed multiSender sending and handling of send fails 2019-03-10 16:49:41 +10:30
Saxon 85401c8df4 revid: making handSendFail functions for senders work as they should as appropriate - e.g. rtmp handleSendFail will attempt to restart connection 2019-03-10 16:37:28 +10:30
Saxon 6a8423bfe6 revid: fixed mtsSender_test.go 2019-03-10 15:56:56 +10:30
Saxon f55daa02c1 stream/flv & stream/mts: updated commenting for flv and mts encoders 2019-03-10 13:04:15 +10:30
Saxon 9f4f9e8920 revid: Encoder type now implements io.Writer 2019-03-10 13:00:58 +10:30
Saxon def220daf3 revid: sending encode errors to errorHandler and made multiSender smarter
Errors captured from encoding are now sent to the error handler.
We also made multiSender smart so that during a write if sendRetry is on, we first check
that revid is actually running before attempting to send again. If revid is not running we return.
We also now log any send errors inside multiSender.
2019-03-10 12:34:45 +10:30
Saxon fc72eeaa0f revid: improved commenting 2019-03-10 12:21:53 +10:30
Saxon b96b52ace5 revid: reverting changes made to config.go 2019-03-09 22:44:12 +10:30
Saxon 93e856792d cmd/revid-cli & revid: fixed conflict 2019-03-09 15:54:52 +10:30
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
Alan Noble 71e993255b Merged in revid-bitrate-fix (pull request #157)
Don't call rv.Bitrate when rv is nil.

Approved-by: Saxon Milton <saxon.milton@gmail.com>
Approved-by: Alan Noble <anoble@gmail.com>
2019-03-08 23:01:59 +00:00
Saxon Milton 02db78cac7 Merged in remove-udp-sender (pull request #165)
revid: removed udp sender and anything pertainent to it
2019-03-07 09:51:46 +00:00
Saxon 0962b1047d revid: removed udp sender and anything pertainent to it 2019-03-07 20:14:50 +10:30
Saxon Milton ddc7ad4325 Merged in remove-ffmpeg-sender (pull request #164)
revid: remove ffmpegSender and any code pertaining to it.
2019-03-07 08:49:18 +00:00
Saxon 6fa9f37972 revid: remove ffmpegSender and any code pertaining to it. 2019-03-07 19:15:39 +10:30
Alan Noble 3a112da000 Merged in pass-vars-to-make (pull request #161)
Pass vars to make

Approved-by: Saxon Milton <saxon.milton@gmail.com>
Approved-by: Alan Noble <anoble@gmail.com>
2019-03-06 20:05:39 +00:00
Dan Kortschak c7ace29526 circleci: update go version and use modules 2019-03-06 18:10:07 +10:30
Dan Kortschak 79cc7b3338 module: add go.mod and go.sum for working build 2019-03-06 12:33:55 +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
Alan Noble 9df652b57b Remove superflous characters. 2019-03-06 00:00:42 +00:00
Alan Noble 23f44b4655 Default dk to zero. 2019-03-05 23:53:42 +00:00
Alan Noble 1df780fae1 Removed. 2019-03-05 23:45:40 +00:00
Alan Noble fcbeea6695 Optionally supply MA and DK and create a dhcpcd.enter-hook. 2019-03-05 23:45:06 +00:00
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 Milton 300b55548b Merged in config-messages (pull request #159)
revid: config defaulting messages no longer warning level but rather info level

Approved-by: Alan Noble <anoble@gmail.com>
2019-03-04 20:54:23 +00:00
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 d7863863c7 cmd/revid-cli: structuring flags by type, and added a Rotate flag so that video can be rotated using raspivid rotate flag. 2019-03-04 11:53:28 +10:30
Alan Noble 313944de90 Made more idiomatic. 2019-03-03 23:22:42 +00:00
Alan Noble 1c9dde3798 Don't call rv.Bitrate when rv is nil. 2019-03-03 23:04:49 +00:00
Saxon Milton 05c2c77f31 Merged in start-in-paused-state (pull request #155)
Start in paused state and more robustness

Approved-by: Alan Noble <anoble@gmail.com>
Approved-by: kortschak <dan@kortschak.io>
2019-03-03 20:21:34 +00:00
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 6c39be24c9 Merged in revid/fix-close-calls (pull request #156)
Don't fail if Close() returns an error, since it just means there is no connection, and don't call Close when Dial fails.

Approved-by: Saxon Milton <saxon.milton@gmail.com>
Approved-by: Alan Noble <anoble@gmail.com>
2019-03-03 07:12:08 +00:00
Alan Noble b1dcb9d6a7 gofmt 2019-03-03 07:11:35 +00:00