diff options
| author | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 19:45:58 +0000 |
|---|---|---|
| committer | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 19:45:58 +0000 |
| commit | ffe42a533122f6e981339e0c26fbc3447b68528b (patch) | |
| tree | b2acf12f741568864e39e5caabe2f7c0948075ad | |
| parent | 57aefefa48bc5a9b1cb57c15e6e8cd2465358200 (diff) | |
| download | chromium_src-ffe42a533122f6e981339e0c26fbc3447b68528b.zip chromium_src-ffe42a533122f6e981339e0c26fbc3447b68528b.tar.gz chromium_src-ffe42a533122f6e981339e0c26fbc3447b68528b.tar.bz2 | |
Merge 108338 - Fix crash on unsupported pixel formats.
Replaces the NOTREACHED() calls with DLOG(WARNING), avoids creating
frames when invalid pixel formats are detected, and finally calls
OnInitializeComplete(false) in FFmpegVideoDecodeEngine::Initialize.
BUG=101803
TEST=Ran unittests. Ran test video.
Review URL: http://codereview.chromium.org/8437021
TBR=dalecurtis@chromium.org
Review URL: http://codereview.chromium.org/8437101
git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108524 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | media/video/ffmpeg_video_decode_engine_unittest.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/media/video/ffmpeg_video_decode_engine_unittest.cc b/media/video/ffmpeg_video_decode_engine_unittest.cc index 5e04cc9..0dab545 100644 --- a/media/video/ffmpeg_video_decode_engine_unittest.cc +++ b/media/video/ffmpeg_video_decode_engine_unittest.cc @@ -168,7 +168,6 @@ TEST_F(FFmpegVideoDecodeEngineTest, Initialize_UnsupportedPixelFormat) { VideoDecoderConfig config(kCodecVP8, VideoFrame::INVALID, kCodedSize, kVisibleRect, kFrameRate.num, kFrameRate.den, - kAspectRatio.num, kAspectRatio.den, NULL, 0); EXPECT_CALL(*this, OnInitializeComplete(false)); test_engine_->Initialize(this, config); |