Leave CreateStreamTexture route id out of the GL interface.

content/renderer/render_thread_impl.cc

 // Copyright (c) 2012 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_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <vector>
@@ skipping 143 matching lines @@
 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 #include "third_party/skia/include/core/SkGraphics.h"
 #include "ui/base/layout.h"
 #include "ui/base/ui_base_switches.h"
 #include "v8/include/v8.h"
 
 #if defined(OS_ANDROID)
 #include <cpu-features.h>
 #include "content/renderer/android/synchronous_compositor_factory.h"
 #include "content/renderer/media/android/renderer_demuxer_android.h"
+#include "content/renderer/media/android/stream_texture_factory_impl.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "content/renderer/theme_helper_mac.h"
 #include "content/renderer/webscrollbarbehavior_impl_mac.h"
 #endif
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
@@ skipping 711 matching lines @@
   // hold pointers to V8 objects (e.g., via pending requests).
   main_thread_indexed_db_dispatcher_.reset();
 
   main_thread_compositor_task_runner_ = NULL;
 
   gpu_factories_.reset();
 
   // Context providers must be released prior to destroying the GPU channel.
   shared_worker_context_provider_ = nullptr;
   shared_main_thread_contexts_ = nullptr;
-
+#if defined(OS_ANDROID)
+  stream_texture_factory_ = nullptr;
+#endif
   if (gpu_channel_.get())
     gpu_channel_->DestroyChannel();
 
   // TODO(port)
 #if defined(OS_WIN)
   // Clean up plugin channels before this thread goes away.
   NPChannelBase::CleanupChannels();
 #endif
 
   // Shut down the message loop and the renderer scheduler before shutting down
@@ skipping 517 matching lines @@
           WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits(),
           NULL));
 }
 
 scoped_refptr<cc_blink::ContextProviderWebContext>
 RenderThreadImpl::SharedMainThreadContextProvider() {
   DCHECK(IsMainThread());
   if (!shared_main_thread_contexts_.get() ||
       shared_main_thread_contexts_->ContextGL()->GetGraphicsResetStatusKHR() !=
           GL_NO_ERROR) {
-    shared_main_thread_contexts_ = ContextProviderCommandBuffer::Create(
-        CreateOffscreenContext3d(), RENDERER_MAINTHREAD_CONTEXT);
-    if (shared_main_thread_contexts_.get() &&
-        !shared_main_thread_contexts_->BindToCurrentThread())
+    scoped_refptr<ContextProviderCommandBuffer> context_provider =
+        ContextProviderCommandBuffer::Create(CreateOffscreenContext3d(),
+                                             RENDERER_MAINTHREAD_CONTEXT);
+    if (!context_provider.get()) {
+      LOG(ERROR) << "Failed to get context3d for media player";
+      return NULL;
+    }
+    if (context_provider.get() && context_provider->BindToCurrentThread()) {
+#if defined(OS_ANDROID)
+      // Create shared StreamTextureFactoryImpl per RenderThreadImpl when we

[no sievers, 2015/11/06 22:08:41]

can you move this android block to GetStreamTextureFactory() below, so we do it
lazily there instead?

[sivag, 2015/11/09 14:06:32]

Done.

+      // create ContextProviderCommandBuffer.
+      scoped_refptr<GpuChannelHost> gpu_channel_host(EstablishGpuChannelSync(
+          CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE));
+      if (!gpu_channel_host.get()) {
+        LOG(ERROR) << "Failed to establish GPU channel for media player";
+        stream_texture_factory_ = NULL;
+      } else {
+        stream_texture_factory_ = StreamTextureFactoryImpl::Create(
+            context_provider, gpu_channel_host.get());
+      }
+#endif
+      shared_main_thread_contexts_ = context_provider;
+    } else
       shared_main_thread_contexts_ = NULL;
   }
   return shared_main_thread_contexts_;
 }
 
+#if defined(OS_ANDROID)
+scoped_refptr<StreamTextureFactory> RenderThreadImpl::GetStreamTexureFactory() {
+  DCHECK(IsMainThread());
+  if (!stream_texture_factory_.get()) {
+    // StreamTextureFactoryImpl is created while creating
+    // ContextProviderCommandBuffer.
+    SharedMainThreadContextProvider();
+  }
+  return stream_texture_factory_;
+}
+#endif
+
 AudioRendererMixerManager* RenderThreadImpl::GetAudioRendererMixerManager() {
   if (!audio_renderer_mixer_manager_) {
     audio_renderer_mixer_manager_.reset(new AudioRendererMixerManager());
   }
 
   return audio_renderer_mixer_manager_.get();
 }
 
 media::AudioHardwareConfig* RenderThreadImpl::GetAudioHardwareConfig() {
   if (!audio_hardware_config_) {
@@ skipping 556 matching lines @@
 }
 
 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
   size_t erased =
       RenderThreadImpl::current()->pending_render_frame_connects_.erase(
           routing_id_);
   DCHECK_EQ(1u, erased);
 }
 
 }  // namespace content