summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authoracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-10 23:20:59 +0000
committeracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-10 23:20:59 +0000
commitcc4ecdf5001345d375e34f7430bbca42988d057f (patch)
treeaa54d443df0e49169014f7e2835ccba0a9e744c0 /media
parentee06617d1e7e2486c04e62e945e88b23e3fdfcc8 (diff)
downloadchromium_src-cc4ecdf5001345d375e34f7430bbca42988d057f.zip
chromium_src-cc4ecdf5001345d375e34f7430bbca42988d057f.tar.gz
chromium_src-cc4ecdf5001345d375e34f7430bbca42988d057f.tar.bz2
Reenable frame size change unit tests.
BUG=102789 TEST=FFmpegVideoDecoderTest.DecodeFrame_LargerHeight, FFmpegVideoDecoderTest.DecodeFrame_LargerWidth Review URL: http://codereview.chromium.org/8526004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109533 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/filters/ffmpeg_video_decoder_unittest.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc
index ed36a47..80ba79c 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -361,9 +361,7 @@ TEST_F(FFmpegVideoDecoderTest, DecodeFrame_DecodeErrorAtEndOfStream) {
// Decode |i_frame_buffer_| and then a frame with a larger width and verify
// the output size was adjusted.
-//
-// TODO(acolwell): Fix InvalidRead detected by Valgrind http://crbug.com/102789
-TEST_F(FFmpegVideoDecoderTest, DISABLED_DecodeFrame_LargerWidth) {
+TEST_F(FFmpegVideoDecoderTest, DecodeFrame_LargerWidth) {
DecodeIFrameThenTestFile("vp8-I-frame-640x240", 640, 240);
}
@@ -375,9 +373,7 @@ TEST_F(FFmpegVideoDecoderTest, DecodeFrame_SmallerWidth) {
// Decode |i_frame_buffer_| and then a frame with a larger height and verify
// the output size was adjusted.
-//
-// TODO(acolwell): Fix InvalidRead detected by Valgrind http://crbug.com/102789
-TEST_F(FFmpegVideoDecoderTest, DISABLED_DecodeFrame_LargerHeight) {
+TEST_F(FFmpegVideoDecoderTest, DecodeFrame_LargerHeight) {
DecodeIFrameThenTestFile("vp8-I-frame-320x480", 320, 480);
}