diff options
Diffstat (limited to 'media/base/codec.cc')
-rw-r--r-- | media/base/codec.cc | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/media/base/codec.cc b/media/base/codec.cc index e8a591e44b..cb6913e76a 100644 --- a/media/base/codec.cc +++ b/media/base/codec.cc @@ -58,18 +58,6 @@ bool IsSameCodecSpecific(const std::string& name1, return true; } -bool IsCodecInList( - const webrtc::SdpVideoFormat& format, - const std::vector<webrtc::SdpVideoFormat>& existing_formats) { - for (auto existing_format : existing_formats) { - if (IsSameCodec(format.name, format.parameters, existing_format.name, - existing_format.parameters)) { - return true; - } - } - return false; -} - } // namespace FeedbackParams::FeedbackParams() = default; @@ -396,25 +384,6 @@ bool VideoCodec::ValidateCodecFormat() const { return true; } -RtpDataCodec::RtpDataCodec(int id, const std::string& name) - : Codec(id, name, kDataCodecClockrate) {} - -RtpDataCodec::RtpDataCodec() : Codec() { - clockrate = kDataCodecClockrate; -} - -RtpDataCodec::RtpDataCodec(const RtpDataCodec& c) = default; -RtpDataCodec::RtpDataCodec(RtpDataCodec&& c) = default; -RtpDataCodec& RtpDataCodec::operator=(const RtpDataCodec& c) = default; -RtpDataCodec& RtpDataCodec::operator=(RtpDataCodec&& c) = default; - -std::string RtpDataCodec::ToString() const { - char buf[256]; - rtc::SimpleStringBuilder sb(buf); - sb << "RtpDataCodec[" << id << ":" << name << "]"; - return sb.str(); -} - bool HasLntf(const Codec& codec) { return codec.HasFeedbackParam( FeedbackParam(kRtcpFbParamLntf, kParamValueEmpty)); @@ -452,6 +421,8 @@ const VideoCodec* FindMatchingCodec( return nullptr; } +// TODO(crbug.com/1187565): Remove once downstream projects stopped using this +// method in favor of SdpVideoFormat::IsSameCodec(). bool IsSameCodec(const std::string& name1, const CodecParameterMap& params1, const std::string& name2, @@ -493,7 +464,7 @@ void AddH264ConstrainedBaselineProfileToSupportedFormats( std::copy_if(cbr_supported_formats.begin(), cbr_supported_formats.end(), std::back_inserter(*supported_formats), [supported_formats](const webrtc::SdpVideoFormat& format) { - return !IsCodecInList(format, *supported_formats); + return !format.IsCodecInList(*supported_formats); }); if (supported_formats->size() > original_size) { |