Build AVC decoder configuration record

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 58 matching lines @@
 // - |profile| is the media::H264Profile set during Initialization.
 // An empty value for a numeric field means "ignore".
 #if defined(OS_MACOSX)
 const FilePath::CharType* test_video_data =
     FILE_PATH_LITERAL("test-25fps_high.h264:1280:720:249:252:50:175:4");
 #else
 const FilePath::CharType* test_video_data =
     FILE_PATH_LITERAL("test-25fps.h264:320:240:250:258:50:175:1");
 #endif
 
-// AAVC data required to initialize the H.264 video decoder.
-// TODO(sail): Remove this and build the AVC configuration record instead.
-const uint8 MP4_EXTRA_DATA[] = {
-  0x01, 0x64, 0x00, 0x1f,    0xff, 0xe1, 0x00, 0x19,
-  0x67, 0x64, 0x00, 0x1f,    0xac, 0x34, 0xec, 0x05,
-  0x00, 0x5b, 0xa1, 0x00,    0x00, 0x03, 0x00, 0x01,
-  0x00, 0x00, 0x03, 0x00,    0x32, 0x0f, 0x18, 0x31,
-  0x38, 0x01, 0x00, 0x05,    0x68, 0xef, 0xb2, 0xc8,
-  0xb0,
-};
-
 // Parse |data| into its constituent parts and set the various output fields
 // accordingly.  CHECK-fails on unexpected or missing required data.
 // Unspecified optional fields are set to -1.
 void ParseTestVideoData(FilePath::StringType data,
                         FilePath::StringType* file_name,
                         int* width, int* height,
                         int* num_frames,
                         int* num_NALUs,
                         int* min_fps_render,
                         int* min_fps_no_render,
@@ skipping 222 matching lines @@
   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->SetCGLContext(
       static_cast<CGLContextObj>(rendering_helper_->GetGLContext()));
-  std::vector<uint8> 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_);
@@ skipping 483 matching lines @@
 
   base::ShadowingAtExitManager at_exit_manager;
   RenderingHelper::InitializePlatform();
 
 #if defined(OS_WIN)
   DXVAVideoDecodeAccelerator::PreSandboxInitialization();
 #endif
 
   return RUN_ALL_TESTS();
 }