Plumb decoded video pixel format from GPU process to renderer.

media/gpu/vaapi_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 "media/gpu/vaapi_video_decode_accelerator.h"
 
 #include <string.h>
 
 #include <memory>
 
@@ skipping 619 matching lines @@
   // we can finish all pending output callbacks, releasing associated surfaces.
   DVLOG(1) << "Initiating surface set change";
   awaiting_va_surfaces_recycle_ = true;
 
   requested_num_pics_ = num_pics;
   requested_pic_size_ = size;
 
   TryFinishSurfaceSetChange();
 }
 
+static VideoPixelFormat BufferFormatToVideoPixelFormat(
+    gfx::BufferFormat format) {
+  switch (format) {
+    case gfx::BufferFormat::BGRA_8888:
+      return PIXEL_FORMAT_ARGB;
+
+    default:
+      LOG(FATAL) << "Add more cases as needed";
+      return PIXEL_FORMAT_UNKNOWN;
+  }
+}
+
 void VaapiVideoDecodeAccelerator::TryFinishSurfaceSetChange() {
   DCHECK_EQ(message_loop_, base::MessageLoop::current());
 
   if (!awaiting_va_surfaces_recycle_)
     return;
 
   if (!pending_output_cbs_.empty() ||
       pictures_.size() != available_va_surfaces_.size()) {
     // Either:
     // 1. Not all pending pending output callbacks have been executed yet.
@@ skipping 19 matching lines @@
     DVLOG(2) << "Dismissing picture id: " << iter->first;
     if (client_)
       client_->DismissPictureBuffer(iter->first);
   }
   pictures_.clear();
 
   // And ask for a new set as requested.
   DVLOG(1) << "Requesting " << requested_num_pics_
            << " pictures of size: " << requested_pic_size_.ToString();
 
+  VideoPixelFormat format =
+      BufferFormatToVideoPixelFormat(kOutputPictureFormat);
   message_loop_->PostTask(
-      FROM_HERE,
-      base::Bind(&Client::ProvidePictureBuffers, client_, requested_num_pics_,
-                 1, requested_pic_size_, VaapiPicture::GetGLTextureTarget()));
+      FROM_HERE, base::Bind(&Client::ProvidePictureBuffers, client_,
+                            requested_num_pics_, format, 1, requested_pic_size_,
+                            VaapiPicture::GetGLTextureTarget()));
 }
 
 void VaapiVideoDecodeAccelerator::Decode(
     const media::BitstreamBuffer& bitstream_buffer) {
   DCHECK_EQ(message_loop_, base::MessageLoop::current());
 
   TRACE_EVENT1("Video Decoder", "VAVDA::Decode", "Buffer id",
                bitstream_buffer.id());
 
   if (bitstream_buffer.id() < 0) {
@@ skipping 344 matching lines @@
   Cleanup();
   delete this;
 }
 
 bool VaapiVideoDecodeAccelerator::TryToSetupDecodeOnSeparateThread(
     const base::WeakPtr<Client>& decode_client,
     const scoped_refptr<base::SingleThreadTaskRunner>& decode_task_runner) {
   return false;
 }
 
-static VideoPixelFormat BufferFormatToVideoPixelFormat(
-    gfx::BufferFormat format) {
-  switch (format) {
-    case gfx::BufferFormat::BGRA_8888:
-      return PIXEL_FORMAT_ARGB;
-
-    default:
-      LOG(FATAL) << "Add more cases as needed";
-      return PIXEL_FORMAT_UNKNOWN;
-  }
-}
-
-VideoPixelFormat VaapiVideoDecodeAccelerator::GetOutputFormat() const {
-  return BufferFormatToVideoPixelFormat(kOutputPictureFormat);
-}
-
 bool VaapiVideoDecodeAccelerator::DecodeSurface(
     const scoped_refptr<VaapiDecodeSurface>& dec_surface) {
   if (!vaapi_wrapper_->ExecuteAndDestroyPendingBuffers(
           dec_surface->va_surface()->id())) {
     DVLOG(1) << "Failed decoding picture";
     return false;
   }
 
   return true;
 }
@@ skipping 758 matching lines @@
   return vaapi_pic->dec_surface();
 }
 
 // static
 media::VideoDecodeAccelerator::SupportedProfiles
 VaapiVideoDecodeAccelerator::GetSupportedProfiles() {
   return VaapiWrapper::GetSupportedDecodeProfiles();
 }
 
 }  // namespace media