diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 17:09:34 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 17:09:34 +0000 |
| commit | cbd6d7038b8af7c86cdf875d2697e0ca81a40b95 (patch) | |
| tree | bb268805e42500b033a1cd4d38a63debe9950708 /content/renderer/media | |
| parent | d647df449b92aec26b7faeab501d09324b2a7e89 (diff) | |
| download | chromium_src-cbd6d7038b8af7c86cdf875d2697e0ca81a40b95.zip chromium_src-cbd6d7038b8af7c86cdf875d2697e0ca81a40b95.tar.gz chromium_src-cbd6d7038b8af7c86cdf875d2697e0ca81a40b95.tar.bz2 | |
KeySystems: Drop MediaCodec version check in AddClearKey() on Android.
This DCHECK was added in r265018. It's added because KeySystems should not be
created if EME is disabled. However, KeySystemsTest always creates KeySystems
regardless of platform. This caused the DCHECK to fire on Android versions that
do not support MediaCodec.
This CL removes the DCHECK to return to the previous behavior. I can also
disable the tests on Android versions that do not support MediaCodec, but that
seems a lot of extra code.
R=ddorwin@chromium.org
Review URL: https://codereview.chromium.org/246873003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media')
| -rw-r--r-- | content/renderer/media/crypto/key_systems.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/content/renderer/media/crypto/key_systems.cc b/content/renderer/media/crypto/key_systems.cc index 381616f..354dcea 100644 --- a/content/renderer/media/crypto/key_systems.cc +++ b/content/renderer/media/crypto/key_systems.cc @@ -44,13 +44,9 @@ const char kAvc3[] = "avc3"; static void AddClearKey(std::vector<KeySystemInfo>* concrete_key_systems) { KeySystemInfo info(kClearKeyKeySystem); -#if defined(OS_ANDROID) - // If MediaCodecBridge is not available. EME should not be enabled at all. - // See SetRuntimeFeatureDefaultsForPlatform(). - // VP8 and AVC1 are supported on all MediaCodec implementations: + // On Android, Vorbis, VP8, AAC and AVC1 are supported in all MediaCodec + // implementations: // http://developer.android.com/guide/appendix/media-formats.html - DCHECK(media::MediaCodecBridge::IsAvailable()); -#endif info.supported_types[kAudioWebM].insert(kVorbis); info.supported_types[kVideoWebM] = info.supported_types[kAudioWebM]; |