From e7efb0c4055ca77a58fd58e62f2c3ca85f5b6847 Mon Sep 17 00:00:00 2001 From: aler9 <46489434+aler9@users.noreply.github.com> Date: Tue, 15 Mar 2022 10:56:37 +0100 Subject: [PATCH] client: skip tracks with an invalid clock rate (https://github.com/aler9/rtsp-simple-server/issues/832) --- client.go | 2 +- pkg/liberrors/server.go | 8 ------- server_publish_test.go | 30 -------------------------- serversession.go | 8 +------ track_test.go | 2 +- tracks.go | 15 ++++++++++--- tracks_test.go | 47 ++++++++++++++++++++++++++++++++++++++++- 7 files changed, 61 insertions(+), 51 deletions(-) diff --git a/client.go b/client.go index b5626301..2df6bf5e 100644 --- a/client.go +++ b/client.go @@ -1184,7 +1184,7 @@ func (c *Client) doDescribe(u *base.URL) (Tracks, *base.URL, *base.Response, err return nil, nil, nil, err } - tracks, err := ReadTracks(res.Body) + tracks, err := ReadTracks(res.Body, true) if err != nil { return nil, nil, nil, err } diff --git a/pkg/liberrors/server.go b/pkg/liberrors/server.go index a38497e0..e4a48583 100644 --- a/pkg/liberrors/server.go +++ b/pkg/liberrors/server.go @@ -106,14 +106,6 @@ func (e ErrServerSDPInvalid) Error() string { return fmt.Sprintf("invalid SDP: %v", e.Err) } -// ErrServerSDPNoTracksDefined is an error that can be returned by a server. -type ErrServerSDPNoTracksDefined struct{} - -// Error implements the error interface. -func (e ErrServerSDPNoTracksDefined) Error() string { - return "no tracks defined in the SDP" -} - // ErrServerTransportHeaderInvalid is an error that can be returned by a server. type ErrServerTransportHeaderInvalid struct { Err error diff --git a/server_publish_test.go b/server_publish_test.go index 1271347d..b71d636f 100644 --- a/server_publish_test.go +++ b/server_publish_test.go @@ -94,36 +94,6 @@ func TestServerPublishErrorAnnounce(t *testing.T) { }, "invalid SDP: invalid line: (\x01\x02\x03\x04)", }, - { - "no tracks", - base.Request{ - Method: base.Announce, - URL: mustParseURL("rtsp://localhost:8554/teststream"), - Header: base.Header{ - "CSeq": base.HeaderValue{"1"}, - "Content-Type": base.HeaderValue{"application/sdp"}, - }, - Body: func() []byte { - sout := &psdp.SessionDescription{ - SessionName: psdp.SessionName("Stream"), - Origin: psdp.Origin{ - Username: "-", - NetworkType: "IN", - AddressType: "IP4", - UnicastAddress: "127.0.0.1", - }, - TimeDescriptions: []psdp.TimeDescription{ - {Timing: psdp.Timing{0, 0}}, //nolint:govet - }, - MediaDescriptions: []*psdp.MediaDescription{}, - } - - byts, _ := sout.Marshal() - return byts - }(), - }, - "no tracks defined in the SDP", - }, { "invalid URL 1", invalidURLAnnounceReq(t, "rtsp:// aaaaa"), diff --git a/serversession.go b/serversession.go index cc014bce..92436ae1 100644 --- a/serversession.go +++ b/serversession.go @@ -501,19 +501,13 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base }, liberrors.ErrServerContentTypeUnsupported{CT: ct} } - tracks, err := ReadTracks(req.Body) + tracks, err := ReadTracks(req.Body, false) if err != nil { return &base.Response{ StatusCode: base.StatusBadRequest, }, liberrors.ErrServerSDPInvalid{Err: err} } - if len(tracks) == 0 { - return &base.Response{ - StatusCode: base.StatusBadRequest, - }, liberrors.ErrServerSDPNoTracksDefined{} - } - for _, track := range tracks { trackURL, err := track.url(req.URL) if err != nil { diff --git a/track_test.go b/track_test.go index 670f0f06..46cf83e2 100644 --- a/track_test.go +++ b/track_test.go @@ -699,7 +699,7 @@ func TestTrackURL(t *testing.T) { }, } { t.Run(ca.name, func(t *testing.T) { - tracks, err := ReadTracks(ca.sdp) + tracks, err := ReadTracks(ca.sdp, false) require.NoError(t, err) ur, err := tracks[0].url(ca.baseURL) require.NoError(t, err) diff --git a/tracks.go b/tracks.go index b18af454..4e933531 100644 --- a/tracks.go +++ b/tracks.go @@ -3,6 +3,7 @@ package gortsplib import ( "fmt" "strconv" + "strings" psdp "github.com/pion/sdp/v3" @@ -13,22 +14,30 @@ import ( type Tracks []Track // ReadTracks decodes tracks from the SDP format. -func ReadTracks(byts []byte) (Tracks, error) { +func ReadTracks(byts []byte, skipGenericTracksWithoutClockRate bool) (Tracks, error) { var sd sdp.SessionDescription err := sd.Unmarshal(byts) if err != nil { return nil, err } - tracks := make(Tracks, len(sd.MediaDescriptions)) + var tracks Tracks //nolint:prealloc 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) } - tracks[i] = t + tracks = append(tracks, t) + } + + if len(tracks) == 0 { + return nil, fmt.Errorf("no valid tracks found") } return tracks, nil diff --git a/tracks_test.go b/tracks_test.go index ecfd0882..8105a5b2 100644 --- a/tracks_test.go +++ b/tracks_test.go @@ -35,8 +35,53 @@ func TestTracksReadErrors(t *testing.T) { }, } { t.Run(ca.name, func(t *testing.T) { - _, err := ReadTracks(ca.sdp) + _, err := ReadTracks(ca.sdp, false) 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") + + tracks, err := ReadTracks(sdp, true) + require.NoError(t, err) + require.Equal(t, Tracks{ + &TrackH264{ + 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}, + }, + &TrackGeneric{ + control: "rtsp://10.0.100.50/profile5/media.smp/trackID=a", + clockRate: 8000, + media: "audio", + formats: []string{"0"}, + rtpmap: "0 PCMU/8000", + }, + }, tracks) +}