Plumb texture target to VideoDecodeAccelerator::Client

content/renderer/media/renderer_gpu_video_decoder_factories.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/media/renderer_gpu_video_decoder_factories.h"
 
 #include "base/bind.h"
 #include "base/synchronization/waitable_event.h"
 #include "content/common/child_thread.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
@@ skipping 57 matching lines @@
         profile, client);
   } else {
     *vda = NULL;
   }
   waiter->Signal();
 }
 
 bool RendererGpuVideoDecoderFactories::CreateTextures(
     int32 count, const gfx::Size& size,
     std::vector<uint32>* texture_ids,
-    uint32* texture_target) {
+    uint32 texture_target) {
   DCHECK_NE(MessageLoop::current(), message_loop_);
   bool success = false;
   base::WaitableEvent waiter(false, false);
   message_loop_->PostTask(FROM_HERE, base::Bind(
       &RendererGpuVideoDecoderFactories::AsyncCreateTextures, this,
       count, size, texture_ids, texture_target, &success, &waiter));
   waiter.Wait();
   return success;
 }
 
 void RendererGpuVideoDecoderFactories::AsyncCreateTextures(
     int32 count, const gfx::Size& size, std::vector<uint32>* texture_ids,
-    uint32* texture_target, bool* success, base::WaitableEvent* waiter) {
+    uint32 texture_target, bool* success, base::WaitableEvent* waiter) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
+  DCHECK(texture_target);
   if (!context_) {
     *success = false;
     waiter->Signal();
     return;
   }
   gpu::gles2::GLES2Implementation* gles2 = context_->GetImplementation();
   texture_ids->resize(count);
   gles2->GenTextures(count, &texture_ids->at(0));
-  *texture_target = GL_TEXTURE_2D;
   for (int i = 0; i < count; ++i) {
     gles2->ActiveTexture(GL_TEXTURE0);
     uint32 texture_id = texture_ids->at(i);
-    gles2->BindTexture(*texture_target, texture_id);
-    gles2->TexParameteri(*texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    gles2->TexParameteri(*texture_target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    gles2->TexParameterf(*texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    gles2->TexParameterf(*texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    gles2->TexImage2D(*texture_target, 0, GL_RGBA, size.width(), size.height(),
+    gles2->BindTexture(texture_target, texture_id);
+    gles2->TexParameteri(texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    gles2->TexParameteri(texture_target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    gles2->TexParameterf(texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    gles2->TexParameterf(texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    gles2->TexImage2D(texture_target, 0, GL_RGBA, size.width(), size.height(),
                       0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
   }
   // We need a glFlush here to guarantee the decoder (in the GPU process) can
   // use the texture ids we return here.  Since textures are expected to be
   // reused, this should not be unacceptably expensive.
   gles2->Flush();
   DCHECK_EQ(gles2->GetError(), static_cast<GLenum>(GL_NO_ERROR));
   *success = true;
   waiter->Signal();
 }
@@ skipping 24 matching lines @@
   waiter.Wait();
   return shm;
 }
 
 void RendererGpuVideoDecoderFactories::AsyncCreateSharedMemory(
     size_t size, base::SharedMemory** shm, base::WaitableEvent* waiter) {
   DCHECK_EQ(MessageLoop::current(), ChildThread::current()->message_loop());
   *shm = ChildThread::current()->AllocateSharedMemory(size);
   waiter->Signal();
 }