media/filters/ffmpeg_video_decoder_unittest.cc - Issue 1221903003: Change the video color space default.

Unified Diff: media/filters/ffmpeg_video_decoder_unittest.cc

Issue 1221903003: Change the video color space default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Disable the JPEG blackwhite test Created 5 years, 5 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

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 8ecc83deca0bda3ad4879b1cfb45e4285be9e660..271ce418b00723129ea9c0c0cdb7bc3ae0e87d93 100644

--- a/media/filters/ffmpeg_video_decoder_unittest.cc

+++ b/media/filters/ffmpeg_video_decoder_unittest.cc

@@ -224,15 +224,15 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_UnsupportedPixelFormat) {

// Ensure decoder handles unsupported pixel formats without crashing.

VideoDecoderConfig config(kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN,

VideoFrame::UNKNOWN,

- kCodedSize, kVisibleRect, kNaturalSize,

- NULL, 0, false);

+ VideoFrame::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, VideoFrame::COLOR_SPACE_UNSPECIFIED,

kCodedSize, kVisibleRect, kNaturalSize,

NULL, 0, false);

InitializeWithConfigWithResult(config, false);

@@ -243,6 +243,7 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioNumeratorZero) {

VideoDecoderConfig config(kCodecVP8,

VP8PROFILE_ANY,

kVideoFormat,

+ VideoFrame::COLOR_SPACE_UNSPECIFIED,

kCodedSize,

kVisibleRect,

natural_size,

@@ -257,6 +258,7 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioDenominatorZero) {

VideoDecoderConfig config(kCodecVP8,

VP8PROFILE_ANY,

kVideoFormat,

+ VideoFrame::COLOR_SPACE_UNSPECIFIED,

kCodedSize,

kVisibleRect,

natural_size,

@@ -271,6 +273,7 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioNumeratorNegative) {

VideoDecoderConfig config(kCodecVP8,

VP8PROFILE_ANY,

kVideoFormat,

+ VideoFrame::COLOR_SPACE_UNSPECIFIED,

kCodedSize,

kVisibleRect,

natural_size,

@@ -285,6 +288,7 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioDenominatorNegative) {

VideoDecoderConfig config(kCodecVP8,

VP8PROFILE_ANY,

kVideoFormat,

+ VideoFrame::COLOR_SPACE_UNSPECIFIED,

kCodedSize,

kVisibleRect,

natural_size,

@@ -301,6 +305,7 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioNumeratorTooLarge) {

VideoDecoderConfig config(kCodecVP8,

VP8PROFILE_ANY,

kVideoFormat,

+ VideoFrame::COLOR_SPACE_UNSPECIFIED,

kCodedSize,

kVisibleRect,

natural_size,

@@ -316,6 +321,7 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioDenominatorTooLarge) {

VideoDecoderConfig config(kCodecVP8,

VP8PROFILE_ANY,

kVideoFormat,

+ VideoFrame::COLOR_SPACE_UNSPECIFIED,

kCodedSize,

kVisibleRect,

natural_size,

« media/base/video_decoder_config.cc ('K') | « media/filters/ffmpeg_video_decoder.cc ('k') | media/filters/vpx_video_decoder.cc » ('j') | no next file with comments »