mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,716 Commits 320 Branches 50 Tags 119 MiB
Commit Graph

1051 Commits

Author SHA1 Message Date
Trek H c58c573cd7 revid: changed writeRates and recPeriods to floats 2019-05-21 12:39:10 +09:30
Saxon 88ffdf08b5 revid: changed the input enum for RTSP input from RTSPCamera to RTSP 2019-05-21 12:18:52 +09:30
Saxon 91d2697a55 revid: general clean up 2019-05-21 01:48:29 +09:30
Trek H 7ba9d023a3 revid: made start and stop change audio device state 2019-05-21 00:45:54 +09:30
Saxon 3ff726e439 revid & cmd/revid-cli: removed need for command line flags to specify addresses for RTP and RTCP. 
Removed the command line flags that were used to specifiy local and remote addresses for RTP and RTCP. These are now
derived from the initial RTSP connection and also from the RTSP SETUP method reply.
 2019-05-20 19:45:59 +09:30
Saxon bc6a0ae55e revid: using RTCP client to maintain RTP stream from RTSP server 
Now adopting an RTCP client so that the RTP stream from the RTSP server can be maintained past 1 minute.
This change involved some refactor.
The rtcp.NewClient signature has been simplified. There is now a default send interval and name for use
in the source description in the receiver reports. These can be customised if required with the new
SetSendInterval and SetName funcs. The rtcp.NewClient signature now takes an rtp.Client, so that it
can get information from the RTP stream, like most recent sequence number. As a result of this requirement
the rtp package parse file has been extended with some functions for parsing out the sequence number and
ssrc from RTP packets and the RTP client provides getters for these things.
 2019-05-20 18:14:27 +09:30
