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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1560953002: Implement fallback from WMPI to WMPA. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Only include MediaCodecUtil on Android. Created 4 years, 11 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/renderer/media/android/webmediaplayer_android.cc ('k') | media/base/android/media_codec_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 9ea32c42984c04e9f13f96ab843861983d9c65d7..30bafb5703d9f1064ae54bc3e523260c4e816c75 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -200,6 +200,7 @@
#include "content/renderer/media/android/stream_texture_factory_impl.h"
#include "content/renderer/media/android/webmediaplayer_android.h"
#include "content/renderer/media/android/webmediasession_android.h"
+#include "media/base/android/media_codec_util.h"
#else
#include "cc/blink/context_provider_web_context.h"
#include "device/devices_app/public/cpp/constants.h"
@@ -2361,10 +2362,14 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
GetMediaPermission(), initial_cdm);
#if defined(OS_ANDROID)
+ // We must use WMPA in when accelerated video decode is disabled becuase WMPI
+ // is unlikely to have a fallback decoder.
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableUnifiedMediaPipeline)) {
- // TODO(sandersd): This check should be grown to include HLS and blacklist
- // checks. http://crbug.com/516765
+ switches::kEnableUnifiedMediaPipeline) ||
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableAcceleratedVideoDecode) ||
+ !media::MediaCodecUtil::IsMediaCodecAvailable() ||
+ media::MediaCodecUtil::IsHLSPath(url)) {
return CreateAndroidWebMediaPlayer(client, encrypted_client, params);
}
#endif // defined(OS_ANDROID)
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | media/base/android/media_codec_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698