Commit Graph

1956 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 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
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 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
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 ab97bcb6d1 Merge branch 'master' into start-in-paused-state 2019-03-03 13:25:56 +10:30
Alan Noble 36182d7e6d Make pi the owner of netsender.conf and install syncreboot. 2019-03-02 11:40:54 +00:00
Saxon d5af370d71 cmd/revid-cli: corrected value assignment for an undefined pin when revid is not yet initialised 2019-03-02 20:46:12 +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 Milton 95eaf0fca7 Merged in improve-defaulting (pull request #153)
Improve defaulting

Approved-by: Alan Noble <anoble@gmail.com>
2019-03-02 07:41:17 +00:00
Saxon c07946fa76 revid: fixed conflict 2019-03-02 17:46:20 +10:30
Saxon 562c8effc3 cmd/revid-cli: adjusted logging levels to make more appropriate 2019-03-02 15:23:33 +10:30
Saxon 01474ee870 cmd/revid-cli: made general changes to make revi-cli more robust i.e. not so trigger happy with fatals 2019-03-02 14:54:49 +10:30
Saxon 9d1d2914a4 cmd/revid-cli: removing fatal error if we get an error during run() 2019-03-02 13:46:43 +10:30
Saxon Milton 8f2a1404be Merged in bug-fix (pull request #154)
revid: relax error handling in handleErrors()

Approved-by: Alan Noble <anoble@gmail.com>
2019-03-02 03:02:25 +00:00
Saxon 3c273adf4c cmd/revid-cli: not expecting error from revid.Stop() in revid-cli anymore: 2019-03-02 13:30:46 +10:30
Saxon 9be2f95bef stream/mts: improved and added commenting 2019-03-02 13:21:46 +10:30
Saxon 7c6719ab5a stream/mts: using packet.Packet straight away and not doing unnecessary conversions 2019-03-02 13:15:18 +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