summaryrefslogtreecommitdiffstats
path: root/media/base
diff options
context:
space:
mode:
authorddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-22 22:33:31 +0000
committerddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-22 22:33:31 +0000
commitd680c4cb2d5f647ae1e2a4dff5610b5554273b1c (patch)
treeaa966f1ee095326cce41d93c213ac81da48cc070 /media/base
parent3d7205ae811ef8b22d5618b176186ab74632ebcb (diff)
downloadchromium_src-d680c4cb2d5f647ae1e2a4dff5610b5554273b1c.zip
chromium_src-d680c4cb2d5f647ae1e2a4dff5610b5554273b1c.tar.gz
chromium_src-d680c4cb2d5f647ae1e2a4dff5610b5554273b1c.tar.bz2
Allow suppressed EME canPlayType() responses to be overridden with a flag.
Adds --override-encrypted-media-canplaytype and the corresponding flag. BUG=252967 TBR=jochen@chromium.org Review URL: https://chromiumcodereview.appspot.com/17459003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208096 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
-rw-r--r--media/base/media_switches.cc4
-rw-r--r--media/base/media_switches.h2
2 files changed, 6 insertions, 0 deletions
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
index b1f6279..153c22a 100644
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -21,6 +21,10 @@ const char kEnableVp8AlphaPlayback[] = "enable-vp8-alpha-playback";
// Set number of threads to use for video decoding.
const char kVideoThreads[] = "video-threads";
+// Override suppressed responses to canPlayType().
+const char kOverrideEncryptedMediaCanPlayType[] =
+ "override-encrypted-media-canplaytype";
+
#if defined(GOOGLE_TV)
// Use external video surface for video with more than or equal pixels to
// specified value. For example, value of 0 will enable external video surface
diff --git a/media/base/media_switches.h b/media/base/media_switches.h
index 08fdd37..0462ada 100644
--- a/media/base/media_switches.h
+++ b/media/base/media_switches.h
@@ -22,6 +22,8 @@ MEDIA_EXPORT extern const char kEnableVp8AlphaPlayback[];
MEDIA_EXPORT extern const char kVideoThreads[];
+MEDIA_EXPORT extern const char kOverrideEncryptedMediaCanPlayType[];
+
#if defined(GOOGLE_TV)
MEDIA_EXPORT extern const char kUseExternalVideoSurfaceThresholdInPixels[];
#endif