@@ -67,11 +67,11 @@ std::vector<webrtc::RtpExtension> GetDefaultEnabledRtpHeaderExtensions(
67
67
68
68
webrtc::RTCError CheckScalabilityModeValues (
69
69
const webrtc::RtpParameters& rtp_parameters,
70
- rtc::ArrayView<cricket::Codec> codec_preferences ,
70
+ rtc::ArrayView<cricket::Codec> send_codecs ,
71
71
absl::optional<cricket::Codec> send_codec) {
72
72
using webrtc::RTCErrorType;
73
73
74
- if (codec_preferences .empty ()) {
74
+ if (send_codecs .empty ()) {
75
75
// This is an audio sender or an extra check in the stack where the codec
76
76
// list is not available and we can't check the scalability_mode values.
77
77
return webrtc::RTCError::OK ();
@@ -80,7 +80,7 @@ webrtc::RTCError CheckScalabilityModeValues(
80
80
for (size_t i = 0 ; i < rtp_parameters.encodings .size (); ++i) {
81
81
if (rtp_parameters.encodings [i].codec ) {
82
82
bool codecFound = false ;
83
- for (const cricket::VideoCodec & codec : codec_preferences ) {
83
+ for (const cricket::Codec & codec : send_codecs ) {
84
84
if (codec.MatchesRtpCodec (*rtp_parameters.encodings [i].codec )) {
85
85
codecFound = true ;
86
86
send_codec = codec;
@@ -97,7 +97,7 @@ webrtc::RTCError CheckScalabilityModeValues(
97
97
if (rtp_parameters.encodings [i].scalability_mode ) {
98
98
if (!send_codec) {
99
99
bool scalabilityModeFound = false ;
100
- for (const cricket::VideoCodec & codec : codec_preferences ) {
100
+ for (const cricket::Codec & codec : send_codecs ) {
101
101
for (const auto & scalability_mode : codec.scalability_modes ) {
102
102
if (ScalabilityModeToString (scalability_mode) ==
103
103
*rtp_parameters.encodings [i].scalability_mode ) {
@@ -139,7 +139,7 @@ webrtc::RTCError CheckScalabilityModeValues(
139
139
140
140
webrtc::RTCError CheckRtpParametersValues (
141
141
const webrtc::RtpParameters& rtp_parameters,
142
- rtc::ArrayView<cricket::Codec> codec_preferences ,
142
+ rtc::ArrayView<cricket::Codec> send_codecs ,
143
143
absl::optional<cricket::Codec> send_codec) {
144
144
using webrtc::RTCErrorType;
145
145
@@ -196,8 +196,7 @@ webrtc::RTCError CheckRtpParametersValues(
196
196
}
197
197
}
198
198
199
- return CheckScalabilityModeValues (rtp_parameters, codec_preferences,
200
- send_codec);
199
+ return CheckScalabilityModeValues (rtp_parameters, send_codecs, send_codec);
201
200
}
202
201
203
202
webrtc::RTCError CheckRtpParametersInvalidModificationAndValues (
@@ -210,7 +209,7 @@ webrtc::RTCError CheckRtpParametersInvalidModificationAndValues(
210
209
webrtc::RTCError CheckRtpParametersInvalidModificationAndValues (
211
210
const webrtc::RtpParameters& old_rtp_parameters,
212
211
const webrtc::RtpParameters& rtp_parameters,
213
- rtc::ArrayView<cricket::Codec> codec_preferences ,
212
+ rtc::ArrayView<cricket::Codec> send_codecs ,
214
213
absl::optional<cricket::Codec> send_codec) {
215
214
using webrtc::RTCErrorType;
216
215
if (rtp_parameters.encodings .size () != old_rtp_parameters.encodings .size ()) {
@@ -246,8 +245,7 @@ webrtc::RTCError CheckRtpParametersInvalidModificationAndValues(
246
245
" Attempted to set RtpParameters with modified SSRC" );
247
246
}
248
247
249
- return CheckRtpParametersValues (rtp_parameters, codec_preferences,
250
- send_codec);
248
+ return CheckRtpParametersValues (rtp_parameters, send_codecs, send_codec);
251
249
}
252
250
253
251
CompositeMediaEngine::CompositeMediaEngine (
0 commit comments