Commit Graph

319 Commits

Author SHA1 Message Date
Trek H 7b4daed4a6 revid: added metadata to audio mts streams 2019-06-05 15:08:47 +09:30
Trek H bea747085f revid: updated lex funcs in tests, changed audioDevice logger
Since adding the extra bufSize arg to Lex functions, the test functions using them needed to be updated.
NewAudioDevice was changed to accept a logger to log to instead of creating a new one.
2019-06-04 12:28:40 +09:30
Trek H 90c34c4108 revid: fixed issues after merge 2019-06-03 18:35:28 +09:30
Trek H 3d7539c6df Merge branch 'master' into revid-audio 2019-06-03 17:50:48 +09:30
Trek H c2b5ee0574 revid: simplified audio device read write concurrency 2019-05-29 02:06:58 +09:30
Saxon 809d904878 revid/revid.go: commented startRTSPCamera 2019-05-23 14:10:09 +09:30
Trek H dd66c58f40 revid: concurrency and testing
fixed a situation where a deadlock can occur and also found and fixed some issues while testing different initialisations on AudioDevice.
2019-05-23 00:19:44 +09:30
Saxon d29141cf05 container/mts: changed consts H264, H265 and Audio to EncodeH264, EncodeH265 and EncodeAudio 2019-05-21 16:57:17 +09:30
Saxon eeaf806c6e protocol/rtcp/client.go & revid/revid.go: removed rtcp.Client.Done() and now blocking on rtcp.Client.Err() in revid.
It seems unnecessary to have the rtcp.Client.Done() func, considering that we could use
the rtcp.Client.err channel itself to determine if the RTCP client has been stopped.
We simple wait on a chan receive in revid in the error handling routine, and we check the
'ok' return - if it is false, then the err chan has been closed and we can get out of the
error handling loop. This should also reduce CPU usage significantly.
2019-05-21 13:23:04 +09:30
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
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 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 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 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
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 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
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
Saxon 74c995d452 revid: addressing PR feedback 2019-04-18 16:55:48 +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 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 9b48d22392 av: fixed conflicts with master 2019-04-13 20:15:08 +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