Commit Graph

2681 Commits

Author SHA1 Message Date
Saxon c0b5724ea7 Merge branch 'master' into h264-rtp-lexer 2019-05-22 11:10:03 +09:30
Saxon Milton c3d8572eed Merged in use-codecutil-in-lexers (pull request #201)
codec: H264 and MJPEG lexers now using codecutil package for byte scanner functionality
2019-05-22 01:39:22 +00:00
Saxon 980cf8da21 codec: H264 and MJPEG lexers now using codecutil package for byte scanner functionality 2019-05-22 11:07:39 +09:30
Saxon 85984555a3 container/mts/encoder.go: fixed comment for pmtTable initialisation 2019-05-21 17:09:47 +09:30
Saxon fbcd163864 protocol/rtcp: fixed bug regarding checking of close err channel from client in routines. 2019-05-21 17:07:28 +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
Saxon 88ffdf08b5 revid: changed the input enum for RTSP input from RTSPCamera to RTSP 2019-05-21 12:18:52 +09:30
Saxon 39a573e10b protocol/rtsp: removed cmd/record as revid can do what this did 2019-05-21 01:51:14 +09:30
Saxon 91d2697a55 revid: general clean up 2019-05-21 01:48:29 +09:30
Saxon 970a445ca4 codec/h265/lexer.go & protocol/rtp/client.go: fixed lexer and rtp client.
The lexer had a bug which is now fixed, and the RTP client is no longer looking for SSRC
in rtp.NewClient (which means we miss a packet).
2019-05-20 20:49:50 +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 819b4a122f codec/h264: renamed Lex to LexFromBytestream 2019-05-19 21:44:23 +09:30
Saxon f52acc7efb codec/h264: fixed comment for Lex 2019-05-19 21:38:05 +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 0567a81757 codec/h265: removed unnecessary allocation in handle fragmentation 2019-05-19 21:14:41 +09:30
Saxon abd41d9f01 codec/h265/lex_test.go: fixed TestLex to account for previous changes 2019-05-19 20:45:26 +09:30
Saxon a2d1b09e92 codec/h265: fixed lexer to get nal header into start of fragment
Now getting the nal header and type from fu header for the first fragment. We can now
lex and create HEVC MTS to RTP - working fine. Need to use RTCP now to continue stream.
2019-05-19 17:21:41 +09:30
Trek H 5e4a2fb866 adpcm: naming 2019-05-17 00:58:40 +09:30
Trek H a6d6a22b82 adpcm: changed enc and dec to use io.Writer as dst
also reordered encoder and decoder functions and remove old block consts
2019-05-17 00:52:36 +09:30
Saxon 92d4c5f79a container/mts/encoder.go: generalising stream id logic 2019-05-16 16:41:52 +09:30
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
Saxon bd56e936a4 cmd/revid-cli: checking Input flag string and assigning cfg.Input to revid.RTSPCamera if 'RTSPCamera' is entered. 2019-05-16 13:05:09 +09:30
Saxon 5a2f15054d cmd/revid-cli: added flags related to RTSP input
Added 'RTSPCamera' option to description for 'Input' revid-cli flag. Also added other flags required
to set config params for RTSP input, like RTSPURL, RTPRecvAddr and RTCPAddr.
2019-05-16 12:55:35 +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 Milton 6b64314d71 Merged in h265-lexer (pull request #189)
codec/h265: h265 lexer and testing
2019-05-13 07:41:17 +00:00
Saxon Milton 384640b41a Merged in beatgammit-rtsp-overhaul (pull request #187)
protocol/rtsp: RTSP protocol functionality from modified and extended package

Approved-by: Alan Noble <anoble@gmail.com>
2019-05-13 07:39:29 +00:00
Saxon Milton 577a59b4e9 Merged in get-pts-range (pull request #197)
container/mts: GetPTSRange func

Approved-by: Alan Noble <anoble@gmail.com>
2019-05-13 07:38:40 +00:00
Saxon 8081fd48a0 container/mts/mpegts.go: fixed conflict with master 2019-05-13 17:07:53 +09:30
Saxon 1762adf338 revid/config.go: finished commenting config fields, and removed unused options. 2019-05-13 16:55:20 +09:30
Saxon Milton 299ed19604 Merged in codecutils (pull request #190)
codec: added codecutils/bytescan package

Approved-by: Alan Noble <anoble@gmail.com>
2019-05-13 07:10:17 +00:00
Saxon Milton 5485399e6d Merged in rtp-packet-reader (pull request #198)
protocol/rtp/client.go: Client now uses PacketReader

Approved-by: Alan Noble <anoble@gmail.com>
2019-05-13 07:09:46 +00:00
Saxon Milton 466552cbf9 Merged in mpegts-testing (pull request #195)
container/mts: testing for mpegts.go and encoder.go

Approved-by: Alan Noble <anoble@gmail.com>
2019-05-13 07:09:08 +00:00
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
Saxon 07a6cfcf68 protocol/rtp/client.go: commented PacketReader 2019-05-13 14:03:11 +09:30
Saxon dc0ecf712d fixed config outputs defaulting bug 2019-05-12 01:57:38 +09:30
Saxon 4f55f2bed1 protocol/rtp/client.go: initialising PacketReader now to fix build runtime panic 2019-05-11 22:04:45 +09:30
Saxon 6acc2d7376 protocol/rtp/client.go: wrote PacketReader type
Client now possesses a PacketReader which has it's Read func wrapped by the Client's Read func
2019-05-11 22:01:07 +09:30
Saxon 8a44b10864 codec/h265/lex.go: fixed indentation in file header 2019-05-11 21:26:42 +09:30
Saxon 51f4d123bf container/mts: using MPEG-TS in comments rather than MPEGTS or mpegts 2019-05-11 21:14:28 +09:30
Saxon 1ab6ab116a container/mts/encoder.go: fixed comment for PTSFrequency const. 2019-05-11 16:33:09 +09:30
Saxon aa5a089c55 container/mts/encoder.go: fixed comment for time-related constants 2019-05-11 16:32:00 +09:30
Saxon 20a5ed5362 container/mts/mpegts.go: renamed pidType to pid in GetPTSRange 2019-05-11 16:30:29 +09:30
Saxon 5652b05c21 container/mts/mpegts.go: added package level doc comment 2019-05-11 16:29:15 +09:30
Saxon 0d3463ac87 container/mts: update comments for PCRFrequency and PTSFrequency 2019-05-11 13:57:02 +09:30