Compare codec number of channels and clockrate in MatchesRtpCodec for RTX too
This should be a no-op since RTX is only supported for video which
has one channel and uses a clockrate of 90000.
Parameters are not compared for RTX since the RTX capabilities do not
include the associated payload type (apt).
BUG=webrtc:15847
Change-Id: Ibe6677135ecc56cdc5f3d3ccdc2e680dd449f66f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/339801
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@microsoft.com>
Reviewed-by: Florent Castelli <orphis@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41769}
diff --git a/media/base/codec.cc b/media/base/codec.cc
index d18baf7..8abc865 100644
--- a/media/base/codec.cc
+++ b/media/base/codec.cc
@@ -243,10 +243,10 @@
return codec_parameters.name == codec_capability.name &&
codec_parameters.kind == codec_capability.kind &&
+ codec_parameters.num_channels == codec_capability.num_channels &&
+ codec_parameters.clock_rate == codec_capability.clock_rate &&
(codec_parameters.name == cricket::kRtxCodecName ||
- (codec_parameters.num_channels == codec_capability.num_channels &&
- codec_parameters.clock_rate == codec_capability.clock_rate &&
- codec_parameters.parameters == codec_capability.parameters));
+ codec_parameters.parameters == codec_capability.parameters);
}
bool Codec::GetParam(const std::string& name, std::string* out) const {
