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

test annexB

Browse Source
This commit is contained in:
deepch 2022-03-13 22:16:09 +03:00
parent c652970643
commit b13c5434c5
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
format/rtspv2/client.go
View File

@ -585,7 +585,6 @@ func (client *RTSPClient) RTPDemuxer(payloadRAW *[]byte) ([]*av.Packet, bool) {
client.PreVideoTS = timestamp client.PreVideoTS = timestamp
} }
if timestamp-client.PreVideoTS < 0 { if timestamp-client.PreVideoTS < 0 {
//var ui32 uint64 = math.MaxUint32
if math.MaxUint32-client.PreVideoTS < 90*100 { //100 ms if math.MaxUint32-client.PreVideoTS < 90*100 { //100 ms
client.PreVideoTS = 0 client.PreVideoTS = 0
client.PreVideoTS -= (math.MaxUint32 - client.PreVideoTS) client.PreVideoTS -= (math.MaxUint32 - client.PreVideoTS)
@ -715,7 +714,7 @@ func (client *RTSPClient) RTPDemuxer(payloadRAW *[]byte) ([]*av.Packet, bool) {
} }
} }
default: default:
//client.Println("Unsupported NAL Type", naluType) client.Println("Unsupported NAL Type", naluType)
} }
} }
} }

33
format/webrtcv3/adapter.go
View File

@ -7,11 +7,11 @@ import (
"log" "log"
"time" "time"
"github.com/pion/interceptor" "github.com/deepch/vdk/codec/h264parser"
"github.com/pion/webrtc/v3"
"github.com/deepch/vdk/av" "github.com/deepch/vdk/av"
"github.com/deepch/vdk/codec/h264parser" "github.com/pion/interceptor"
"github.com/pion/webrtc/v3"
"github.com/pion/webrtc/v3/pkg/media" "github.com/pion/webrtc/v3/pkg/media"
) )
@ -219,12 +219,29 @@ func (element *Muxer) WritePacket(pkt av.Packet) (err error) {
} }
switch tmp.codec.Type() { switch tmp.codec.Type() {
case av.H264: case av.H264:
codec := tmp.codec.(h264parser.CodecData) nalus, _ := h264parser.SplitNALUs(pkt.Data)
if pkt.IsKeyFrame { for _, nalu := range nalus {
pkt.Data = append([]byte{0, 0, 0, 1}, bytes.Join([][]byte{codec.SPS(), codec.PPS(), pkt.Data[4:]}, []byte{0, 0, 0, 1})...) naltype := nalu[0] & 0x1f
} else { if naltype == 5 {
pkt.Data = pkt.Data[4:] codec := tmp.codec.(h264parser.CodecData)
err = tmp.track.WriteSample(media.Sample{Data: append([]byte{0, 0, 0, 1}, bytes.Join([][]byte{codec.SPS(), codec.PPS(), nalu}, []byte{0, 0, 0, 1})...), Duration: pkt.Duration})
} else {
err = tmp.track.WriteSample(media.Sample{Data: append([]byte{0, 0, 0, 1}, nalu...), Duration: pkt.Duration})
}
if err != nil {
return err
}
} }
WritePacketSuccess = true
return
/*
codec := tmp.codec.(h264parser.CodecData)
if pkt.IsKeyFrame {
pkt.Data = append([]byte{0, 0, 0, 1}, bytes.Join([][]byte{codec.SPS(), codec.PPS(), pkt.Data[4:]}, []byte{0, 0, 0, 1})...)
} else {
pkt.Data = pkt.Data[4:]
}
*/
case av.PCM_ALAW: case av.PCM_ALAW:
case av.OPUS: case av.OPUS:
case av.PCM_MULAW: case av.PCM_MULAW: