Commit Graph

82 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 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 d9ca76159e Merge branch 'master' into mts-chunking 2019-03-04 15:01:41 +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
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 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 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 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 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
Alan Noble 01d85af133 Removed incorrect Close upon Dial error. 2019-02-22 20:45:13 +00:00
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 a5cb1c5abb stream/mts: made modifications such that the segment test is passing 2019-02-16 23:52:40 +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 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 1f1546a284 revid: updated code in senders.go to work with meta changes 2019-01-31 21:30:08 +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
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 9ca7288622 psi: removed conflict with master 2019-01-11 13:17:14 +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 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 12c8c604e0 Updating branch with master
Merge branch 'master' into rtp-ringbuff-bypass
2019-01-03 11:57:48 +10:30
saxon a4c73cf6c5 av: updated logging to suit changes made on iot and utils 2019-01-02 15:39:47 +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
Dan Kortschak 1e3b4b1ab8 cmd/revid-cli,revid: reduce stringly typing in config/flags 2018-12-28 13:43:21 +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