From 420338e0cc50da4ba0c4593313c7f8513256a91f Mon Sep 17 00:00:00 2001 From: Andrey Semochkin Date: Sun, 19 Apr 2020 09:50:55 +0300 Subject: [PATCH] fix pcm --- format/rtsp/client.go | 21 ++++++++++----------- go.mod | 3 +++ 2 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 go.mod diff --git a/format/rtsp/client.go b/format/rtsp/client.go index 3c751d7..21854b8 100644 --- a/format/rtsp/client.go +++ b/format/rtsp/client.go @@ -8,14 +8,6 @@ import ( "encoding/binary" "encoding/hex" "fmt" - "io" - "net" - "net/textproto" - "net/url" - "strconv" - "strings" - "time" - "github.com/deepch/vdk/av" "github.com/deepch/vdk/av/avutil" "github.com/deepch/vdk/codec" @@ -23,6 +15,14 @@ import ( "github.com/deepch/vdk/codec/h264parser" "github.com/deepch/vdk/format/rtsp/sdp" "github.com/deepch/vdk/utils/bits/pio" + "io" + "log" + "net" + "net/textproto" + "net/url" + "strconv" + "strings" + "time" ) var ErrCodecDataChange = fmt.Errorf("rtsp: codec data change, please call HandleCodecDataChange()") @@ -729,7 +729,6 @@ func (self *Stream) timeScale() int { func (self *Stream) makeCodecData() (err error) { media := self.Sdp - if media.PayloadType >= 96 && media.PayloadType <= 127 { switch media.Type { case av.H264: @@ -768,6 +767,8 @@ func (self *Stream) makeCodecData() (err error) { err = fmt.Errorf("rtsp: aac sdp config invalid: %s", err) return } + default: + log.Fatalln("Fix Format may be raw PCM 97", media.PayloadType, media.Type) } } else { switch media.PayloadType { @@ -782,7 +783,6 @@ func (self *Stream) makeCodecData() (err error) { return } } - return } @@ -1110,7 +1110,6 @@ func (self *Client) Play() (err error) { if err = self.WriteRequest(req); err != nil { return } - if self.allCodecDataReady() { self.stage = stageCodecDataDone } else { diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..11b1d18 --- /dev/null +++ b/go.mod @@ -0,0 +1,3 @@ +module github.com/deepch/vdk + +go 1.14