| Index: media/video/ffmpeg_video_decode_engine_unittest.cc
|
| diff --git a/media/video/ffmpeg_video_decode_engine_unittest.cc b/media/video/ffmpeg_video_decode_engine_unittest.cc
|
| index 8e171e134176be35b44e7b507c3af90fcfb0d6a9..58d22501c4ecce0aabfd1a21f755bb65305084fe 100644
|
| --- a/media/video/ffmpeg_video_decode_engine_unittest.cc
|
| +++ b/media/video/ffmpeg_video_decode_engine_unittest.cc
|
| @@ -37,8 +37,8 @@ class FFmpegVideoDecodeEngineTest
|
| 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.
|
| @@ -149,9 +149,9 @@ TEST_F(FFmpegVideoDecodeEngineTest, Initialize_Normal) {
|
| }
|
|
|
| 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;
|
| @@ -163,9 +163,9 @@ TEST_F(FFmpegVideoDecodeEngineTest, Initialize_FindDecoderFails) {
|
|
|
| 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));
|
|
|