Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(576)

Unified Diff: media/video/ffmpeg_video_decode_engine_unittest.cc

Issue 8052002: Fix support for yuv_422 pixel format. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixed existing unit tests. Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« media/base/video_frame.cc ('K') | « media/video/ffmpeg_video_decode_engine.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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));
« media/base/video_frame.cc ('K') | « media/video/ffmpeg_video_decode_engine.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698