Plumb extra_data() to VideoDecodeAccelerator

content/common/gpu/media/mac_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.
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_MAC_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_MAC_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <CoreVideo/CoreVideo.h>
 #include <map>
 #include <list>
@@ skipping 13 matching lines @@
 class GpuCommandBufferStub;
 
 class MacVideoDecodeAccelerator : public media::VideoDecodeAccelerator {
  public:
   // Does not take ownership of |client| which must outlive |*this|.
   MacVideoDecodeAccelerator(media::VideoDecodeAccelerator::Client* client);
 
   // Set the OpenGL context to use.
   void SetGLContext(void* gl_context);
 
-  // Set extra data required to initialize the H.264 video decoder.
-  // TODO(sail): Move this into Initialize.
-  bool SetConfigInfo(uint32_t frame_width,
-                     uint32_t frame_height,
-                     const std::vector<uint8_t>& avc_data);
-
   // media::VideoDecodeAccelerator implementation.
-  virtual bool Initialize(media::VideoCodecProfile profile) OVERRIDE;
+  virtual bool Initialize(media::VideoCodecProfile profile,
+                          const gfx::Size& frame_size,
+                          const std::vector<uint8_t>& extra_data) OVERRIDE;
   virtual void Decode(const media::BitstreamBuffer& bitstream_buffer) OVERRIDE;
   virtual void AssignPictureBuffers(
       const std::vector<media::PictureBuffer>& buffers) OVERRIDE;
   virtual void ReusePictureBuffer(int32 picture_buffer_id) OVERRIDE;
   virtual void Flush() OVERRIDE;
   virtual void Reset() OVERRIDE;
   virtual void Destroy() OVERRIDE;
 
  private:
   virtual ~MacVideoDecodeAccelerator();
@@ skipping 47 matching lines @@
 
   // Width of a video frame.
   uint32_t frame_width_;
   // Height of a video frame.
   uint32_t frame_height_;
   // Flag to check if pictures have been requested from the client.
   bool did_request_pictures_;
 };
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_VIDEO_DECODE_ACCELERATOR_MAC_H_