gpu: Make GPU command decoder know right format of a GPU video texture in Win.

content/common/gpu/media/gpu_video_decode_accelerator.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/common/gpu/media/gpu_video_decode_accelerator.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 352 matching lines @@
       NotifyError(media::VideoDecodeAccelerator::INVALID_ARGUMENT);
       return;
     }
     gpu::gles2::Texture* info = texture_ref->texture();
     if (info->target() != texture_target_) {
       DLOG(ERROR) << "Texture target mismatch for texture id "
                   << texture_ids[i];
       NotifyError(media::VideoDecodeAccelerator::INVALID_ARGUMENT);
       return;
     }
+    GLenum format = GL_RGBA;
+// FIXME: after moving to D3D11, remove this workaround. crbug.com/438691
+#if defined(OS_WIN)
+    format = static_cast<DXVAVideoDecodeAccelerator*>(

[Ken Russell (switch to Gerrit), 2014/12/05 20:53:43]

Could you please avoid this downcast by defining a virtual function on
GpuVideoDecodeAccelerator with a default implementation returning GL_RGBA?

[dshwang, 2014/12/08 13:47:28]

Done.

+                 video_decode_accelerator_.get())->GetSufaceInternalFormat();
+#endif
     if (texture_target_ == GL_TEXTURE_EXTERNAL_OES ||
-        texture_target_ == GL_TEXTURE_RECTANGLE) {
+        texture_target_ == GL_TEXTURE_RECTANGLE || format != GL_RGBA) {
       // These textures have their dimensions defined by the underlying storage.
       // Use |texture_dimensions_| for this size.
-      texture_manager->SetLevelInfo(texture_ref,
-                                    texture_target_,
-                                    0,
-                                    GL_RGBA,
-                                    texture_dimensions_.width(),
-                                    texture_dimensions_.height(),
-                                    1,
-                                    0,
-                                    GL_RGBA,
-                                    0,
-                                    false);
+      texture_manager->SetLevelInfo(
+          texture_ref, texture_target_, 0, format, texture_dimensions_.width(),
+          texture_dimensions_.height(), 1, 0, format, 0, false);
     } else {
       // For other targets, texture dimensions should already be defined.
       GLsizei width = 0, height = 0;
       info->GetLevelSize(texture_target_, 0, &width, &height);
       if (width != texture_dimensions_.width() ||
           height != texture_dimensions_.height()) {
         DLOG(ERROR) << "Size mismatch for texture id " << texture_ids[i];
         NotifyError(media::VideoDecodeAccelerator::INVALID_ARGUMENT);
         return;
       }
@@ skipping 108 matching lines @@
   return stub_->channel()->Send(message);
 }
 
 void GpuVideoDecodeAccelerator::SendCreateDecoderReply(IPC::Message* message,
                                                        bool succeeded) {
   GpuCommandBufferMsg_CreateVideoDecoder::WriteReplyParams(message, succeeded);
   Send(message);
 }
 
 }  // namespace content