Plumb extra_data() to VideoDecodeAccelerator

content/common/gpu/media/mac_video_decode_accelerator.mm

 // 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/mac_video_decode_accelerator.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #import "base/mac/foundation_util.h"
 #import "base/memory/ref_counted_memory.h"
@@ skipping 77 matching lines @@
       nalu_len_field_size_(0),
       frame_width_(0),
       frame_height_(0),
       did_request_pictures_(false) {
 }
 
 void MacVideoDecodeAccelerator::SetGLContext(void* gl_context) {
   cgl_context_ = static_cast<CGLContextObj>(gl_context);
 }
 
-bool MacVideoDecodeAccelerator::SetConfigInfo(
-    uint32_t frame_width,
-    uint32_t frame_height,
-    const std::vector<uint8_t>& avc_data) {
-  frame_width_ = frame_width;
-  frame_height_ = frame_height;
-  nalu_len_field_size_ = (avc_data[4] & 0x03) + 1;
+bool MacVideoDecodeAccelerator::Initialize(
+    media::VideoCodecProfile profile,
+    const gfx::Size& frame_size,
+    const std::vector<uint8_t>& extra_data) {
+  if (extra_data.size() < 5)
+    return false;
+
+  frame_width_ = frame_size.width();
+  frame_height_ = frame_size.height();
+  nalu_len_field_size_ = (extra_data[4] & 0x03) + 1;
 
   DCHECK(!vda_.get());
   vda_ = new gfx::VideoDecodeAccelerationSupport();
   gfx::VideoDecodeAccelerationSupport::Status status = vda_->Create(
       frame_width_, frame_height_,
-      kCVPixelFormatType_422YpCbCr8, &avc_data.front(), avc_data.size());
+      kCVPixelFormatType_422YpCbCr8, &extra_data.front(), extra_data.size());
   if (status != gfx::VideoDecodeAccelerationSupport::VDA_SUCCESS)
     return false;
-  return true;
-}
 
-bool MacVideoDecodeAccelerator::Initialize(media::VideoCodecProfile profile) {
   if (client_)
     client_->NotifyInitializeDone();
   return true;
 }
 
 void MacVideoDecodeAccelerator::Decode(
     const media::BitstreamBuffer& bitstream_buffer) {
   base::SharedMemory memory(bitstream_buffer.handle(), true);
   if (!memory.Map(bitstream_buffer.size())) {
     CHECK(false);
@@ skipping 136 matching lines @@
 }
 
 MacVideoDecodeAccelerator::PendingPictureInfo::~PendingPictureInfo() {
 }
 
 MacVideoDecodeAccelerator::DecodedImageInfo::DecodedImageInfo() {
 }
 
 MacVideoDecodeAccelerator::DecodedImageInfo::~DecodedImageInfo() {
 }