Saxon
056f3b75b3
revid: general clean
2019-03-15 17:58:24 +10:30
Saxon
524989d2ed
revid: resolved conflicts
2019-03-15 17:51:17 +10:30
Saxon
9d5771fcbf
revid: completed addition of exposure, awb, saturation and brightness options
2019-03-15 17:24:29 +10:30
Matthew Michael
9a510f5c31
cmd/revid-cli & revid: adding raspivid exposure and brightness parameters
...
Started working on adding exposure, brightness, saturation and awb flags to revid-cli so that we can control raspivid parameters.
Updated revid logic to give these to raspivid and updated config to consider these parameters in config validation.
2019-03-15 12:44:13 +10:30
Saxon
4d7f2d7b32
revid: further fixed logic in revid.reset encodersender setup
2019-03-14 14:43:55 +10:30
Saxon
d2411a0761
revid: param label RtpAddr => RtpAddress
2019-03-14 14:16:55 +10:30
Saxon
cbe4e52c11
revid: var label RtpAddr => RtpAddress
2019-03-14 14:11:38 +10:30
Saxon
b7ef1a1a2b
revid: improved error handling in revid.reset encoder/sender setup logic
2019-03-14 13:44:33 +10:30
Saxon
9b3a1d0ae7
revid: multiSender is no longer a struct, but rather a type derived from a []loadSender
2019-03-14 11:20:02 +10:30
Saxon
f9c5e1cfa7
revid: removed some more mentions of retry
2019-03-14 10:43:17 +10:30
Saxon
9db59287a9
revid: removed retrySend method from file sender
2019-03-14 10:41:42 +10:30
Saxon
99a4010c79
revid: removed concept of send retry for now
...
Send retry has been removed from the multiSender. This also means there is not need for the active func, because we simply wait until the send is complete or failed to exit the output clips
routine. Tests pertinent to retrying or the active function have been removed.
2019-03-14 10:35:09 +10:30
Saxon
4881e179cc
revid: multiSender active=>isActive
2019-03-14 09:09:57 +10:30
Saxon
2e49de5fa0
revid: newMultiSender panics if active function is not provided
2019-03-14 08:34:35 +10:30
Saxon
5b19c955f2
revid: added full stop to comment for TestResetEncoderSenderSetup in revid_test.go
2019-03-14 08:26:34 +10:30
Saxon
465a7fe973
revid: updated comment for mtsSender struct
2019-03-14 08:23:08 +10:30
Saxon
032ffcb8b6
revid: rtmpSender.load no longer copies data
2019-03-14 08:18:57 +10:30
Saxon
e593a04faf
revid: added TestResetEncoderSenderSetup
...
Added a test to check that revid's reset method is correctly setting up encoders
and the senders they write to correctly.
2019-03-13 18:14:00 +10:30
Saxon
627297ce7e
revid: using chunk.WriteTo rather than chunk.Bytes to get data to encoders
2019-03-13 12:25:57 +10:30
Saxon
b8b26de901
revid: added TestMultiSenderFailRetry test
...
Added test to check that if a sender is set to retry on send fails,
it will keep trying to send until it is successful, and have all
data that was intended to be written sent off.
2019-03-13 00:49:25 +10:30
Saxon
e427836356
revid: removed closure for accessing active flag
...
we only need to set the active flag once, so there's no need for a closure here.
2019-03-12 23:55:18 +10:30
Saxon
404190ca52
revid: added TestMultiSenderFailNoRetry
2019-03-12 23:16:32 +10:30
Saxon
500edc05aa
revid: retry is now an attribute of senders and can be set at initialisation
2019-03-12 20:53:27 +10:30
Saxon
da1532b9d1
revid: added multiSender test to check that Write returns when active func return false in send retry
2019-03-12 18:28:20 +10:30
Saxon
42bf44afdf
revid: added test for multiSender to check active func function.
...
Added a test to check that we correctly return from a write call if the multiSenders
active callback func return false.
2019-03-12 18:08:43 +10:30
Saxon
8b93d187c6
revid: added some commenting to multiSender testing utilities
2019-03-12 17:19:47 +10:30
Saxon
7f73e32d4c
revid: added TestMultiSenderWrite
...
Added a test in senders_test.go to check that we can give a multiSender a few senders and have it
write to them correctly when we call multSender.Write(). This involved writing a dummy
loadSender implementation called dummyLoadSender that stores what has been written to it so that
we can check at a later time.
2019-03-12 17:08:36 +10:30
Saxon
e7e3b5007b
revid: added test for newMultiSender
2019-03-12 16:28:30 +10:30
Saxon
3761b55f87
revid: renamed tests relating to mtsSender
2019-03-12 16:22:11 +10:30
Saxon
3230e4c2dd
Merge branch 'master' into ringbuffer-move
2019-03-12 16:20:43 +10:30
Saxon
7acca43837
revid: renamed mtsSender_test.go to senders_test.go
2019-03-12 16:17:52 +10:30
Saxon
bbb764db83
Merge branch 'master' into ringbuffer-move
2019-03-12 16:07:17 +10:30
Saxon
53382c5774
revid: newMultiSender returns error if the passed active function is nil
2019-03-12 15:39:51 +10:30
Saxon
e2a6d9f4bd
revid: added function type called active to multiSender
...
We wish to have a way to check that the 'owner' of the multi sender is still active while it may be doing continual send retries - therefore a function with bool return called active has been added
as a field to multiSender so that we can call this and check whether the owner of the multiSender is 'active' or not.
2019-03-12 15:32:01 +10:30
Saxon
0ca75538d2
revid: created multiSender retry field and setting based on outputs
...
Added a retry field for the multiSender which will be used to decide whether to retry sending or not. This is being set true if we have a http sender and no other senders.
2019-03-12 15:18:02 +10:30
Saxon
30ea5d74f6
revid: simplified multiSender Write method
2019-03-12 15:13:24 +10:30
Saxon
1c75867ba5
revid: simplified logic for setup of senders and encoders in revid.reset
2019-03-12 12:59:10 +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
Alan Noble
910b120b9b
It is time we had some tests for revid (esp. ones that test for current or previously reported bugs).
...
Approved-by: Alan Noble <anoble@gmail.com>
2019-03-11 23:03:52 +00:00
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
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
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