diff options
| author | sehr@chromium.org <sehr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-09 17:04:08 +0000 |
|---|---|---|
| committer | sehr@chromium.org <sehr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-09 17:04:08 +0000 |
| commit | bc5e40deb0fe853ae2347cd55306dfdc359ff150 (patch) | |
| tree | 91dd66e50333ec6fa6b713df5a168035ce1dae00 /content/renderer | |
| parent | 3e9a1ebd2810279871315ce33e022036959b20cd (diff) | |
| download | chromium_src-bc5e40deb0fe853ae2347cd55306dfdc359ff150.zip chromium_src-bc5e40deb0fe853ae2347cd55306dfdc359ff150.tar.gz chromium_src-bc5e40deb0fe853ae2347cd55306dfdc359ff150.tar.bz2 | |
Fix default video decoder issue
On Android there is no software fallback for the video decoder. Disable the
fallback path and remove the dependencies.
BUG= https://code.google.com/p/nativeclient/issues/detail?id=3032
R=bbudge@chromium.org
Review URL: https://codereview.chromium.org/364003003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282070 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/pepper/pepper_video_decoder_host.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/content/renderer/pepper/pepper_video_decoder_host.cc b/content/renderer/pepper/pepper_video_decoder_host.cc index 2033195a..f15cd58 100644 --- a/content/renderer/pepper/pepper_video_decoder_host.cc +++ b/content/renderer/pepper/pepper_video_decoder_host.cc @@ -139,6 +139,9 @@ int32_t PepperVideoDecoderHost::OnHostMsgInitialize( } decoder_.reset(); +#if defined(OS_ANDROID) + return PP_ERROR_NOTSUPPORTED; +#else if (!allow_software_fallback) return PP_ERROR_NOTSUPPORTED; @@ -147,6 +150,7 @@ int32_t PepperVideoDecoderHost::OnHostMsgInitialize( decoder_->Initialize(media_profile, this); return PP_OK_COMPLETIONPENDING; +#endif } int32_t PepperVideoDecoderHost::OnHostMsgGetShm( |