Revert of Mac: Decode hardware to 420 instead of 422

content/common/gpu/media/vaapi_video_decode_accelerator.h

 // 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.
 //
 // This file contains an implementation of VideoDecoderAccelerator
 // that utilizes hardware video decoder present on Intel CPUs.
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_DECODE_ACCELERATOR_H_
 
@@ skipping 37 matching lines @@
 // Threading/life-cycle: this object is created & destroyed on the GPU
 // ChildThread.  A few methods on it are called on the decoder thread which is
 // stopped during |this->Destroy()|, so any tasks posted to the decoder thread
 // can assume |*this| is still alive.  See |weak_this_| below for more details.
 class CONTENT_EXPORT VaapiVideoDecodeAccelerator
     : public media::VideoDecodeAccelerator {
  public:
   class VaapiDecodeSurface;
 
   VaapiVideoDecodeAccelerator(
-      const MakeContextCurrentCallback& make_context_current,
-      const BindImageCallback& bind_image);
+      const base::Callback<bool(void)>& make_context_current,
+      const base::Callback<
+          void(uint32_t, uint32_t, scoped_refptr<gl::GLImage>)>& bind_image);
   ~VaapiVideoDecodeAccelerator() override;
 
   // media::VideoDecodeAccelerator implementation.
   bool Initialize(const Config& config, Client* client) override;
   void Decode(const media::BitstreamBuffer& bitstream_buffer) override;
   void AssignPictureBuffers(
       const std::vector<media::PictureBuffer>& buffers) override;
   void ReusePictureBuffer(int32_t picture_buffer_id) override;
   void Flush() override;
   void Reset() override;
@@ skipping 104 matching lines @@
   // each submitted command in order, and run each command only if its
   // dependencies are ready.
   void SurfaceReady(const scoped_refptr<VaapiDecodeSurface>& dec_surface);
 
   // Return a new VaapiDecodeSurface for decoding into, or nullptr if not
   // available.
   scoped_refptr<VaapiDecodeSurface> CreateSurface();
 
 
   // Client-provided GL state.
-  MakeContextCurrentCallback make_context_current_;
+  base::Callback<bool(void)> make_context_current_;
 
   // VAVDA state.
   enum State {
     // Initialize() not called yet or failed.
     kUninitialized,
     // DecodeTask running.
     kDecoding,
     // Resetting, waiting for decoder to finish current task and cleanup.
     kResetting,
     // Flushing, waiting for decoder to finish current task and cleanup.
@@ skipping 103 matching lines @@
   // Decoder requested a new surface set and we are waiting for all the surfaces
   // to be returned before we can free them.
   bool awaiting_va_surfaces_recycle_;
 
   // Last requested number/resolution of output picture buffers.
   size_t requested_num_pics_;
   gfx::Size requested_pic_size_;
 
   // Binds the provided GLImage to a givenr client texture ID & texture target
   // combination in GLES.
-  BindImageCallback bind_image_;
+  base::Callback<void(uint32_t, uint32_t, scoped_refptr<gl::GLImage>)>
+      bind_image_;
 
   // The WeakPtrFactory for |weak_this_|.
   base::WeakPtrFactory<VaapiVideoDecodeAccelerator> weak_this_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VaapiVideoDecodeAccelerator);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_DECODE_ACCELERATOR_H_