Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1024)

Unified Diff: media/base/key_systems.cc

Issue 755143004: Advertise Opus support in EME. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/renderer/media/chrome_key_systems.cc ('K') | « media/base/eme_constants.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/key_systems.cc
diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc
index b98e4df5582ed7b2f931c0f303fe6fe27940ffe9..f97660c309eb700ac3c74b346e59ad7f647742ee 100644
--- a/media/base/key_systems.cc
+++ b/media/base/key_systems.cc
@@ -60,6 +60,7 @@ static NamedCodec kContainerToCodecMasks[] = {
// Mapping between codec names and enum values.
static NamedCodec kCodecStrings[] = {
+ {"opus", EME_CODEC_WEBM_OPUS},
{"vorbis", EME_CODEC_WEBM_VORBIS},
{"vp8", EME_CODEC_WEBM_VP8},
{"vp8.0", EME_CODEC_WEBM_VP8},
@@ -86,6 +87,10 @@ static void AddClearKey(std::vector<KeySystemInfo>* concrete_key_systems) {
// Temporarily disable VP9 support for Android.
// TODO(xhwang): Use mime_util.h to query VP9 support on Android.
info.supported_codecs &= ~EME_CODEC_WEBM_VP9;
+
+ // Opus is not supported on Android yet. http://crbug.com/318436.
+ // TODO(sandersd): Check for platform support to set this bit.
+ info.supported_codecs &= ~EME_CODEC_WEBM_OPUS;
#endif // defined(OS_ANDROID)
#if defined(USE_PROPRIETARY_CODECS)
« chrome/renderer/media/chrome_key_systems.cc ('K') | « media/base/eme_constants.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698