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 c3fde2700bdfbee02bf06b50a99a272c1d3fb310..18013bd3cc789dcf920a6f07fee61aad6043aafd 100644 |
--- a/media/filters/ffmpeg_video_decoder_unittest.cc |
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc |
@@ -242,37 +242,57 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_OpenDecoderFails) { |
TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioNumeratorZero) { |
gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), 0, 1); |
- VideoDecoderConfig config(kCodecVP8, VP8PROFILE_MAIN, |
+ VideoDecoderConfig config(kCodecVP8, |
+ VP8PROFILE_ANY, |
kVideoFormat, |
- kCodedSize, kVisibleRect, natural_size, |
- NULL, 0, false); |
+ kCodedSize, |
+ kVisibleRect, |
+ natural_size, |
+ NULL, |
+ 0, |
+ false); |
InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED); |
} |
TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioDenominatorZero) { |
gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), 1, 0); |
- VideoDecoderConfig config(kCodecVP8, VP8PROFILE_MAIN, |
+ VideoDecoderConfig config(kCodecVP8, |
+ VP8PROFILE_ANY, |
kVideoFormat, |
- kCodedSize, kVisibleRect, natural_size, |
- NULL, 0, false); |
+ kCodedSize, |
+ kVisibleRect, |
+ natural_size, |
+ NULL, |
+ 0, |
+ false); |
InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED); |
} |
TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioNumeratorNegative) { |
gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), -1, 1); |
- VideoDecoderConfig config(kCodecVP8, VP8PROFILE_MAIN, |
+ VideoDecoderConfig config(kCodecVP8, |
+ VP8PROFILE_ANY, |
kVideoFormat, |
- kCodedSize, kVisibleRect, natural_size, |
- NULL, 0, false); |
+ kCodedSize, |
+ kVisibleRect, |
+ natural_size, |
+ NULL, |
+ 0, |
+ false); |
InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED); |
} |
TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioDenominatorNegative) { |
gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), 1, -1); |
- VideoDecoderConfig config(kCodecVP8, VP8PROFILE_MAIN, |
+ VideoDecoderConfig config(kCodecVP8, |
+ VP8PROFILE_ANY, |
kVideoFormat, |
- kCodedSize, kVisibleRect, natural_size, |
- NULL, 0, false); |
+ kCodedSize, |
+ kVisibleRect, |
+ natural_size, |
+ NULL, |
+ 0, |
+ false); |
InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED); |
} |
@@ -280,20 +300,30 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioNumeratorTooLarge) { |
int width = kVisibleRect.size().width(); |
int num = ceil(static_cast<double>(limits::kMaxDimension + 1) / width); |
gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), num, 1); |
- VideoDecoderConfig config(kCodecVP8, VP8PROFILE_MAIN, |
+ VideoDecoderConfig config(kCodecVP8, |
+ VP8PROFILE_ANY, |
kVideoFormat, |
- kCodedSize, kVisibleRect, natural_size, |
- NULL, 0, false); |
+ kCodedSize, |
+ kVisibleRect, |
+ natural_size, |
+ NULL, |
+ 0, |
+ false); |
InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED); |
} |
TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioDenominatorTooLarge) { |
int den = kVisibleRect.size().width() + 1; |
gfx::Size natural_size = GetNaturalSize(kVisibleRect.size(), 1, den); |
- VideoDecoderConfig config(kCodecVP8, VP8PROFILE_MAIN, |
+ VideoDecoderConfig config(kCodecVP8, |
+ VP8PROFILE_ANY, |
kVideoFormat, |
- kCodedSize, kVisibleRect, natural_size, |
- NULL, 0, false); |
+ kCodedSize, |
+ kVisibleRect, |
+ natural_size, |
+ NULL, |
+ 0, |
+ false); |
InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED); |
} |