diff options
author | Erwin Jansen <jansene@google.com> | 2021-06-30 07:29:26 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-06-30 07:29:26 +0000 |
commit | 059cdc5996938f5f6b5343b6c969c12098275587 (patch) | |
tree | 6eacaffe4bebf8e00c290c1e1839e084b0c52e88 /media/engine/internal_decoder_factory.cc | |
parent | 97e54a7e73c7b24e464ef06ef3c3b3716f21bb15 (diff) | |
parent | 16be34ae72cdb525c88c2b31b21b976f35fe36d8 (diff) | |
download | webrtc-emu-31-release.tar.gz |
Merge "Merge upstream-master and enable ARM64" into emu-master-devemu-31-stable-releaseemu-31-release
Diffstat (limited to 'media/engine/internal_decoder_factory.cc')
-rw-r--r-- | media/engine/internal_decoder_factory.cc | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/media/engine/internal_decoder_factory.cc b/media/engine/internal_decoder_factory.cc index 1c084846a2..a8d1f00009 100644 --- a/media/engine/internal_decoder_factory.cc +++ b/media/engine/internal_decoder_factory.cc @@ -23,23 +23,6 @@ namespace webrtc { -namespace { - -bool IsFormatSupported( - const std::vector<webrtc::SdpVideoFormat>& supported_formats, - const webrtc::SdpVideoFormat& format) { - for (const webrtc::SdpVideoFormat& supported_format : supported_formats) { - if (cricket::IsSameCodec(format.name, format.parameters, - supported_format.name, - supported_format.parameters)) { - return true; - } - } - return false; -} - -} // namespace - std::vector<SdpVideoFormat> InternalDecoderFactory::GetSupportedFormats() const { std::vector<SdpVideoFormat> formats; @@ -55,7 +38,7 @@ std::vector<SdpVideoFormat> InternalDecoderFactory::GetSupportedFormats() std::unique_ptr<VideoDecoder> InternalDecoderFactory::CreateVideoDecoder( const SdpVideoFormat& format) { - if (!IsFormatSupported(GetSupportedFormats(), format)) { + if (!format.IsCodecInList(GetSupportedFormats())) { RTC_LOG(LS_WARNING) << "Trying to create decoder for unsupported format. " << format.ToString(); return nullptr; |