kunmeng/vdk
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
deepch 2021-09-25 17:38:05 +03:00
commit a77315fe6e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
format/rtsp/client.go
View File

@ -805,8 +805,14 @@ func (self *Stream) makeCodecData() (err error) {
err = fmt.Errorf("rtsp: aac sdp config invalid: %s", err) err = fmt.Errorf("rtsp: aac sdp config invalid: %s", err)
return return
} }
case av.OPUS:
channelLayout := av.CH_MONO
if media.ChannelCount == 2 {
channelLayout = av.CH_STEREO
}
self.CodecData = codec.NewOpusCodecData(media.TimeScale, channelLayout)
default: default:
//log.Fatalln("Fix Format may be raw PCM 97", media.PayloadType, media.Type)
err = fmt.Errorf("rtsp: Type=%d unsupported", media.Type) err = fmt.Errorf("rtsp: Type=%d unsupported", media.Type)
return return
} }

2
format/rtspv2/client.go
View File

@ -736,7 +736,7 @@ func (client *RTSPClient) RTPDemuxer(payloadRAW *[]byte) ([]*av.Packet, bool) {
if _, _, _, _, err := aacparser.ParseADTSHeader(frame); err == nil { if _, _, _, _, err := aacparser.ParseADTSHeader(frame); err == nil {
frame = frame[7:] frame = frame[7:]
} }
duration = time.Duration((float32(1024)/float32(client.AudioTimeScale))*1000) * time.Millisecond duration = time.Duration((float32(1024)/float32(client.AudioTimeScale))*1000*1000*1000) * time.Nanosecond
client.AudioTimeLine += duration client.AudioTimeLine += duration
retmap = append(retmap, &av.Packet{ retmap = append(retmap, &av.Packet{
Data: frame, Data: frame,