From 0e9b8fe22b1021bbc49f7f19c8a9593c7fcbe963 Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Thu, 15 Feb 2024 11:24:34 +0100 Subject: [PATCH] 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 Commit-Queue: Philipp Hancke Reviewed-by: Florent Castelli Cr-Commit-Position: refs/heads/main@{#41769} --- media/base/codec.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media/base/codec.cc b/media/base/codec.cc index d18baf7132..8abc865976 100644 --- a/media/base/codec.cc +++ b/media/base/codec.cc @@ -243,10 +243,10 @@ bool Codec::MatchesRtpCodec(const webrtc::RtpCodec& codec_capability) const { 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 {