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 146 matching lines @@
 #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_external_begin_frame_source.h"
 #include "content/renderer/android/synchronous_compositor_factory.h"
 #include "content/renderer/android/synchronous_compositor_filter.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 685 matching lines @@
   if (compositor_message_filter_.get()) {
     RemoveFilter(compositor_message_filter_.get());
     compositor_message_filter_ = NULL;
   }
 
 #if defined(OS_ANDROID)
   if (sync_compositor_message_filter_) {
     RemoveFilter(sync_compositor_message_filter_.get());
     sync_compositor_message_filter_ = nullptr;
   }
+  stream_texture_factory_ = nullptr;
 #endif
 
   media_thread_.reset();
 
   compositor_thread_.reset();
 
   // AudioMessageFilter may be accessed on |media_thread_|, so shutdown after.
   RemoveFilter(audio_message_filter_.get());
   audio_message_filter_ = NULL;
 
@@ skipping 575 matching lines @@
           GL_NO_ERROR) {
     shared_main_thread_contexts_ = ContextProviderCommandBuffer::Create(
         CreateOffscreenContext3d(), RENDERER_MAINTHREAD_CONTEXT);
     if (shared_main_thread_contexts_.get() &&
         !shared_main_thread_contexts_->BindToCurrentThread())
       shared_main_thread_contexts_ = NULL;
   }
   return shared_main_thread_contexts_;
 }
 
+#if defined(OS_ANDROID)
+scoped_refptr<StreamTextureFactory> RenderThreadImpl::GetStreamTexureFactory() {
+  DCHECK(IsMainThread());
+  if (!SharedMainThreadContextProvider().get()) {
+    stream_texture_factory_ = NULL;
+    return NULL;
+  }
+  // Create shared StreamTextureFactoryImpl per RenderThreadImpl when we
+  // 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(

[no sievers, 2015/11/09 21:27:34]

If you are creating a new factory every time, then please rename the function to
'CreateStreamTextureFactory()' and remove |stream_texture_factory_| (no need to
keep it as a member).

nit: Then you might as well also pull the SynchronousComopositorFactory version
of the code into here.

Or if you do want to cache it on the other hand, then return the cached version
as long as it's not lost (you can do a similar check to
SharedMainThreadContextProvider() above, but check
stream_texture_factory_->ContextGL()->GetGraphicsResetStatusKHR()) before
returning the cached one (otherwise attempt to create a new one).

[sivag, 2015/11/10 13:18:56]

Done.

+        shared_main_thread_contexts_, gpu_channel_host.get());
+  }
+  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 560 matching lines @@
 }
 
 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
   size_t erased =
       RenderThreadImpl::current()->pending_render_frame_connects_.erase(
           routing_id_);
   DCHECK_EQ(1u, erased);
 }
 
 }  // namespace content