Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(678)

Unified Diff: content/renderer/pepper/pepper_video_decoder_host.cc

Issue 364003003: Fix default video decoder issue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unrelated change Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_renderer.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/pepper_video_decoder_host.cc
diff --git a/content/renderer/pepper/pepper_video_decoder_host.cc b/content/renderer/pepper/pepper_video_decoder_host.cc
index 2033195adb9ef8303bb850e0c24ee698a871a550..f15cd5857ab829283a870bc4a3642e40fd943fe2 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(
« no previous file with comments | « content/content_renderer.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698