| 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 8d86dc11a0a3d9d6c630521c643dfcb63cfdc087..db4a761483242ba82e1f6b3393fc4d132a77fd3c 100644
|
| --- a/media/filters/ffmpeg_video_decoder_unittest.cc
|
| +++ b/media/filters/ffmpeg_video_decoder_unittest.cc
|
| @@ -223,15 +223,16 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_UnsupportedDecoder) {
|
| TEST_F(FFmpegVideoDecoderTest, Initialize_UnsupportedPixelFormat) {
|
| // Ensure decoder handles unsupported pixel formats without crashing.
|
| VideoDecoderConfig config(kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN,
|
| - PIXEL_FORMAT_UNKNOWN, kCodedSize, kVisibleRect,
|
| - kNaturalSize, NULL, 0, false);
|
| + PIXEL_FORMAT_UNKNOWN, COLOR_SPACE_UNSPECIFIED,
|
| + kCodedSize, kVisibleRect, kNaturalSize, NULL, 0,
|
| + false);
|
| InitializeWithConfigWithResult(config, false);
|
| }
|
|
|
| TEST_F(FFmpegVideoDecoderTest, Initialize_OpenDecoderFails) {
|
| // Specify Theora w/o extra data so that avcodec_open2() fails.
|
| VideoDecoderConfig config(kCodecTheora, VIDEO_CODEC_PROFILE_UNKNOWN,
|
| - kVideoFormat,
|
| + kVideoFormat, COLOR_SPACE_UNSPECIFIED,
|
| kCodedSize, kVisibleRect, kNaturalSize,
|
| NULL, 0, false);
|
| InitializeWithConfigWithResult(config, false);
|
| @@ -242,6 +243,7 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioNumeratorZero) {
|
| VideoDecoderConfig config(kCodecVP8,
|
| VP8PROFILE_ANY,
|
| kVideoFormat,
|
| + COLOR_SPACE_UNSPECIFIED,
|
| kCodedSize,
|
| kVisibleRect,
|
| natural_size,
|
| @@ -256,6 +258,7 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioDenominatorZero) {
|
| VideoDecoderConfig config(kCodecVP8,
|
| VP8PROFILE_ANY,
|
| kVideoFormat,
|
| + COLOR_SPACE_UNSPECIFIED,
|
| kCodedSize,
|
| kVisibleRect,
|
| natural_size,
|
| @@ -270,6 +273,7 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioNumeratorNegative) {
|
| VideoDecoderConfig config(kCodecVP8,
|
| VP8PROFILE_ANY,
|
| kVideoFormat,
|
| + COLOR_SPACE_UNSPECIFIED,
|
| kCodedSize,
|
| kVisibleRect,
|
| natural_size,
|
| @@ -284,6 +288,7 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioDenominatorNegative) {
|
| VideoDecoderConfig config(kCodecVP8,
|
| VP8PROFILE_ANY,
|
| kVideoFormat,
|
| + COLOR_SPACE_UNSPECIFIED,
|
| kCodedSize,
|
| kVisibleRect,
|
| natural_size,
|
| @@ -300,6 +305,7 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioNumeratorTooLarge) {
|
| VideoDecoderConfig config(kCodecVP8,
|
| VP8PROFILE_ANY,
|
| kVideoFormat,
|
| + COLOR_SPACE_UNSPECIFIED,
|
| kCodedSize,
|
| kVisibleRect,
|
| natural_size,
|
| @@ -315,6 +321,7 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioDenominatorTooLarge) {
|
| VideoDecoderConfig config(kCodecVP8,
|
| VP8PROFILE_ANY,
|
| kVideoFormat,
|
| + COLOR_SPACE_UNSPECIFIED,
|
| kCodedSize,
|
| kVisibleRect,
|
| natural_size,
|
|
|