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

Debug desync (#1)

Browse Source 
* fix: Enabled header resync search
This commit is contained in:
davidtaddei 2022-09-15 16:09:08 +01:00 committed by GitHub
parent 56489a0866
commit 4db17be740
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
format/rtspv2/client.go
View File

@ -258,7 +258,8 @@ func (client *RTSPClient) startStream() {
timer := time.Now() timer := time.Now()
oneb := make([]byte, 1) oneb := make([]byte, 1)
header := make([]byte, 4) header := make([]byte, 4)
var fixed bool first := make([]byte, 2)
failed := 0
for { for {
err := client.conn.SetDeadline(time.Now().Add(client.options.ReadWriteTimeout)) err := client.conn.SetDeadline(time.Now().Add(client.options.ReadWriteTimeout))
if err != nil { if err != nil {
@ -273,19 +274,36 @@ func (client *RTSPClient) startStream() {
} }
timer = time.Now() timer = time.Now()
} }
if !fixed {
nb, err := io.ReadFull(client.connRW, header) first[0] = 0x00
if err != nil || nb != 4 { first[1] = 0x00 //TODO: Find a way to inject an expected channel identifier
for !(first[0] == 0x24 || first[0] == 0x52) || first[1] != 0x0 {
nb, err := io.ReadFull(client.connRW, first)
if err != nil || nb != 2 {
client.Println("RTSP Client RTP Read Header", err) client.Println("RTSP Client RTP Read Header", err)
return return
} }
client.Println("Searching for 0x24 or 0x52 headers: ", first)
} }
fixed = false
header[0] = first[0]
header[1] = first[1]
nb, err := io.ReadFull(client.connRW, header[2:])
if err != nil || nb != 2 {
client.Println("RTSP Client RTP Read Header", err)
return
}
length := int32(binary.BigEndian.Uint16(header[2:]))
client.Println("Got frame header: ", header, length)
switch header[0] { switch header[0] {
case 0x24: case 0x24:
failed = 0
length := int32(binary.BigEndian.Uint16(header[2:])) length := int32(binary.BigEndian.Uint16(header[2:]))
if length > 65535 || length < 12 { if length > 65535 || length < 12 {
client.Println("RTSP Client RTP Incorrect Packet Size") client.Println("RTSP Client RTP Incorrect Packet Size: ", length)
return return
} }
content := make([]byte, length+4) content := make([]byte, length+4)
@ -321,6 +339,7 @@ func (client *RTSPClient) startStream() {
client.OutgoingPacketQueue <- i2 client.OutgoingPacketQueue <- i2
} }
case 0x52: case 0x52:
failed = 0
var responseTmp []byte var responseTmp []byte
for { for {
n, rerr := io.ReadFull(client.connRW, oneb) n, rerr := io.ReadFull(client.connRW, oneb)
@ -347,11 +366,15 @@ func (client *RTSPClient) startStream() {
} }
} }
default: default:
client.Println("RTSP Client RTP Read DeSync") failed = failed + 1
client.Println("RTSP Client RTP Read DeSync: Failed frames", failed)
if failed > 500 {
return return
} }
} }
} }
}
func (client *RTSPClient) request(method string, customHeaders map[string]string, uri string, one bool, nores bool) (err error) { func (client *RTSPClient) request(method string, customHeaders map[string]string, uri string, one bool, nores bool) (err error) {
err = client.conn.SetDeadline(time.Now().Add(client.options.ReadWriteTimeout)) err = client.conn.SetDeadline(time.Now().Add(client.options.ReadWriteTimeout))
@ -747,7 +770,7 @@ func (client *RTSPClient) RTPDemuxer(payloadRAW *[]byte) ([]*av.Packet, bool) {
} }
} }
default: default:
client.Println("Unsupported NAL Type", naluType) //client.Println("Unsupported NAL Type", naluType)
} }
} }
} }