Plumb extra_data() to VideoDecodeAccelerator

content/common/gpu/media/video_decode_accelerator_unittest.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.
 //
 // The bulk of this file is support code; sorry about that.  Here's an overview
 // to hopefully help readers of this code:
 // - RenderingHelper is charged with interacting with X11, EGL, and GLES2.
 // - ClientState is an enum for the state of the decode client used by the test.
 // - ClientStateNotification is a barrier abstraction that allows the test code
 //   to be written sequentially and wait for the decode client to see certain
@@ skipping 309 matching lines @@
 #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
   scoped_refptr<OmxVideoDecodeAccelerator> decoder =
       new OmxVideoDecodeAccelerator(this);
   decoder->SetEglState(
       static_cast<EGLDisplay>(rendering_helper->GetGLDisplay()),
       static_cast<EGLContext>(rendering_helper->GetGLContext()));
 #elif defined(OS_MACOSX)
   scoped_refptr<MacVideoDecodeAccelerator> decoder =
       new MacVideoDecodeAccelerator(this);
   decoder->SetGLContext(rendering_helper_->GetGLContext());
-  std::vector<uint8_t> avc_data(MP4_EXTRA_DATA,
-                                MP4_EXTRA_DATA + arraysize(MP4_EXTRA_DATA));
-  if (!decoder->SetConfigInfo(frame_width_, frame_height_, avc_data)) {
-    SetState(CS_ERROR);
-    return;
-  }
 #endif  // OS_WIN
   decoder_ = decoder.release();
   SetState(CS_DECODER_SET);
   if (decoder_deleted())
     return;
 
   // Configure the decoder.
   media::VideoCodecProfile profile = media::H264PROFILE_BASELINE;
   if (profile_ != -1)
     profile = static_cast<media::VideoCodecProfile>(profile_);
-  CHECK(decoder_->Initialize(profile));
+  std::vector<uint8_t> avc_data(MP4_EXTRA_DATA,
+                                MP4_EXTRA_DATA + arraysize(MP4_EXTRA_DATA));
+  CHECK(decoder_->Initialize(
+      profile, gfx::Size(frame_width_, frame_height_), avc_data));
 }
 
 void EglRenderingVDAClient::ProvidePictureBuffers(
     uint32 requested_num_of_buffers,
     const gfx::Size& dimensions) {
   if (decoder_deleted())
     return;
   std::vector<media::PictureBuffer> buffers;
 
   for (uint32 i = 0; i < requested_num_of_buffers; ++i) {
@@ skipping 476 matching lines @@
 
   base::ShadowingAtExitManager at_exit_manager;
   RenderingHelper::InitializePlatform();
 
 #if defined(OS_WIN)
   DXVAVideoDecodeAccelerator::PreSandboxInitialization();
 #endif
 
   return RUN_ALL_TESTS();
 }