summaryrefslogtreecommitdiffstats
path: root/media/base/media.cc
diff options
context:
space:
mode:
authorddorwin <ddorwin@chromium.org>2016-03-02 21:06:29 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-03 05:07:51 +0000
commitf1f20728a18fff332af52c0e60726a8b34510ba6 (patch)
treef4c5b710675a1a3787b404cd2a31a7d7b7532067 /media/base/media.cc
parentfee5771921b6f93f36a3b102c30b3711db8b7b5b (diff)
downloadchromium_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/media.cc')
-rw-r--r--media/base/media.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/media/base/media.cc b/media/base/media.cc
index efc495b..b2e1c45 100644
--- a/media/base/media.cc
+++ b/media/base/media.cc
@@ -115,6 +115,12 @@ bool IsUnifiedMediaPipelineEnabledForMse() {
switches::kEnableUnifiedMediaPipeline) ||
!MediaCodecUtil::IsMediaCodecAvailable();
}
+
+bool ArePlatformDecodersAvailable() {
+ return IsUnifiedMediaPipelineEnabled()
+ ? HasPlatformDecoderSupport()
+ : MediaCodecUtil::IsMediaCodecAvailable();
+}
#endif
} // namespace media