Fix support for yuv_422 pixel format.

media/video/ffmpeg_video_decode_engine_unittest.cc

 // Copyright (c) 2011 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 "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "media/base/data_buffer.h"
 #include "media/base/mock_task.h"
 #include "media/base/pipeline.h"
 #include "media/base/test_data_util.h"
@@ skipping 19 matching lines @@
 
 ACTION_P2(DemuxComplete, engine, buffer) {
   engine->ConsumeVideoSample(buffer);
 }
 
 class FFmpegVideoDecodeEngineTest
     : public testing::Test,
       public VideoDecodeEngine::EventHandler {
  public:
   FFmpegVideoDecodeEngineTest()
-      : config_(kCodecVP8, kCodedSize, kVisibleRect, kNaturalSize,
-                kFrameRate.num, kFrameRate.den, NULL, 0) {
+      : config_(kCodecVP8, VideoFrame::YV12, kCodedSize, kVisibleRect,
+                kNaturalSize, kFrameRate.num, kFrameRate.den, NULL, 0) {
     CHECK(FFmpegGlue::GetInstance());
 
     // Setup FFmpeg structures.
     frame_buffer_.reset(new uint8[kCodedSize.GetArea()]);
 
     test_engine_.reset(new FFmpegVideoDecodeEngine());
 
     ReadTestDataFile("vp8-I-frame-320x240", &i_frame_buffer_);
     ReadTestDataFile("vp8-corrupt-I-frame", &corrupt_i_frame_buffer_);
 
@@ skipping 90 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecodeEngineTest);
 };
 
 TEST_F(FFmpegVideoDecodeEngineTest, Initialize_Normal) {
   Initialize();
 }
 
 TEST_F(FFmpegVideoDecodeEngineTest, Initialize_FindDecoderFails) {
-  VideoDecoderConfig config(kUnknownVideoCodec, kCodedSize, kVisibleRect,
-                            kNaturalSize, kFrameRate.num, kFrameRate.den,
-                            NULL, 0);
+  VideoDecoderConfig config(kUnknownVideoCodec, VideoFrame::YV12, kCodedSize,
+                            kVisibleRect, kNaturalSize, kFrameRate.num,
+                            kFrameRate.den, NULL, 0);
 
   // Test avcodec_find_decoder() returning NULL.
   VideoCodecInfo info;
   EXPECT_CALL(*this, OnInitializeComplete(_))
      .WillOnce(SaveArg<0>(&info));
   test_engine_->Initialize(MessageLoop::current(), this, NULL, config);
   EXPECT_FALSE(info.success);
 }
 
 TEST_F(FFmpegVideoDecodeEngineTest, Initialize_OpenDecoderFails) {
   // Specify Theora w/o extra data so that avcodec_open() fails.
-  VideoDecoderConfig config(kCodecTheora, kCodedSize, kVisibleRect,
-                            kNaturalSize, kFrameRate.num, kFrameRate.den,
-                            NULL, 0);
+  VideoDecoderConfig config(kCodecTheora, VideoFrame::YV12, kCodedSize,
+                            kVisibleRect, kNaturalSize, kFrameRate.num,
+                            kFrameRate.den, NULL, 0);
   VideoCodecInfo info;
   EXPECT_CALL(*this, OnInitializeComplete(_))
      .WillOnce(SaveArg<0>(&info));
   test_engine_->Initialize(MessageLoop::current(), this, NULL, config);
   EXPECT_FALSE(info.success);
 }
 
 TEST_F(FFmpegVideoDecodeEngineTest, DecodeFrame_Normal) {
   Initialize();
 
@@ skipping 97 matching lines @@
 //  DecodeIFrameThenTestFile("vp8-I-frame-320x480");
 //}
 
 // Decode |i_frame_buffer_| and then a frame with a smaller height and verify
 // the output size didn't change.
 TEST_F(FFmpegVideoDecodeEngineTest, DecodeFrame_SmallerHeight) {
   DecodeIFrameThenTestFile("vp8-I-frame-320x120");
 }
 
 }  // namespace media