Initial support for the desktop media pipeline on Android.

content/renderer/render_frame_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 151 matching lines @@
 
 #if defined(OS_ANDROID)
 #include <cpu-features.h>
 
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/renderer/android/synchronous_compositor_factory.h"
 #include "content/renderer/java/gin_java_bridge_dispatcher.h"
 #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
 
 #if defined(ENABLE_PEPPER_CDMS)
 #include "content/renderer/media/crypto/pepper_cdm_wrapper_impl.h"
 #elif defined(ENABLE_BROWSER_CDMS)
 #include "content/renderer/media/crypto/renderer_cdm_manager.h"
 #endif
 
@@ skipping 304 matching lines @@
       base::TimeTicks() + base::TimeDelta::FromSecondsD(request->uiStartTime());
   FrameMsg_UILoadMetricsReportType::Value report_type =
       static_cast<FrameMsg_UILoadMetricsReportType::Value>(
           request->inputPerfMetricReportPolicy());
   return CommonNavigationParams(request->url(), referrer,
                                 extra_data->transition_type(),
                                 FrameMsg_Navigate_Type::NORMAL, true,
                                 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();
   if (!provider)
     return media::Context3D();
   return media::Context3D(provider->ContextGL(), provider->GrContext());
 }
 #endif
 
 bool IsReload(FrameMsg_Navigate_Type::Value navigation_type) {
@@ skipping 1460 matching lines @@
     render_view_->RegisterVideoHoleFrame(this);
     contains_media_player_ = true;
   }
 #endif  // defined(VIDEO_HOLE)
 
   blink::WebMediaStream web_stream(
       blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url));
   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 defined(OS_ANDROID) && !defined(ENABLE)
return WMPA
#else

#if defined(OS_ANDROID)
if (!flag)  return WMPA
#endif

return WMPI
#endif

keeps the cases disjoint, and maybe a little easier to read.

[xhwang, 2015/07/10 17:27:50]

Hmm, it's sad to see "return WMPA" twice.

Actually, why do we have both a gyp variable and a command line flag? Can we
just use one, e.g. the gyp variable, for prototyping/experiment?

[liberato (no reviews please), 2015/07/10 17:32:07]

i agree about the sad.  i tried to restructure this a few times, but couldn't do
it without sometimes returning null if the flag was set without WMPI compiled. 
if we're okay with that...

[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();
   media::WebMediaPlayerParams params(
       base::Bind(&ContentRendererClient::DeferMediaLoad,
                  base::Unretained(GetContentClient()->renderer()),
                  static_cast<RenderFrame*>(this)),
       render_thread->GetAudioRendererMixerManager()->CreateInput(routing_id_),
       media_log, render_thread->GetMediaThreadTaskRunner(),
       render_thread->compositor_task_runner(),
@@ skipping 11 matching lines @@
   if (!media_renderer_factory.get()) {
     media_renderer_factory.reset(new media::DefaultRendererFactory(
         media_log, render_thread->GetGpuFactories(),
         *render_thread->GetAudioHardwareConfig()));
   }
 #endif  // defined(ENABLE_MOJO_MEDIA)
 
   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(
     blink::WebLocalFrame* frame,
     blink::WebApplicationCacheHostClient* client) {
   if (!frame || !frame->view())
     return NULL;
   DCHECK(!frame_ || frame_ == frame);
   return new RendererWebApplicationCacheHostImpl(
       RenderViewImpl::FromWebView(frame->view()), client,
@@ skipping 2988 matching lines @@
 void RenderFrameImpl::RegisterMojoServices() {
   // Only main frame have ImageDownloader service.
   if (!frame_->parent()) {
     GetServiceRegistry()->AddService<image_downloader::ImageDownloader>(
         base::Bind(&ImageDownloaderImpl::CreateMojoService,
                    base::Unretained(this)));
   }
 }
 
 }  // namespace content