Skip to content

Commit f7cc6af

Browse files
Fix missing RTX codec using SetCodecPreferences
1 parent 98a0025 commit f7cc6af

File tree

4 files changed

+135
-1
lines changed

4 files changed

+135
-1
lines changed

rtpcodec.go

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func codecParametersFuzzySearch(
143143
return RTPCodecParameters{}, codecMatchNone
144144
}
145145

146-
// Given a CodecParameters find the RTX CodecParameters if one exists.
146+
// Given a CodecParameters find the RTX Payload if one exists.
147147
func findRTXPayloadType(needle PayloadType, haystack []RTPCodecParameters) PayloadType {
148148
aptStr := fmt.Sprintf("apt=%d", needle)
149149
for _, c := range haystack {
@@ -155,6 +155,29 @@ func findRTXPayloadType(needle PayloadType, haystack []RTPCodecParameters) Paylo
155155
return PayloadType(0)
156156
}
157157

158+
// Given a RTPCodecParameters check if it exists in a of other RTPCodecParameters.
159+
func doesCodecExistInList(codec RTPCodecParameters, codecList []RTPCodecParameters) bool {
160+
for _, c := range codecList {
161+
if codec.SDPFmtpLine == c.SDPFmtpLine && codec.MimeType == c.MimeType {
162+
return true
163+
}
164+
}
165+
166+
return false
167+
}
168+
169+
// Given a CodecParameters find the RTX CodecParameters if one exists.
170+
func findRTXPCodec(needle PayloadType, haystack []RTPCodecParameters) *RTPCodecParameters {
171+
aptStr := fmt.Sprintf("apt=%d", needle)
172+
for _, c := range haystack {
173+
if aptStr == c.SDPFmtpLine {
174+
return &c
175+
}
176+
}
177+
178+
return nil
179+
}
180+
158181
func rtcpFeedbackIntersection(a, b []RTCPFeedback) (out []RTCPFeedback) {
159182
for _, aFeedback := range a {
160183
for _, bFeeback := range b {

rtpcodec_test.go

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// SPDX-FileCopyrightText: 2023 The Pion community <https://pion.ly>
2+
// SPDX-License-Identifier: MIT
3+
4+
//go:build !js
5+
// +build !js
6+
7+
package webrtc
8+
9+
import (
10+
"testing"
11+
12+
"github.com/stretchr/testify/assert"
13+
)
14+
15+
func Test_DoesCodecExistInList(t *testing.T) {
16+
mediaEngine := &MediaEngine{}
17+
NewAPI(WithMediaEngine(mediaEngine))
18+
assert.NoError(t, mediaEngine.RegisterDefaultCodecs())
19+
20+
codecs := mediaEngine.getCodecsByKind(RTPCodecTypeVideo)
21+
22+
tests := []struct {
23+
Label string
24+
Result bool
25+
Codec RTPCodecParameters
26+
}{
27+
{
28+
Label: "Codec does not exist in list",
29+
Result: false,
30+
Codec: RTPCodecParameters{
31+
RTPCodecCapability: RTPCodecCapability{"I am bad mimetype", 90000, 0, "", []RTCPFeedback{{"goog-remb", ""}, {"ccm", "fir"}, {"nack", ""}, {"nack", "pli"}}},
32+
PayloadType: 96,
33+
},
34+
},
35+
{
36+
Label: "Codec does exist in list",
37+
Result: true,
38+
Codec: codecs[0],
39+
},
40+
}
41+
42+
for _, test := range tests {
43+
t.Run(test.Label, func(t *testing.T) {
44+
assert.Equal(t, test.Result, doesCodecExistInList(test.Codec, codecs))
45+
})
46+
}
47+
}

rtptransceiver.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,17 @@ func (t *RTPTransceiver) getCodecs() []RTPCodecParameters {
8686
}
8787
}
8888

89+
// check if direction is specified
90+
if t.direction.Load() != nil {
91+
for _, c := range filteredCodecs {
92+
if rtxCodec := findRTXPCodec(c.PayloadType, mediaEngineCodecs); rtxCodec != nil {
93+
if !doesCodecExistInList(*rtxCodec, filteredCodecs) {
94+
filteredCodecs = append(filteredCodecs, *rtxCodec)
95+
}
96+
}
97+
}
98+
}
99+
89100
return filteredCodecs
90101
}
91102

rtptransceiver_test.go

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,3 +135,56 @@ func Test_RTPTransceiver_SetCodecPreferences_PayloadType(t *testing.T) {
135135

136136
closePairNow(t, offerPC, answerPC)
137137
}
138+
139+
func Test_RTPTransceiver_SDP_Codec(t *testing.T) {
140+
tests := []struct {
141+
Label string
142+
setPreferences bool
143+
}{
144+
{
145+
Label: "NoSetCodecPreferences",
146+
setPreferences: false,
147+
},
148+
{
149+
Label: "SetCodecPreferences",
150+
setPreferences: true,
151+
},
152+
}
153+
154+
for _, test := range tests {
155+
t.Run(test.Label, func(t *testing.T) {
156+
api := NewAPI()
157+
158+
pc, err := api.NewPeerConnection(Configuration{})
159+
assert.NoError(t, err)
160+
161+
transceiver, err := pc.AddTransceiverFromKind(
162+
RTPCodecTypeVideo,
163+
RTPTransceiverInit{
164+
Direction: RTPTransceiverDirectionRecvonly,
165+
},
166+
)
167+
assert.NoError(t, err)
168+
169+
if test.setPreferences {
170+
codec := RTPCodecCapability{
171+
"video/vp8", 90000, 0, "", nil,
172+
}
173+
174+
err := transceiver.SetCodecPreferences(
175+
[]RTPCodecParameters{
176+
{
177+
RTPCodecCapability: codec,
178+
},
179+
},
180+
)
181+
assert.NoError(t, err)
182+
}
183+
184+
offer, err := pc.CreateOffer(nil)
185+
assert.NoError(t, err)
186+
187+
assert.Equal(t, true, strings.Contains(offer.SDP, "apt=96"))
188+
})
189+
}
190+
}

0 commit comments

Comments
 (0)