5366eca2f2
av: fixed imports
2019-03-25 11:51:03 +10:30
e7c6b7319b
revid: sender any logic that is performed on a failed send is now done inside loadSender.send()
2019-03-24 20:01:25 +10:30
fa011fb129
Merge branch 'master' into ringbuffer-move
2019-03-17 12:13:13 +10:30
01a5759bde
revid: changed remote param label for auto white balance from Awb to AutoWhiteBalance
2019-03-17 09:51:09 +10:30
1533d6a7ff
stream: got rid of Encoder interface as not needed anymore considering our encoders just implement io.Writer now
2019-03-16 15:46:33 +10:30
aa888ef115
revid: restructured revid.reset code to make more flexible for testing purposes.
2019-03-16 15:16:06 +10:30
39a7b382f6
revid: fixed build errors
2019-03-15 18:05:15 +10:30
524989d2ed
revid: resolved conflicts
2019-03-15 17:51:17 +10:30
9d5771fcbf
revid: completed addition of exposure, awb, saturation and brightness options
2019-03-15 17:24:29 +10:30
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
4d7f2d7b32
revid: further fixed logic in revid.reset encodersender setup
2019-03-14 14:43:55 +10:30
d2411a0761
revid: param label RtpAddr => RtpAddress
2019-03-14 14:16:55 +10:30
cbe4e52c11
revid: var label RtpAddr => RtpAddress
2019-03-14 14:11:38 +10:30
b7ef1a1a2b
revid: improved error handling in revid.reset encoder/sender setup logic
2019-03-14 13:44:33 +10:30
9b3a1d0ae7
revid: multiSender is no longer a struct, but rather a type derived from a []loadSender
2019-03-14 11:20:02 +10:30
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
2e49de5fa0
revid: newMultiSender panics if active function is not provided
2019-03-14 08:34:35 +10:30
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
627297ce7e
revid: using chunk.WriteTo rather than chunk.Bytes to get data to encoders
2019-03-13 12:25:57 +10:30
500edc05aa
revid: retry is now an attribute of senders and can be set at initialisation
2019-03-12 20:53:27 +10:30
53382c5774
revid: newMultiSender returns error if the passed active function is nil
2019-03-12 15:39:51 +10:30
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
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
1c75867ba5
revid: simplified logic for setup of senders and encoders in revid.reset
2019-03-12 12:59:10 +10:30
a726acf520
revid: enc=>e
2019-03-12 03:05:36 +10:30
652a5ab173
revid: made logic regarding sender and encoder selection more readable, and added more commenting
2019-03-12 03:01:43 +10:30
9f4f9e8920
revid: Encoder type now implements io.Writer
2019-03-10 13:00:58 +10:30
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
fc72eeaa0f
revid: improved commenting
2019-03-10 12:21:53 +10:30
93e856792d
cmd/revid-cli & revid: fixed conflict
2019-03-09 15:54:52 +10:30
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
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
0962b1047d
revid: removed udp sender and anything pertainent to it
2019-03-07 20:14:50 +10:30
6fa9f37972
revid: remove ffmpegSender and any code pertaining to it.
2019-03-07 19:15:39 +10:30
a7ae1aa643
revid: fixed raspivid flag usage for vertical and horizontal flipping - tested and working
2019-03-06 01:38:13 +00:00
3a9e90dcf8
cmd/revid-cli & revid: added back vertical and horizontal flip options
2019-03-06 11:51:55 +10:30
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
79d0dad757
revid: checking for changes to rtp address in vars now
2019-03-05 16:38:32 +10:30
003808858b
revid: handling csv output var in revid's update function
2019-03-05 10:50:31 +10:30
d9ca76159e
Merge branch 'master' into mts-chunking
2019-03-04 15:01:41 +10:30
0767f41d4a
revid: corrected spelling error in netreceiver var check
2019-03-04 01:52:39 +00:00
cfcb899bcb
revid & cmd/revid-cli: rotate => rotation
2019-03-04 12:11:34 +10:30
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
c60ec9fbd8
revid: moved messaged regarding restart of rtmp session
2019-03-03 16:41:16 +10:30
b92466bab8
revid: defaulting to sendRetry on for Rtmp output
2019-03-03 16:38:03 +10:30
b5954d3f53
revid: if start not successfull stop is called to stop output clips routine
2019-03-03 13:46:02 +10:30
cb206ff92b
revid: adjust ringBuffer element size for flv
2019-03-03 13:35:25 +10:30
e0c7f3074d
revid: corrected conflict
2019-03-02 20:41:19 +10:30
c07946fa76
revid: fixed conflict
2019-03-02 17:46:20 +10:30
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
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
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
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
abe9722350
revid: relaxed error handling in handleErrors routine
2019-03-01 21:01:33 +10:30
ee915b58ac
stream/mts: fixed conflict
2019-02-28 16:47:24 +10:30
b6a3e062b5
Merged in path-flag-fix (pull request #143 )
...
revid: got rid of OutputFileName and InputFileName
2019-02-28 03:04:05 +00:00
8a13bb7007
Temporary fix: Make ringBufferSize size larger for RTMP to work over flaky networks.
2019-02-27 05:53:49 +00:00
796bc12e09
Merge branch 'master' into improve-defaulting
2019-02-25 18:43:16 +10:30
8240fea9ab
revid: fix build
2019-02-25 18:39:01 +10:30
7d3d8c3374
revid: change ring buffer size depending on output type
2019-02-25 18:36:39 +10:30
a90b35b319
Only log a debug message when ring.ErrTimeout occurs, not a warning.
2019-02-25 07:14:30 +00:00
5d5af5601f
revid: not closing destinations on call to revid.Reset() anymore
2019-02-25 17:00:31 +10:30
7f2d53e778
revid: now checking for Packetization var from netreceiver
2019-02-25 16:29:44 +10:30
b7d1bd17a7
revid: initialising ring buffer in different location
2019-02-25 16:03:28 +10:30
cc4d683ba6
revid: calling reset inside revid.Update once config is updated
2019-02-25 15:47:43 +10:30
5a2d89ef8f
revid: using only one output when we're getting config from netreceiver
2019-02-25 15:31:42 +10:30
e118a639d4
revid: outputting config when we update
2019-02-25 15:28:19 +10:30
f1625d27f5
revid: fixed destination slice bug
2019-02-17 13:11:17 +10:30
a5cb1c5abb
stream/mts: made modifications such that the segment test is passing
2019-02-16 23:52:40 +10:30
361f5edbc9
stream/mts: wrote sender interface and a minimalHttpSender type
2019-02-16 14:26:51 +10:30
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
31d36577b1
stream/mts: ausOceanSender => mtsSender
2019-02-15 23:17:13 +10:30
d3a8bb20de
revid: using ausOceanSender if we're doing http output with mpegtrs packetization
2019-02-15 13:05:48 +10:30
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
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
ad04893432
revid/revid.go: intialising err from rtp send
2019-02-08 18:14:33 +10:30
f4be7e72d7
Merge branch 'cpu-fix' of http://bitbucket.org/ausocean/av into cpu-fix
2019-02-08 18:12:29 +10:30
020428db62
revid/revid.go: checking err from ring buffer write within destinations length check
2019-02-08 18:12:03 +10:30
bc1cb5245a
Merged master into cpu-fix
2019-02-08 18:09:25 +10:30
3f72e21970
revid: reducing ring buffer size
2019-02-07 18:03:59 +10:30
ccb8a52db1
revid/revid.go: removing shorthand initialisations for vars already declared
2019-02-06 05:28:57 +00:00
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
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
cdd6703930
}
2019-02-06 15:45:14 +10:30
de4f471201
revid/revid.go: defer r.wg.Done() in revid.outputClips routine
2019-02-05 10:50:21 +10:30
a4d179039b
revid/revid.go: removed default case in switch with revid.Update()
2019-02-05 10:49:05 +10:30
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
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
ee7eb84d26
revid-cli: correctly using ns.Mode() and ns.SetMode()
2019-02-04 13:25:37 +10:30
6171c4e999
revid: added handling of burstPeriod to config
2019-02-03 23:43:51 +10:30
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
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
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
c44d6bbfd3
revid/revid.go: not during time.Duration conversion
2019-02-01 10:08:49 +10:30
9bddf343f5
revid/revid.go: moved revid.mu declaration
...
. Updated todo owner
2019-02-01 10:07:00 +10:30
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
051263c144
revid/revid.go: revid.lex to revid.transcode
2019-01-31 19:58:25 +10:30
1e307fc37b
revid/revid.go: made routines named rather than anonymous
2019-01-31 19:42:20 +10:30
e18b1f51f0
revid/revid.go: capture error from r.Start() in error handling routine
2019-01-31 15:49:44 +10:30
d53eafe215
revid/revid.go: not running r.setupInput() as routine - now getting error an returning
2019-01-31 15:15:38 +10:30
Saxon