Index: media/filters/ffmpeg_video_decoder_unittest.cc |
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc |
index 3c0af396c95a12130c23930937a09242f5f57f6b..57b37192aa61e53256df38776a8ef2fb089a90cb 100644 |
--- a/media/filters/ffmpeg_video_decoder_unittest.cc |
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc |
@@ -36,7 +36,7 @@ namespace media { |
static const VideoFrame::Format kVideoFormat = VideoFrame::YV12; |
static const gfx::Size kCodedSize(320, 240); |
static const gfx::Rect kVisibleRect(320, 240); |
-static const AVRational kAspectRatio = { 1, 1 }; |
+static const gfx::Size kNaturalSize(320, 240); |
static const uint8 kFakeKeyId[] = { 0x4b, 0x65, 0x79, 0x20, 0x49, 0x44 }; |
static const uint8 kFakeIv[DecryptConfig::kDecryptionKeySize] = { 0 }; |
static const uint8 kFakeCheckSum[] = { 0, 0 }; |
@@ -87,8 +87,7 @@ class FFmpegVideoDecoderTest : public testing::Test { |
encrypted_i_frame_buffer_ = CreateFakeEncryptedBuffer(); |
config_.Initialize(kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN, |
- kVideoFormat, kCodedSize, kVisibleRect, |
- kAspectRatio.num, kAspectRatio.den, |
+ kVideoFormat, kCodedSize, kVisibleRect, kNaturalSize, |
NULL, 0, true); |
} |
@@ -247,7 +246,6 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_UnsupportedDecoder) { |
VideoDecoderConfig config(kUnknownVideoCodec, VIDEO_CODEC_PROFILE_UNKNOWN, |
kVideoFormat, |
kCodedSize, kVisibleRect, |
- kAspectRatio.num, kAspectRatio.den, |
NULL, 0); |
InitializeWithConfigAndStatus(config, PIPELINE_ERROR_DECODE); |
} |
@@ -257,7 +255,6 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_UnsupportedPixelFormat) { |
VideoDecoderConfig config(kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN, |
VideoFrame::INVALID, |
kCodedSize, kVisibleRect, |
- kAspectRatio.num, kAspectRatio.den, |
NULL, 0); |
InitializeWithConfigAndStatus(config, PIPELINE_ERROR_DECODE); |
} |
@@ -267,7 +264,6 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_OpenDecoderFails) { |
VideoDecoderConfig config(kCodecTheora, VIDEO_CODEC_PROFILE_UNKNOWN, |
kVideoFormat, |
kCodedSize, kVisibleRect, |
- kAspectRatio.num, kAspectRatio.den, |
NULL, 0); |
InitializeWithConfigAndStatus(config, PIPELINE_ERROR_DECODE); |
} |