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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1230793009: Initial support for the desktop media pipeline on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index f4e7528bc0074de772f3643ac0fb13aa411500cc..8c0baab8a4ace60cc044822808e3a25914d3b271 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -169,6 +169,7 @@
#include "content/renderer/media/android/renderer_media_player_manager.h"
#include "content/renderer/media/android/stream_texture_factory_impl.h"
#include "content/renderer/media/android/webmediaplayer_android.h"
+#include "media/base/media_switches.h"
#else
#include "cc/blink/context_provider_web_context.h"
#endif
@@ -493,7 +494,7 @@ CommonNavigationParams MakeCommonNavigationParams(
ui_timestamp, report_type, GURL(), GURL());
}
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
media::Context3D GetSharedMainThreadContext3D() {
cc::ContextProvider* provider =
RenderThreadImpl::current()->SharedMainThreadContextProvider().get();
@@ -1974,9 +1975,17 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
if (!web_stream.isNull())
return CreateWebMediaPlayerForMediaStream(client);
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
liberato (no reviews please) 2015/07/10 17:15:09 I think that this can simplify slightly to: #if d
xhwang 2015/07/10 17:27:50 Hmm, it's sad to see "return WMPA" twice. Actuall
liberato (no reviews please) 2015/07/10 17:32:07 i agree about the sad. i tried to restructure thi
watk 2015/07/10 18:51:25 Removed
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableMediaPipelineOnAndroid)) {
+ return CreateAndroidWebMediaPlayer(client, GetMediaPermission(),
+ initial_cdm);
+ }
+#elif defined(OS_ANDROID)
return CreateAndroidWebMediaPlayer(client, GetMediaPermission(), initial_cdm);
-#else
+#endif
+
+#if !defined(OS_ANDROID) || defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
scoped_refptr<media::MediaLog> media_log(new RenderMediaLog());
RenderThreadImpl* render_thread = RenderThreadImpl::current();
@@ -2008,7 +2017,7 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
return new media::WebMediaPlayerImpl(
frame, client, weak_factory_.GetWeakPtr(), media_renderer_factory.Pass(),
GetCdmFactory(), params);
-#endif // defined(OS_ANDROID)
+#endif // !defined(OS_ANDROID) || defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
}
blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(

Powered by Google App Engine
This is Rietveld 408576698