Byron Campen
67d2536e41
Upstream commit: https://webrtc.googlesource.com/src/+/7538fd3f62ed83152eb1b5ee6773a1a15962585b Add resolution query support for MediaCapabilities Bug: chromium:505034803 Change-Id: Ic8a61b90a68f29c641e354e8879a53e6e29ec6b6 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/466180 Reviewed-by: Johannes Kron <kron@webrtc.org> Commit-Queue: Johannes Kron <kron@webrtc.org> Reviewed-by: Evan Shrubsole <eshr@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47587}
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
From: Dan Minor <dminor@mozilla.com>
|
|
Date: Tue, 1 Dec 2020 09:36:00 -0500
|
|
Subject: Bug 1654112 - Disable creating av1 encoder and decoder. r=ng
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D130089
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/ef548d7758c7de6e78d38af299c2296bf9d20ec9
|
|
---
|
|
media/engine/internal_decoder_factory.cc | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/media/engine/internal_decoder_factory.cc b/media/engine/internal_decoder_factory.cc
|
|
index 111ca43fbb..0d8a0a4c7b 100644
|
|
--- a/media/engine/internal_decoder_factory.cc
|
|
+++ b/media/engine/internal_decoder_factory.cc
|
|
@@ -57,10 +57,12 @@ std::vector<SdpVideoFormat> InternalDecoderFactory::GetSupportedFormats()
|
|
for (const SdpVideoFormat& h264_format : SupportedH264DecoderCodecs())
|
|
formats.push_back(h264_format);
|
|
|
|
+#if !defined(WEBRTC_MOZILLA_BUILD)
|
|
if (kDav1dIsIncluded) {
|
|
formats.push_back(SdpVideoFormat::AV1Profile0());
|
|
formats.push_back(SdpVideoFormat::AV1Profile1());
|
|
}
|
|
+#endif
|
|
|
|
return formats;
|
|
}
|