diff options
| author | rileya@chromium.org <rileya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-01 13:08:00 +0000 |
|---|---|---|
| committer | rileya@chromium.org <rileya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-01 13:08:00 +0000 |
| commit | 956d9ef3e58d85771c18620a1fdf1ca54e16c150 (patch) | |
| tree | 82437279f1f44e27f8f7136d1494794d28a0616b /media/filters | |
| parent | d6ec84afaa637fb057ad1cbf5a7c03b02b6a456c (diff) | |
| download | chromium_src-956d9ef3e58d85771c18620a1fdf1ca54e16c150.zip chromium_src-956d9ef3e58d85771c18620a1fdf1ca54e16c150.tar.gz chromium_src-956d9ef3e58d85771c18620a1fdf1ca54e16c150.tar.bz2 | |
Replace VideoFrame::INVALID with UNKNOWN.
INVALID was misleading: the usage has more to do with the format being unknown at the time, rather than being invalid.
BUG=313827
TBR=danakj
Review URL: https://codereview.chromium.org/51343005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/filters')
| -rw-r--r-- | media/filters/ffmpeg_video_decoder.cc | 2 | ||||
| -rw-r--r-- | media/filters/ffmpeg_video_decoder_unittest.cc | 2 | ||||
| -rw-r--r-- | media/filters/pipeline_integration_test_base.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc index 5dfb344..78b9b28 100644 --- a/media/filters/ffmpeg_video_decoder.cc +++ b/media/filters/ffmpeg_video_decoder.cc @@ -69,7 +69,7 @@ int FFmpegVideoDecoder::GetVideoBuffer(AVCodecContext* codec_context, // updated width/height/pix_fmt, which can change for adaptive // content. VideoFrame::Format format = PixelFormatToVideoFormat(codec_context->pix_fmt); - if (format == VideoFrame::INVALID) + if (format == VideoFrame::UNKNOWN) return AVERROR(EINVAL); DCHECK(format == VideoFrame::YV12 || format == VideoFrame::YV16); diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc index 23ee196..13bec96 100644 --- a/media/filters/ffmpeg_video_decoder_unittest.cc +++ b/media/filters/ffmpeg_video_decoder_unittest.cc @@ -253,7 +253,7 @@ 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, - VideoFrame::INVALID, + VideoFrame::UNKNOWN, kCodedSize, kVisibleRect, kNaturalSize, NULL, 0, false); InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED); diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc index 3591849..6e03647 100644 --- a/media/filters/pipeline_integration_test_base.cc +++ b/media/filters/pipeline_integration_test_base.cc @@ -31,7 +31,7 @@ PipelineIntegrationTestBase::PipelineIntegrationTestBase() new MediaLog())), ended_(false), pipeline_status_(PIPELINE_OK), - last_video_frame_format_(VideoFrame::INVALID) { + last_video_frame_format_(VideoFrame::UNKNOWN) { base::MD5Init(&md5_context_); EXPECT_CALL(*this, OnSetOpaque(true)).Times(AnyNumber()); } |