package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-04 23:02:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

support tracks without clock rate

Browse Source
This commit is contained in:
aler9
2022-11-27 21:17:48 +01:00
parent f16cb173b7
commit d521a785c4
9 changed files with 75 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client.go
View File

@@ -1229,7 +1229,7 @@ func (c *Client) doDescribe(u *url.URL) (Tracks, *url.URL, *base.Response, error
}
var tracks Tracks
sd, err := tracks.Unmarshal(res.Body, true)
sd, err := tracks.Unmarshal(res.Body)
if err != nil {
return nil, nil, nil, err
}

4
pkg/rtcpreceiver/rtcpreceiver.go
View File

@@ -103,6 +103,10 @@ func (rr *RTCPReceiver) report(ts time.Time) rtcp.Packet {
return nil
}
if rr.clockRate == 0 {
return nil
}
report := &rtcp.ReceiverReport{
SSRC: rr.receiverSSRC,
Reports: []rtcp.ReceptionReport{

4
pkg/rtcpsender/rtcpsender.go
View File

@@ -80,6 +80,10 @@ func (rs *RTCPSender) report(ts time.Time) rtcp.Packet {
return nil
}
if rs.clockRate == 0 {
return nil
}
return &rtcp.SenderReport{
SSRC: *rs.senderSSRC,
NTPTime: func() uint64 {

2
serversession.go
View File

@@ -532,7 +532,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
}
var tracks Tracks
_, err = tracks.Unmarshal(req.Body, false)
_, err = tracks.Unmarshal(req.Body)
if err != nil {
return &base.Response{
StatusCode: base.StatusBadRequest,

10
serverstream.go
View File

@@ -100,16 +100,20 @@ func (st *ServerStream) rtpInfo(trackID int, now time.Time) (uint16, uint32, boo
return 0, 0, false
}
clockRate := st.tracks[trackID].ClockRate()
if clockRate == 0 {
return 0, 0, false
}
// sequence number of the first packet of the stream
seq := track.lastSequenceNumber + 1
// RTP timestamp corresponding to the time value in
// the Range response header.
// remove a small quantity in order to avoid DTS > PTS
cr := st.tracks[trackID].ClockRate()
ts := uint32(uint64(track.lastTimeRTP) +
uint64(now.Sub(track.lastTimeNTP).Seconds()*float64(cr)) -
uint64(cr)/10)
uint64(now.Sub(track.lastTimeNTP).Seconds()*float64(clockRate)) -
uint64(clockRate)/10)
return seq, ts, true
}

7
track_generic.go
View File

@@ -110,12 +110,7 @@ func newTrackGenericFromMediaDescription(
// Init initializes a TrackGeneric
func (t *TrackGeneric) Init() error {
var err error
t.clockRate, err = findClockRate(t)
if err != nil {
return fmt.Errorf("unable to get clock rate: %s", err)
}
t.clockRate, _ = findClockRate(t)
return nil
}

64
track_test.go
View File

@@ -599,68 +599,6 @@ func TestTrackNewFromMediaDescriptionErrors(t *testing.T) {
},
"no media formats found",
},
{
"no rtpmap",
&psdp.MediaDescription{
MediaName: psdp.MediaName{
Media: "video",
Protos: []string{"RTP", "AVP"},
Formats: []string{"90"},
},
},
"unable to get clock rate: attribute 'rtpmap' not found",
},
{
"invalid clockrate 1",
&psdp.MediaDescription{
MediaName: psdp.MediaName{
Media: "video",
Protos: []string{"RTP", "AVP"},
Formats: []string{"96"},
},
Attributes: []psdp.Attribute{
{
Key: "rtpmap",
Value: "97 mpeg4-generic/48000/2",
},
},
},
"unable to get clock rate: attribute 'rtpmap' not found",
},
{
"invalid clockrate 2",
&psdp.MediaDescription{
MediaName: psdp.MediaName{
Media: "video",
Protos: []string{"RTP", "AVP"},
Formats: []string{"96"},
},
Attributes: []psdp.Attribute{
{
Key: "rtpmap",
Value: "96 mpeg4-generic",
},
},
},
"unable to get clock rate: invalid rtpmap (mpeg4-generic)",
},
{
"invalid clockrate 3",
&psdp.MediaDescription{
MediaName: psdp.MediaName{
Media: "video",
Protos: []string{"RTP", "AVP"},
Formats: []string{"96"},
},
Attributes: []psdp.Attribute{
{
Key: "rtpmap",
Value: "96 mpeg4-generic/aa",
},
},
},
"unable to get clock rate: strconv.ParseInt: parsing \"aa\": invalid syntax",
},
{
"aac missing fmtp",
&psdp.MediaDescription{
@@ -966,7 +904,7 @@ func TestTrackURL(t *testing.T) {
} {
t.Run(ca.name, func(t *testing.T) {
var tracks Tracks
_, err := tracks.Unmarshal(ca.sdp, false)
_, err := tracks.Unmarshal(ca.sdp)
require.NoError(t, err)
ur, err := tracks[0].url(ca.baseURL)
require.NoError(t, err)

7
tracks.go
View File

@@ -3,7 +3,6 @@ package gortsplib
import (
"fmt"
"strconv"
"strings"
psdp "github.com/pion/sdp/v3"
@@ -14,7 +13,7 @@ import (
type Tracks []Track
// Unmarshal decodes tracks from the SDP format. It returns the decoded SDP.
func (ts *Tracks) Unmarshal(byts []byte, skipGenericTracksWithoutClockRate bool) (*sdp.SessionDescription, error) {
func (ts *Tracks) Unmarshal(byts []byte) (*sdp.SessionDescription, error) {
var sd sdp.SessionDescription
err := sd.Unmarshal(byts)
if err != nil {
@@ -26,10 +25,6 @@ func (ts *Tracks) Unmarshal(byts []byte, skipGenericTracksWithoutClockRate bool)
for i, md := range sd.MediaDescriptions {
t, err := newTrackFromMediaDescription(md)
if err != nil {
if skipGenericTracksWithoutClockRate &&
strings.HasPrefix(err.Error(), "unable to get clock rate") {
continue
}
return nil, fmt.Errorf("unable to parse track %d: %s", i+1, err)
}

104
tracks_test.go
View File

@@ -6,6 +6,60 @@ import (
"github.com/stretchr/testify/require"
)
func TestTracksRead(t *testing.T) {
sdp := []byte("v=0\r\n" +
"o=- 0 0 IN IP4 10.0.0.131\r\n" +
"s=Media Presentation\r\n" +
"i=samsung\r\n" +
"c=IN IP4 0.0.0.0\r\n" +
"b=AS:2632\r\n" +
"t=0 0\r\n" +
"a=control:rtsp://10.0.100.50/profile5/media.smp\r\n" +
"a=range:npt=now-\r\n" +
"m=video 42504 RTP/AVP 97\r\n" +
"b=AS:2560\r\n" +
"a=rtpmap:97 H264/90000\r\n" +
"a=control:rtsp://10.0.100.50/profile5/media.smp/trackID=v\r\n" +
"a=cliprect:0,0,1080,1920\r\n" +
"a=framesize:97 1920-1080\r\n" +
"a=framerate:30.0\r\n" +
"a=fmtp:97 packetization-mode=1;profile-level-id=640028;sprop-parameter-sets=Z2QAKKy0A8ARPyo=,aO4Bniw=\r\n" +
"m=audio 42506 RTP/AVP 0\r\n" +
"b=AS:64\r\n" +
"a=rtpmap:0 PCMU/8000\r\n" +
"a=control:rtsp://10.0.100.50/profile5/media.smp/trackID=a\r\n" +
"a=recvonly\r\n" +
"m=application 42508 RTP/AVP 107\r\n" +
"b=AS:8\r\n")
var tracks Tracks
_, err := tracks.Unmarshal(sdp)
require.NoError(t, err)
require.Equal(t, Tracks{
&TrackH264{
trackBase: trackBase{
control: "rtsp://10.0.100.50/profile5/media.smp/trackID=v",
},
PayloadType: 97,
SPS: []byte{0x67, 0x64, 0x00, 0x28, 0xac, 0xb4, 0x03, 0xc0, 0x11, 0x3f, 0x2a},
PPS: []byte{0x68, 0xee, 0x01, 0x9e, 0x2c},
PacketizationMode: 1,
},
&TrackG711{
MULaw: true,
trackBase: trackBase{
control: "rtsp://10.0.100.50/profile5/media.smp/trackID=a",
},
},
&TrackGeneric{
Media: "application",
Payloads: []TrackGenericPayload{{
Type: 107,
}},
},
}, tracks)
}
func TestTracksReadErrors(t *testing.T) {
for _, ca := range []struct {
name string
@@ -36,56 +90,8 @@ func TestTracksReadErrors(t *testing.T) {
} {
t.Run(ca.name, func(t *testing.T) {
var tracks Tracks
_, err := tracks.Unmarshal(ca.sdp, false)
_, err := tracks.Unmarshal(ca.sdp)
require.EqualError(t, err, ca.err)
})
}
}
func TestTracksReadSkipGenericTracksWithoutClockRate(t *testing.T) {
sdp := []byte("v=0\r\n" +
"o=- 0 0 IN IP4 10.0.0.131\r\n" +
"s=Media Presentation\r\n" +
"i=samsung\r\n" +
"c=IN IP4 0.0.0.0\r\n" +
"b=AS:2632\r\n" +
"t=0 0\r\n" +
"a=control:rtsp://10.0.100.50/profile5/media.smp\r\n" +
"a=range:npt=now-\r\n" +
"m=video 42504 RTP/AVP 97\r\n" +
"b=AS:2560\r\n" +
"a=rtpmap:97 H264/90000\r\n" +
"a=control:rtsp://10.0.100.50/profile5/media.smp/trackID=v\r\n" +
"a=cliprect:0,0,1080,1920\r\n" +
"a=framesize:97 1920-1080\r\n" +
"a=framerate:30.0\r\n" +
"a=fmtp:97 packetization-mode=1;profile-level-id=640028;sprop-parameter-sets=Z2QAKKy0A8ARPyo=,aO4Bniw=\r\n" +
"m=audio 42506 RTP/AVP 0\r\n" +
"b=AS:64\r\n" +
"a=rtpmap:0 PCMU/8000\r\n" +
"a=control:rtsp://10.0.100.50/profile5/media.smp/trackID=a\r\n" +
"a=recvonly\r\n" +
"m=application 42508 RTP/AVP 107\r\n" +
"b=AS:8\r\n")
var tracks Tracks
_, err := tracks.Unmarshal(sdp, true)
require.NoError(t, err)
require.Equal(t, Tracks{
&TrackH264{
trackBase: trackBase{
control: "rtsp://10.0.100.50/profile5/media.smp/trackID=v",
},
PayloadType: 97,
SPS: []byte{0x67, 0x64, 0x00, 0x28, 0xac, 0xb4, 0x03, 0xc0, 0x11, 0x3f, 0x2a},
PPS: []byte{0x68, 0xee, 0x01, 0x9e, 0x2c},
PacketizationMode: 1,
},
&TrackG711{
MULaw: true,
trackBase: trackBase{
control: "rtsp://10.0.100.50/profile5/media.smp/trackID=a",
},
},
}, tracks)
}