diff options
| author | ddorwin <ddorwin@chromium.org> | 2016-03-02 21:06:29 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-03 05:07:51 +0000 |
| commit | f1f20728a18fff332af52c0e60726a8b34510ba6 (patch) | |
| tree | f4c5b710675a1a3787b404cd2a31a7d7b7532067 /media/base/mime_util_internal.cc | |
| parent | fee5771921b6f93f36a3b102c30b3711db8b7b5b (diff) | |
| download | chromium_src-f1f20728a18fff332af52c0e60726a8b34510ba6.zip chromium_src-f1f20728a18fff332af52c0e60726a8b34510ba6.tar.gz chromium_src-f1f20728a18fff332af52c0e60726a8b34510ba6.tar.bz2 | |
EME on Android: Improve accuracy of Key System availability.
Implemented per https://crbug.com/582618#c7.
BUG=559236,582618
Review URL: https://codereview.chromium.org/1747073003
Cr-Commit-Position: refs/heads/master@{#378959}
Diffstat (limited to 'media/base/mime_util_internal.cc')
| -rw-r--r-- | media/base/mime_util_internal.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/media/base/mime_util_internal.cc b/media/base/mime_util_internal.cc index a0ce3c4..7e7f004 100644 --- a/media/base/mime_util_internal.cc +++ b/media/base/mime_util_internal.cc @@ -274,10 +274,7 @@ MimeUtil::MimeUtil() : allow_proprietary_codecs_(false) { // When the unified media pipeline is enabled, we need support for both GPU // video decoders and MediaCodec; indicated by HasPlatformDecoderSupport(). // When the Android pipeline is used, we only need access to MediaCodec. - platform_info_.has_platform_decoders = - platform_info_.is_unified_media_pipeline_enabled - ? HasPlatformDecoderSupport() - : MediaCodecUtil::IsMediaCodecAvailable(); + platform_info_.has_platform_decoders = ArePlatformDecodersAvailable(); platform_info_.has_platform_vp8_decoder = MediaCodecUtil::IsVp8DecoderAvailable(); platform_info_.supports_opus = PlatformHasOpusSupport(); |