Saxon Milton eaba622909 Merged in separate-codecs (pull request #188) 
codec: created h264 and mjpeg packages to house lexers

Approved-by: Alan Noble <anoble@gmail.com>
 2019-05-19 11:46:33 +00:00
Saxon 548b7caa81 revid: fixed rtpPort and rtcpPort parsing and added H264 and H265 IDs 
Added H264ID and H265ID consts and added logic to select this const for use in encoder based on mediaType param in NewEncoder. Also now
declaring PMT in NewEncoder so that we can set streamID correctly based on mediaType.
 2019-05-16 13:57:10 +09:30
Trek H 76edcfe8ed revid: added start and stop functions to AudioInput for proper closing 2019-05-15 15:57:49 +09:30
Saxon 25bb49bce7 revid: using h265 lexer now in the case of RTSPCamera input 2019-05-14 11:56:04 +09:30
Saxon 1059b5e738 revid: wrote basics of a startRTSPCamera func 
Currently just connecting to RTSP server, requesting OPTIONS, DESCRIBE, SETUP and PLAY. Also creating RTP client and giving
this to process from for the lexer.
 2019-05-14 11:47:18 +09:30
Saxon 1762adf338 revid/config.go: finished commenting config fields, and removed unused options. 2019-05-13 16:55:20 +09:30
Saxon 835f97203a revid: config fields that are exported and acronyms now capitalized. 2019-05-13 16:23:38 +09:30
Saxon 51fcb18505 revid: capitalize exported enums that are acronyms like Rtmp->RTMP, Mpegts->MPEGTS etc. 2019-05-13 16:18:41 +09:30
Saxon 001c8696aa revid/config.go: started commenting config fields 2019-05-13 16:12:08 +09:30
Saxon 8337d87a25 revid/config.go: cleaned up enums for inputs, outputs and codecs. 2019-05-13 15:42:16 +09:30
Trek H 6320011190 revid: added audio input start test 
test written and passing for revid with AudioInput starting
unset audio parameters in config now default.
 2019-05-09 12:11:02 +09:30
Trek H 28eba2ad60 revid: changed PCM lexer timing 
previously the lexer would read before any audio was generated, resulting in silence but now the timing is correct.
 2019-05-08 19:56:02 +09:30
Trek H e699c30a85 revid: updated documentation and licenses 2019-05-08 19:31:25 +09:30
Trek H 9099082609 revid: setting up mts encoder with pid based on media type 2019-05-08 19:05:00 +09:30
Trek H 76765c8a20 revid: updated revid test to use new mtsEncoder func 2019-05-08 18:07:33 +09:30
Trek H 2bb3a6b82f revid: added missing files for audio input 2019-05-08 17:21:21 +09:30
Trek H faa6246a51 Merge branch 'master' into revid-audio 2019-05-08 16:23:56 +09:30
Trek H 7d4da08cf0 revid: audio lexer reading and writing correct bytes 2019-05-07 16:52:58 +09:30
Saxon 5e568f277b revid/revid.go: fixed comment for Revid.setupInput field 2019-05-06 16:04:56 +09:30
Saxon b3775265e6 revid/config.go: not breaking logging lines 2019-05-06 15:59:41 +09:30
Saxon 5c40c48e97 revid/revid.go: in Revid.Start() if errors occurs on call to Revid.setupInput() fall through error check and return err 2019-05-06 15:54:33 +09:30
Saxon 77ff88392f revid: setupInput function for revid now returns closure that is used to do any clean up 2019-05-06 15:12:05 +09:30
Saxon 8f74cd4ced revid: does not panic when not outputs are defined in a config. 2019-05-05 22:50:59 +09:30
Saxon ec290f1058 revid: logging is now checked as a valid device so that logging level may be changed remotely 2019-05-05 19:39:56 +09:30
Trek H a3c7cb5616 revid: added chunkSize to audioInput and bufferSize to lex functions 
The audio lexers need to know how much data they will be receiving unlike video which has a fixed buffer size.
This means that all the lex function will need to be given a buffer size since they are used as a function pointer with the same signature.
 2019-05-05 17:56:14 +09:30
Saxon 32621f0cfe av: fixed build errors 2019-04-26 20:46:43 +09:30
Trek H 09db8907a5 revid: matching up audio packet sizes, chunk sizes and rates throughout revid pipeline 2019-04-26 17:03:30 +09:30
Saxon b42278cfde revid: improved comment for Config() 2019-04-25 15:44:34 +09:30
Trek H b1e5b4341f revid: pid for audio being written to mts packets 2019-04-24 16:39:18 +09:30
Trek H 3484e35692 revid: revid building and running with audio additions 2019-04-24 13:58:56 +09:30
Saxon 3ab0be4a7a revid: fixed typos in revid_test.go 2019-04-24 13:01:29 +09:30
Saxon 74379ea047 revid: simplified comments for Start, Stop and Update. 2019-04-24 13:00:20 +09:30
Trek H 889d440259 revid: updated audio config parameters throughout audio-input.go to use revid.Config 2019-04-24 11:46:00 +09:30
Trek H c51e0ec168 revid: adding audio config parameters 2019-04-23 19:05:47 +09:30
Trek H 20c9e6c409 revid: added PCM and ADPCM codecs 2019-04-23 16:20:47 +09:30
Trek H a60c65a6cf revid: added rate flags to config and cli, started writing test 2019-04-23 14:51:17 +09:30
Saxon e5f95d1ea0 revid: addressing PR feedback 2019-04-23 13:18:41 +09:30
Saxon 9ba72fac62 av: addressing PR feedback 2019-04-22 15:14:08 +09:30
Trek H 46ca3e2611 revid: created an audioInput struct to record audio that acts as a reader for revid 2019-04-19 01:20:48 +09:30
Saxon d76b60a515 revid: addressing PR feedback 2019-04-18 18:31:49 +09:30
Trek H 8a1f35c0a5 revid: started modifying audio-netsender to be a general audio input 2019-04-18 16:59:48 +09:30
Saxon 74c995d452 revid: addressing PR feedback 2019-04-18 16:55:48 +09:30
Trek H 58b9458ff4 revid: added audio.go to handle sound cards and devices 
audio.go will be used for recording sound from the sound card and mic
it is like audio-netsender but it is a package instead of a command
and without the netsender.
 2019-04-18 16:22:20 +09:30
Saxon 1c5d3997bb revid: fixed indentation on Dan's name under authors 2019-04-18 16:21:18 +09:30
Trek H e0ec6a8dc9 revid: added basic PCM lexer and started adding startMic() func to revid setup. 2019-04-17 23:11:23 +09:30
Saxon cea3a5958a revid: changed no location in reply log message to level debug 2019-04-15 13:09:56 +09:30
Saxon 88431b1357 revid: made rtmpSender smarter with write error handling 2019-04-15 11:20:36 +09:30
Saxon d18373908b revid: added ringBuffer to rtmpSender 2019-04-15 10:48:12 +09:30
Saxon d75ea20137 revid: applying some feedback from last PR 2019-04-15 10:25:35 +09:30
Saxon f59879b51d revid: removed ringBuffer after lexer 
Now that we want buffered senders (as required), the ringBuffer that was after the
lexer has been removed. Instead, we now have an ioext.multiWriterCloser to which the
lexer writes to. This then writes to the encoders, and then encoders write to each of
their own multiWriteClosers, which write to the appropriate senders. We now call
close on the first multiWriteCloser to close down the entired pipeline, as this close
call propogates through each level.

We have removed the outputClips routine as it's not required anymore to get data
from the revid ringBuffer, and have removed other things that were used by this, like
the IsRunning function.

We have also updated tests to work with these changes - they are passing.
 2019-04-15 08:42:56 +09:30
Saxon b347f2e9d1 revid: set revid.isRunning to false before waiting, because this is what triggers output routine to be killed. 2019-04-14 11:13:17 +09:30
Saxon 5cd12bff8a revid: dummyLogger in senders_test.go now uses pointer receiver for log 2019-04-13 20:41:47 +09:30
Saxon 9b48d22392 av: fixed conflicts with master 2019-04-13 20:15:08 +09:30
Trek H e75b3e3dfd Merge branch 'master' into audio-mts-encoder 2019-04-11 11:31:56 +09:30
scruzin d4c6a8f2a3 Removed as grossly out of date. 2019-04-10 16:06:36 +09:30
Saxon 02287bfd80 revid: added more to setupPipeline comment regarding parameters: 2019-04-10 14:05:53 +09:30
Saxon bab1e62798 revid: don't return from revid.Stop() if a close of one of the senders fails 2019-04-10 12:57:28 +09:30
Saxon 850b45d791 revid: temp writeCloser wc in setupPipeline renamed to w 2019-04-10 12:22:41 +09:30
Saxon eb866ada5e revid: restructure rtmpSender's Close method 2019-04-10 12:20:39 +09:30
Saxon 9a52f19e3d revid: fixed mtsSender's output routine's logic 2019-04-10 12:19:28 +09:30
Saxon 3841b8cb5b revid: fixed build error in revid_test.go 2019-04-10 12:16:51 +09:30
Saxon f546b9daed revid: improved mtsSender's output comment and moved closer to call 2019-04-10 12:15:46 +09:30
Saxon dd833afe2e revid: updated comment for setupPipeline 2019-04-10 12:13:08 +09:30
Saxon d3e3904e75 revid: commented Revid.writeClosers 2019-04-10 12:11:45 +09:30
Trek H 669a7d3c22 Merge branch 'master' into audio-mts-encoder 2019-04-09 16:07:02 +09:30
Saxon 66622920d5 revid: Buffered MtsSender 
The mtsSender now has a ringBuffer and tests have been updated accordingly. The mtsSender now uses an output routine to get data from it's ringBuffer to send.
 Revid now uses ioext.multiWriteClosers for encoders to write to so that senders can be closed and therefore any output routines.
 2019-04-09 15:58:34 +09:30
Saxon 4978db2f2b revid: fixed silly rtp bug 2019-04-09 15:44:18 +09:30
Trek H 9fe3de5d65 mts: Changed uses of NewEncoder in revid and senders_test to use extra argument. 2019-04-09 14:00:56 +09:30
Saxon e0d85b8598 revid: removed comment of a print in senders_test.go 2019-04-03 11:40:33 +10:30
Saxon 9435baec5c revid: fixed Write for dummyMultiWriter in revid_test.go 2019-04-03 11:38:37 +10:30
Saxon a061a79805 revid: don't need to make new r.encoder each time just do r.encoder = r.encoder[:0] 2019-04-03 11:36:49 +10:30
Saxon 2bd17d0296 revid: removed restarter interface from senders.go as not required anymore 2019-04-03 11:34:18 +10:30
Saxon b9e7c3ff8c revid: fixed dummyMultiWriter Write func so that it satisfies semantics of io.Writer.Write 2019-04-03 11:31:21 +10:30
Saxon 9bd41b7c3b revid: simplified signature for setupPipeline and fixed commenting 2019-04-03 11:29:54 +10:30
Saxon dbcac80d1f revid: fixed some general commenting 2019-04-02 13:45:36 +10:30
Saxon 681e07540a revid: removed loadSender interface as no longer required 
Removed the loadSender interface as no longer required. As a result close implementations that do nothing have also been removed.
 2019-04-02 13:29:18 +10:30
Saxon 6b91746cf6 revid: removed multiSender and started using std io.multiWriter 
We are now using an io.multiWriter rather than the multiSender. Code has been updated inside revid.go to account for this change, and tests have also been updated accordingly. Tests for
the multiSender have been removed. A dummyMultiWriter has been written to inject our own multiWriter during testing.
 2019-04-02 13:21:46 +10:30
Saxon 065f8ded79 revid: finished simplifying senders 
simplified rtmp and rtp senders by removing load and send methods and doing equivalent logic inside their Write functions.
 2019-04-02 12:53:42 +10:30
Saxon cdd2537cc3 revid: simplified file sender to remove load and send and just do logic in Write 2019-04-01 12:11:05 +10:30
Saxon f17d2ffb8c revid: got rid of minimalHttpSender 
Now that we're removing the concept of a loadSender, there is no need to have a minimalHttpSender (did not implement loadSender) and a httpSender (implemented loadSender). So we can now have
a single httpSender that implements io.Writer just like every other sender.
 2019-04-01 12:07:28 +10:30
Saxon 5a67e71fe4 revid: made minimalHttpSender implement io.Writer 2019-04-01 12:02:15 +10:30
Saxon 24e484c07f revid: simplified mtsSender to remove load and send 
mtsSender has been simplified such that load and send are no longer called in Write. Load and Send have removed and logic is now in Write. The logic has been simplified such that it does not
try to send again. On next PR when ringbuffers are added to senders, we will add logic to deal with this.
 2019-04-01 11:50:11 +10:30
Saxon afe2948cf7 revid: removed unnecessary assertion 2019-03-30 10:08:27 +10:30
Saxon 86971ca055 revid: simplified comments for sender Write methods 2019-03-29 16:24:47 +10:30
Saxon 8cc7f6e500 revid: improved some naming 2019-03-29 16:22:51 +10:30
Saxon 7c724c9fc3 revid: simplified determination of sender types 2019-03-29 16:17:11 +10:30
Saxon 648b43c50a revid: added some commentary 2019-03-29 13:29:31 +10:30
Saxon 3896a5e804 revid: senders are now io.Writers 
Added a Write method to senders such that they implement io.Writer. The multiSender now takes a slice of io.writers.
Also modified revid code and tests to account for this chance.
 2019-03-29 12:49:26 +10:30
Saxon 937f54f418 av: fixed conflicts with master 2019-03-28 11:03:05 +10:30
Saxon 5366eca2f2 av: fixed imports 2019-03-25 11:51:03 +10:30
Saxon 070b1ae215 revid: improved commentary 2019-03-24 20:04:35 +10:30
Saxon 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
Saxon 72d0683162 Merge branch 'master' into ringbuffer-move 2019-03-18 11:08:01 +10:30
Saxon e6694bac62 revid: improved logic in config.Validate for raspivid options 2019-03-18 11:02:11 +10:30
Saxon fa011fb129 Merge branch 'master' into ringbuffer-move 2019-03-17 12:13:13 +10:30
Saxon 01a5759bde revid: changed remote param label for auto white balance from Awb to AutoWhiteBalance 2019-03-17 09:51:09 +10:30
Saxon a0d396ddfe revid: modified test for revid reset to use test encoders. 2019-03-17 09:34:36 +10:30
Saxon 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
Saxon aa888ef115 revid: restructured revid.reset code to make more flexible for testing purposes. 2019-03-16 15:16:06 +10:30
Saxon 39a7b382f6 revid: fixed build errors 2019-03-15 18:05:15 +10:30
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
Saxon 91d21f1da8 revid: fixed import stanzas in mtsSender_test.go file header 2019-03-01 10:03:39 +10:30
Saxon 559d15d6eb revid & stream/mts: fixed file headers in mtsSender_test.go and discontinuity.go regarding licensing location 2019-03-01 10:02:43 +10:30
Saxon 6188d756fd revid: moved some mtsSender logic into load rather than send so that we're not doing the same work over and over again in the case of send failure and retry 2019-03-01 10:01:52 +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
Saxon Milton b6a3e062b5 Merged in path-flag-fix (pull request #143) 
revid: got rid of OutputFileName and InputFileName
 2019-02-28 03:04:05 +00:00
Alan Noble 8a13bb7007 Temporary fix: Make ringBufferSize size larger for RTMP to work over flaky networks. 2019-02-27 05:53:49 +00:00
Saxon 796bc12e09 Merge branch 'master' into improve-defaulting 2019-02-25 18:43:16 +10:30
Dan Kortschak 8240fea9ab revid: fix build 2019-02-25 18:39:01 +10:30
Saxon 7d3d8c3374 revid: change ring buffer size depending on output type 2019-02-25 18:36:39 +10:30
Saxon 2818f308df revid: defaulting to Mpegts packetization if output is Http or Rtp and Defaulting to Flv packetization if output is Rtmp 2019-02-25 18:26:20 +10:30
Alan Noble a90b35b319 Only log a debug message when ring.ErrTimeout occurs, not a warning. 2019-02-25 07:14:30 +00:00
Saxon Milton c247e63bd0 Merged in default-mode-crash-fix (pull request #150) 
revid-cli: initialising config.Output slice when no outputs are defined so that a default output can still be set

Approved-by: Alan Noble <anoble@gmail.com>
 2019-02-25 06:42:38 +00:00
Saxon 5d5af5601f revid: not closing destinations on call to revid.Reset() anymore 2019-02-25 17:00:31 +10:30
Saxon 7f2d53e778 revid: now checking for Packetization var from netreceiver 2019-02-25 16:29:44 +10:30
Saxon b7d1bd17a7 revid: initialising ring buffer in different location 2019-02-25 16:03:28 +10:30
Saxon be6e168774 revid: fixed quantization and bitrate logic in config.Validate() 2019-02-25 15:56:51 +10:30
Saxon cc4d683ba6 revid: calling reset inside revid.Update once config is updated 2019-02-25 15:47:43 +10:30
Saxon 5a2d89ef8f revid: using only one output when we're getting config from netreceiver 2019-02-25 15:31:42 +10:30
Saxon e118a639d4 revid: outputting config when we update 2019-02-25 15:28:19 +10:30
Alan Noble 01d85af133 Removed incorrect Close upon Dial error. 2019-02-22 20:45:13 +00:00
saxon f1625d27f5 revid: fixed destination slice bug 2019-02-17 13:11:17 +10:30
saxon ca0a008c59 revid: correct cc logic is discontinuity.go 2019-02-17 12:50:33 +10:30
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 b3b8c6bb44 stream/mts: checking data is also good in mts segment test 2019-02-17 00:31:30 +10:30
saxon a5cb1c5abb stream/mts: made modifications such that the segment test is passing 2019-02-16 23:52:40 +10:30
saxon 3356457c71 revid: not wrapping t.Errorf 2019-02-16 16:43:15 +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 d3a8bb20de revid: using ausOceanSender if we're doing http output with mpegtrs packetization 2019-02-15 13:05:48 +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 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
saxon ad04893432 revid/revid.go: intialising err from rtp send 2019-02-08 18:14:33 +10:30
saxon f4be7e72d7 Merge branch 'cpu-fix' of http://bitbucket.org/ausocean/av into cpu-fix 2019-02-08 18:12:29 +10:30
saxon 020428db62 revid/revid.go: checking err from ring buffer write within destinations length check 2019-02-08 18:12:03 +10:30
Saxon Milton bc1cb5245a Merged master into cpu-fix 2019-02-08 18:09:25 +10:30
saxon b28a75d665 av/revid: removed test commands that we're not using anymore 2019-02-08 18:07:43 +10:30
Saxon Milton 0bb1006c19 Merged in metadata-refactor (pull request #131) 
Metadata Refactor

Approved-by: kortschak <dan@kortschak.io>
 2019-02-08 01:20:08 +00:00
Saxon Milton 3a05fd533c Merged in mem-leak-debug (pull request #136) 
Mem usage fix

Approved-by: kortschak <dan@kortschak.io>
 2019-02-08 01:18:26 +00:00
saxon f0fc399d47 revid/revid.go: removed space 2019-02-08 11:24:41 +10:30
saxon 8bdfed9960 stream/mts: fixing conflicts 2019-02-08 10:13:51 +10:30
saxon 734cf8cca9 revid/cmd: merged in master and again removed cmds 2019-02-07 23:49:10 +10:30
saxon c7f1acac26 doesn't look like it worked 2019-02-07 18:19:38 +10:30
saxon 3f72e21970 revid: reducing ring buffer size 2019-02-07 18:03:59 +10:30
saxon 628adee49a commenting out things i don't want to run 2019-02-07 16:42:39 +10:30
Saxon Milton ccb8a52db1 revid/revid.go: removing shorthand initialisations for vars already declared 2019-02-06 05:28:57 +00:00
Saxon Milton 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
saxon 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
saxon cdd6703930 } 2019-02-06 15:45:14 +10:30
saxon de4f471201 revid/revid.go: defer r.wg.Done() in revid.outputClips routine 2019-02-05 10:50:21 +10:30
saxon a4d179039b revid/revid.go: removed default case in switch with revid.Update() 2019-02-05 10:49:05 +10:30
saxon 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
saxon 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
saxon ee7eb84d26 revid-cli: correctly using ns.Mode() and ns.SetMode() 2019-02-04 13:25:37 +10:30
saxon 6171c4e999 revid: added handling of burstPeriod to config 2019-02-03 23:43:51 +10:30
saxon 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
saxon 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
saxon 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
saxon bad68923e6 Merge branch 'master' into metadata-refactor 2019-02-01 15:11:57 +10:30
saxon c44d6bbfd3 revid/revid.go: not during time.Duration conversion 2019-02-01 10:08:49 +10:30
saxon 9bddf343f5 revid/revid.go: moved revid.mu declaration 
. Updated todo owner
 2019-02-01 10:07:00 +10:30
saxon 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
saxon 1f1546a284 revid: updated code in senders.go to work with meta changes 2019-01-31 21:30:08 +10:30
saxon 051263c144 revid/revid.go: revid.lex to revid.transcode 2019-01-31 19:58:25 +10:30
saxon 1e307fc37b revid/revid.go: made routines named rather than anonymous 2019-01-31 19:42:20 +10:30
saxon e18b1f51f0 revid/revid.go: capture error from r.Start() in error handling routine 2019-01-31 15:49:44 +10:30
saxon d53eafe215 revid/revid.go: not running r.setupInput() as routine - now getting error an returning 2019-01-31 15:15:38 +10:30
saxon ed4d97f893 stream/mts: patch for revid.Start() no exit bug 2019-01-31 15:03:50 +10:30
Dan Kortschak 58102e5587 revid: fix http destination assignment 2019-01-30 13:19:00 +10:30
Dan Kortschak 071e6fd0f7 revid: honour difference between rtmp dst and others 2019-01-29 19:56:02 +10:30
saxon 37bdb2cf8e av/revid: removed test commands that we're not using anymore 2019-01-22 14:31:42 +10:30
Dan Kortschak 92ba9c89a2 cmd/revid-cli,revid: use a slice for output destination flags 2019-01-19 20:01:42 +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
Dan Kortschak 35d63f664f revid: add v4l properties and fix default device handling 
Also fix logging typos found during work.
 2019-01-17 17:04:59 +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 Milton a58a784a16 Merged in clean-up-revid-consts (pull request #111) 
revid: clean up some revid constants

Approved-by: kortschak <dan@kortschak.io>
 2019-01-16 07:37:07 +00:00
saxon 95349f461d revid/revid.go: removed unused logging consts 2019-01-16 17:52:49 +10:30
saxon d3c8f31c08 revid/revid.go: actually fixed conflict 2019-01-16 17:49:22 +10:30
saxon 606c1a5885 revid/revid.go: fixed conflict 2019-01-16 17:47:57 +10:30
saxon 59024fea79 revid/revid.go: further split up miscy consts 2019-01-16 17:46:17 +10:30
Saxon Milton ef6811d3b8 Merged in webcam (pull request #86) 
revid: addition of webcam input

Approved-by: kortschak <dan@kortschak.io>
 2019-01-16 07:12:30 +00:00
saxon 582f12d157 revid/revid.go: in execution of ffmpeg, the device path is replaced by r.config.InputFileName 2019-01-16 17:29:56 +10:30
saxon e184b091d3 revid/revid.go: rtmp connection properties comment changed to RTMP 2019-01-16 16:42:37 +10:30
saxon 59cc2d409a Revert "revid: removed redundant error logging" 
This reverts commit eacbfb9ee3.
 2019-01-14 16:37:18 +10:30
saxon eacbfb9ee3 revid: removed redundant error logging 2019-01-14 16:31:43 +10:30
Saxon Milton ae34ebe368 Merged in revid-start-stop-errors (pull request #114) 
Return errors from revid.Start and revid.Stop

Approved-by: kortschak <dan@kortschak.io>
 2019-01-14 04:27:34 +00:00
Saxon Milton 137943af82 Merged in revid-config-safer (pull request #112) 
Made revid's Config() func safer

Approved-by: kortschak <dan@kortschak.io>
 2019-01-13 23:57:27 +00:00
saxon 5ae1e41e38 revid: start and stop now return errors 2019-01-13 22:01:04 +10:30