Saxon
866e398496
revid: move processFrom func and deletec inputs.go file
...
inputs.go can now go considering it only held "start functions" which have been replaced
by the AVDevice and it's implementations.
2019-11-13 14:11:29 +10:30
Saxon
dec39a3636
revid: now using AVDevice implementations
...
Also renamed constructors of devices to reduce stutter e.g. raspivid.NewRaspivid to
raspivid.New
2019-11-13 14:11:29 +10:30
Trek H
b6dd737034
device: audio package name changed to alsa
...
yobert/alsa imports changed to yalsa
directory and file names changed to reflect package name change
2019-11-12 13:28:53 +10:30
Trek Hopton
cbbf3deef8
Merged in audio-avdevice (pull request #277 )
...
Audio implementing AVDevice
Approved-by: Saxon Milton <saxon.milton@gmail.com>
Approved-by: Alan Noble <anoble@gmail.com>
2019-11-11 12:13:42 +00:00
Trek H
c4134fd30e
audio: renamed ADPCMDevice to ALSA
2019-11-11 22:26:53 +10:30
Trek H
733785254e
audio: renamed AudioDevice to ADPCMDevice
2019-11-11 19:39:10 +10:30
Trek H
b66f415e1c
audio: renamed Device to AudioDevice
2019-11-11 17:50:46 +10:30
Trek H
3df9300c1c
audio: updated startAudioDevice to use AVDevice implementation
2019-11-11 17:05:10 +10:30
Saxon
6b5911633a
revid/config/config.go: decrease default ring buffer size and increase MTS ring buffer element size
2019-11-11 14:32:24 +10:30
Saxon
fa5585271e
revid: audio input meta addition moved to Revid.setupPipeline()
2019-11-09 22:49:04 +10:30
Saxon
ff54b40bd2
revid/inputs.go: using alias avconfig for revid/config package
2019-11-08 17:35:44 +10:30
Saxon
772c381293
device/geovision: renamed gvctrl package to config
2019-11-08 17:29:01 +10:30
Saxon
53dc629fb1
revid: sender ring buffers flush only if write was successful
2019-11-08 10:06:51 +10:30
Saxon
9314e0d32e
revid/config/config.go: fixed constant names in comments for Input and Outputs fields of Config
2019-11-06 21:26:39 +10:30
Saxon
57d73a8d0a
created av/device package and sub packages raspivid, geovision, webcam and file
...
av/device/device.go now contains the AVDevice interface and implementations of this
interface, namely, raspivid, geovision, webcam and file are contained in the packages
av/device/raspivid, av/device/geovision, av/device/webcam and av/device/file
respctively. config.go and testing was also moved to a new package called config.go in
order to remove would be circular dependency between AVDevice implementations and revid.
Modifications were made elsewhere expecting config.Config to be part of the revid package.
2019-11-06 17:44:50 +10:30
Saxon
9a93e92b50
revid/webcam.go: fixed error messages in Webcam.Stop
2019-11-06 11:31:12 +10:30
Saxon
a02ea397d5
revid/geovision.go: fixed GeoVision constructor name, NewGeovision->NewGeoVision
2019-11-06 10:45:48 +10:30
Saxon
bc7f450c5f
revid: fixed AVDevice comment
2019-11-06 08:48:18 +10:30
Saxon
a6aef125fd
revid: cleaned up AVDevice implementations and added documentation to them
2019-11-05 20:14:04 +10:30
Saxon
50c7fe139b
revid/file.go: wrote AVDevice implementation for file containing audio or video media
2019-11-05 12:36:27 +10:30
Saxon
81d168a277
revid/webcam.go: wrote implementations of Start, Stop and Read methods
2019-11-05 11:56:34 +10:30
Saxon
8302e959d9
revid/webcam.go: started writing implementation of AVDevice for webcams
2019-11-05 10:57:12 +10:30
Saxon
5afad9c5aa
revid/geovision.go: wrote Read method implementation
2019-11-04 19:43:02 +10:30
Saxon
ce8dc9a4b3
revid/geovision.go: wrote Stop method implementation
2019-11-04 19:27:05 +10:30
Saxon
1497f4a575
revid/geovision.go: wrote Start method implementation
2019-11-04 19:12:13 +10:30
Saxon
bea4d46c72
revid/geovision.go: added geovision.go file and started geovision implementation of AVDevice interface
2019-11-04 15:47:18 +10:30
Saxon
d5aa968a27
revid/geovision.go: created file geovision.go to hold geovision implementation of AVDevice and wrote Set function
2019-11-02 10:54:50 +10:30
Saxon
82903681ee
revid/raspivid.go: wrote Stop implementation for Raspivid AVDevice implementation
2019-11-02 10:42:56 +10:30
Saxon
b2a9dbf17d
revid/raspivid.go: wrote Read implementatino for io.Reader interface
2019-11-02 10:36:55 +10:30
Saxon
b554c2820a
revid: wrote implementation of Start method for Raspivid implementation
2019-11-02 10:31:40 +10:30
Saxon
924858c1c0
revid: added raspivid.go file to hold Raspivid implementation of AVDevice interface
...
Wrote consts for default values, wrote global errors, wrote multiError type (might move)
wrote Set method.
2019-11-01 21:49:30 +10:30
Saxon
20bf962fa3
revid: added AVDevice interface
2019-10-29 19:02:55 +10:30
Saxon
47f6dcfe51
codec/h264/extract.go: extracter->extractor everywhere
2019-10-28 08:41:49 +10:30
Saxon
7dac9799be
revid/revid.go: break if the given saturation or brightness vars are invalid
2019-10-26 08:24:53 +10:30
Saxon
f1c0fc1dbf
revid: created CameraChan config field to allow selection of GeoVision camera channel
2019-10-25 12:12:30 +10:30
Saxon
2b52266407
revid/inputs.go: corrected ipCamPass value
2019-10-23 14:06:16 +10:30
Saxon
38cfad7b67
revid: fixing some more bugs
...
Fixed H264 RTP extractor. Fine tuned some timing regarding geovision setup. Added some more
logging to geovision setup.
2019-10-23 12:48:22 +10:30
Saxon
f336a03d7a
revid: general bug fixing
...
Use http instead of https in gvctrl getLogin request. Gave RTP client a close method so that the conn can
be closed after we're done with the client. Put timeout on reading from the RTP client PacketConn so that
we don't hang on the ReadFrom call if the conn is closed. Closing the RTSP and RTP clients when
startRTSPCamera is returned.
2019-10-22 23:04:33 +10:30
Saxon
504179c03b
revid: added code to deal with Input var
2019-10-22 16:17:35 +10:30
Saxon
8c1c192218
revid: revid config to update geovision configuration using gvctrl
...
Added required new params to config structure, and therefore also added new defaults and validation checking.
Also updated revid's update func so that we can control new parameters using vars. Now using gvctrl in
startRTSPCamera function and interpreting revid config to configure camera.
2019-10-22 14:54:38 +10:30
Saxon
8837dce389
revid: write timeouts for ringbuffer are just int to avoid overflow when converting duration to int on pi for the purpose of logging
2019-10-15 11:02:28 +10:30
Saxon
ee1bea3f77
revid: fixed crash: converting durations to int before giving to logger as args
2019-10-15 10:52:48 +10:30
Saxon Milton
5642af9cc5
Merged in gv-h264-rtmp-fix (pull request #262 )
...
revid: fix GeoVision H264 over RTMP to youtube
Approved-by: Alan Noble <anoble@gmail.com>
2019-10-12 10:43:16 +00:00
Saxon
874b9639cf
revid: made RTMP and MTS sender ring buffer write timeouts configurable
2019-10-12 21:10:48 +10:30
Saxon
8489d615d8
revid: panic if invalid input, or invalid input codec for corresponding input
2019-10-12 20:54:32 +10:30
Saxon
fc4e88bce6
fixed bugs causing problems with GeoVision H264 RTMP to youtube streaming.
...
Two fixes were involved, firstly, access unit delimeters were used to denote access units and the Write timeout on rtmpSender's ringBuffer was
increased to stop the 'unable to dump old write' errors. Also made some small changes elsewhere that should fix future issues, particular with
MTS output.
2019-10-07 14:18:20 +10:30
Saxon
6df95886dd
revid: using mutex to synchronise usage of Start and Stop
2019-10-01 23:44:38 +09:30
Saxon
8df837ee49
revid/senders_test.go: turning package based PSI sending on for TestMtsSenderDiscontinuity to fix hanging bug
2019-10-01 20:47:03 +09:30
Saxon
a37b250e3c
revid: moved code relating to inputs to separate file called inputs.go
2019-09-25 11:30:56 +09:30
Saxon
38f2d691cf
revid: now using correct consts to indicate codec
2019-09-24 17:35:17 +09:30
Saxon
191be04b11
revid: added support for MJPEG packetisation
...
Changes included adding support for variable InputCodec that may be set via netreceiver/vidgrind to set to H264/MJPEG. Also setting revid's lexTo
function to mjpeg.Lex in the case of an MJPEG InputCodec. Added options parameter to mts.NewEncoder function so that we can change options of the
encoder, namely whether it bases PSI interval on NAL type, or number of frames - in the case of MJPEG we based PSI interval on number of frames.
2019-09-24 07:42:26 +09:30
Saxon Milton
fe49be41ad
revid: setting revid's config in revid.New
2019-09-12 07:47:46 +00:00
Saxon
9769a3c4a9
revid: not setting up pipeline until we start
2019-09-12 17:08:22 +09:30
Saxon
a8081b52b2
revid/config.go: MinPeriod => MinFrames
2019-08-26 13:43:45 +09:30
Saxon
e57e14678a
container/mts: using RealTime type from utils package instead of global vars with mutator functions
2019-08-26 13:29:07 +09:30
Saxon
24e9ed69ca
revid/config.go: got rid of remaining references of 'RefreshPeriod' which is now MinPeriod
2019-08-26 09:26:35 +09:30
Saxon
817cc86a34
revid: now have MinPeriod and ClipDuration params
...
This change included a rename of IntraRefreshPeriod to MinPeriod, and the addition of the ClipDuration param. PSI are now written before IDR. Clips are no longer outputed
based on PSI but rather a time ClipDuration, where ClipDuration >= MinPeriod, however, PSI must still be at the beginning of each clip. Also created functionality to update
meta time even if we don't have a response to update.
2019-08-25 20:42:01 +09:30
Saxon
d390918209
revid: corrected logic for RTMPURL fallback and fixed bug in test
2019-08-24 14:53:49 +09:30
Saxon
ce8295bb36
revid: variable bitrate default for HTTP mode, also wrote some testing for config validation
2019-08-24 14:02:24 +09:30
Saxon Milton
37b8e7a8bc
revid: increase sender ring buffer read timeouts to slow down output loops
2019-08-23 15:51:01 +09:30
Saxon
b41ae4bcd3
revid: fixed config check bug
2019-08-09 19:18:52 +09:30
Saxon Milton
5bd2528bb0
Merged in rb-vars (pull request #230 )
...
revid: ring buffer sizes configurable via vars
Approved-by: kortschak <dan@kortschak.io>
2019-08-09 06:06:20 +00:00
Saxon
67e50295c9
revid: fixed assignment of MTSRBSize
2019-08-09 15:34:29 +09:30
scruzin
ab6c789c34
Added license.
2019-08-08 15:23:09 +09:30
scruzin
cd1e7294dd
Merge branch 'compile-on-windows' of https://bitbucket.org/ausocean/av into compile-on-windows
2019-08-08 15:02:12 +09:30
scruzin
dec7bd4870
Initial revision.
2019-08-08 15:01:16 +09:30
Alan Noble
2597556e6d
Add missing packages for Linux.
2019-08-08 14:57:09 +09:30
Alan Noble
11e6d55f49
Merge branch 'compile-on-windows' of https://bitbucket.org/ausocean/av into compile-on-windows
2019-08-08 14:50:04 +09:30
scruzin
d32eac7394
Moved audio support to OS-specific files.
2019-08-08 14:39:55 +09:30
Saxon
75b7a2946f
revid: made MTS and RTMP ringbuffer sizes configurable via vars and added to revid config
2019-08-08 13:20:02 +09:30
Saxon
83407004ed
revid: gave mtsSender and rtmpSender separate ringBuffer sizes, and also increase rtmpSender ringBuffer element size
2019-08-07 17:02:06 +09:30
Trek H
3f29f0c84e
Merge branch 'master' into revid-audio
2019-08-02 23:32:21 +09:30
Saxon Milton
05f79ddbe3
revid: increase RtmpSender ring buffer size
2019-07-14 05:59:55 +00:00
Trek H
370aa19c23
audio: style and doc
2019-06-18 19:03:38 +09:30
Trek H
6dd70639fe
audio: removed bufSize arg in Lex funcs and use ByteLexer
2019-06-18 17:24:32 +09:30
Trek H
e3ba1e43f3
Merge branch 'master' into revid-audio
2019-06-14 00:15:04 +09:30
Saxon
2640b1b615
Merge branch 'h264-rtp-lexer'
2019-06-07 02:00:41 +09:30
Saxon
ce457e1d95
should have been in last commit
2019-06-07 02:00:31 +09:30
Saxon Milton
499a26c09f
Merged in h264-rtp-lexer (pull request #202 )
...
codec/h264: added RTPLexer
Approved-by: Alan Noble <anoble@gmail.com>
2019-06-06 16:02:04 +00:00
Trek H
96c1b51173
revid and audio: seperated audio into own package
...
audio device input is now handle in its own package which resides in the new input directory
a list of codecs was added to codecutil package to help with multiple packages using the same codecs
2019-06-06 02:09:55 +09:30
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
409dcabe0a
revid: added codec conversion after recording
2019-06-04 02:31:35 +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
e851ea228c
revid: added switch for codec conversion after recording
2019-05-29 02:20:19 +09:30
Trek H
c2b5ee0574
revid: simplified audio device read write concurrency
2019-05-29 02:06:58 +09:30
Saxon
061b015297
revid/config.go: updated commend for Config's InputCodec field.
2019-05-28 12:37:50 +09:30
Saxon
b6e5414c8a
revid: fixed merge conflicts
2019-05-27 15:15:26 +09:30
Saxon
1df0d214c9
revid/revid.go: fixed merge conflicts
2019-05-27 15:00:41 +09:30
Saxon
809d904878
revid/revid.go: commented startRTSPCamera
2019-05-23 14:10:09 +09:30
Trek H
5225896924
revid: gave AudioDevice a logger
2019-05-23 01:23:51 +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
Trek H
17d59014c6
revid: added concurrency support to start and stop
2019-05-22 14:56:58 +09:30
Saxon
722ddc6ccb
codec/h264/lex_test.go: added test for RTPLexer.Lex(...) and also fixed some build errors
2019-05-22 14:49:25 +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
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