diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-09 21:46:47 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-09 21:46:47 +0000 |
| commit | b1809d2598c2fc3eb7641275c7d9d717d3c020c4 (patch) | |
| tree | d8968f96b7194b4f4ee7b5ba28d411c4954d11f3 /chrome/renderer/media | |
| parent | 5c5ce98f558310dec2d54fa25112bb1d5902dc2a (diff) | |
| download | chromium_src-b1809d2598c2fc3eb7641275c7d9d717d3c020c4.zip chromium_src-b1809d2598c2fc3eb7641275c7d9d717d3c020c4.tar.gz chromium_src-b1809d2598c2fc3eb7641275c7d9d717d3c020c4.tar.bz2 | |
Reland r262568 "Encrypted Media: Check container mime type in MediaDrmBridge".
This CL relands r262568 with NO additional changes. The original CL was reverted to help investigate some test failure, which turned out to be unrelated to this CL.
Android MediaDrm API supports container mime type check in
isCryptoSchemeSupported (UUID uuid, String mimeType):
http://developer.android.com/reference/android/media/MediaDrm.html#isCryptoSchemeSupported(java.util.UUID, java.lang.String)
This CL hook this API up in MediaDrmBridge.
Also, Chromium will always query the codec/container type it
is interested in (e.g. MP4 and WebM).
TBR=ddorwin@chromium.org,qinmin@chromium.org,dmazzoni@chromium.org
BUG=350481
Review URL: https://codereview.chromium.org/230843004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262828 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/media')
| -rw-r--r-- | chrome/renderer/media/chrome_key_systems.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc index d0a9b58..276c63c 100644 --- a/chrome/renderer/media/chrome_key_systems.cc +++ b/chrome/renderer/media/chrome_key_systems.cc @@ -292,10 +292,8 @@ static void AddAndroidWidevine( SupportedKeySystemResponse response; request.key_system = kWidevineKeySystem; -#if defined(USE_PROPRIETARY_CODECS) request.codecs = static_cast<android::SupportedCodecs>( - android::MP4_AAC | android::MP4_AVC1); -#endif // defined(USE_PROPRIETARY_CODECS) + android::WEBM_VP8_AND_VORBIS | android::MP4_AAC | android::MP4_AVC1); content::RenderThread::Get()->Send( new ChromeViewHostMsg_GetSupportedKeySystems(request, &response)); DCHECK_EQ(response.compositing_codecs >> 3, 0) << "unrecognized codec"; |