diff options
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | media/ffmpeg/ffmpeg_regression_tests.cc | 25 | ||||
| -rw-r--r-- | media/ffmpeg/ffmpeg_unittest.cc | 5 |
3 files changed, 13 insertions, 21 deletions
@@ -48,8 +48,8 @@ vars = { # These two FFmpeg variables must be updated together. One is used for SVN # checkouts and the other for Git checkouts. - "ffmpeg_revision": "133551", - "ffmpeg_hash": "f8d71c394e071249f26703669baf1093009620d7", + "ffmpeg_revision": "132717", + "ffmpeg_hash": "69a5a2e6784b5e46326acecf6d5697b63d639ca9", "sfntly_revision": "128", "skia_revision": "3767", diff --git a/media/ffmpeg/ffmpeg_regression_tests.cc b/media/ffmpeg/ffmpeg_regression_tests.cc index 98690af..44f2645 100644 --- a/media/ffmpeg/ffmpeg_regression_tests.cc +++ b/media/ffmpeg/ffmpeg_regression_tests.cc @@ -26,11 +26,6 @@ // MD5 hashing code. The error occurs due to some problematic error // resilence code for H264 inside of FFmpeg. See http://crbug.com/119020 // -// FLAKY_OGV_0 may run out of memory under ASAN on IA32 Linux/Mac. -// -// Some OGG files leak ~30 bytes of memory, upstream tracking bug: -// https://ffmpeg.org/trac/ffmpeg/ticket/1244 -// #include "media/filters/pipeline_integration_test_base.h" @@ -70,12 +65,6 @@ class FFmpegRegressionTest // Test cases from issues. FFMPEG_TEST_CASE(Cr47325, "security/47325.mp4", PIPELINE_OK, PIPELINE_OK, "2a7a938c6b5979621cec998f02d9bbb6"); -FFMPEG_TEST_CASE(Cr47761, "content/crbug47761.ogg", PIPELINE_OK, PIPELINE_OK, - kNullVideoHash); -FFMPEG_TEST_CASE(Cr50045, "content/crbug50045.mp4", PIPELINE_OK, PIPELINE_OK, - "c345e9ef9ebfc6bfbcbe3f0ddc3125ba"); -FFMPEG_TEST_CASE(Cr62127, "content/crbug62127.webm", PIPELINE_OK, PIPELINE_OK, - "a064b2776fc5aef3e9cba47967a75db9"); FFMPEG_TEST_CASE(Cr93620, "security/93620.ogg", PIPELINE_OK, PIPELINE_OK, kNullVideoHash); FFMPEG_TEST_CASE(Cr100492, "security/100492.webm", DECODER_ERROR_NOT_SUPPORTED, @@ -86,8 +75,8 @@ FFMPEG_TEST_CASE(Cr101458, "security/101458.webm", DECODER_ERROR_NOT_SUPPORTED, DECODER_ERROR_NOT_SUPPORTED, kNullVideoHash); FFMPEG_TEST_CASE(Cr108416, "security/108416.webm", PIPELINE_OK, PIPELINE_OK, "5cb3a934795cd552753dec7687928291"); -FFMPEG_TEST_CASE(Cr110849, "security/110849.mkv", DECODER_ERROR_NOT_SUPPORTED, - DECODER_ERROR_NOT_SUPPORTED, kNullVideoHash); +FFMPEG_TEST_CASE(Cr110849, "security/110849.mkv", DEMUXER_ERROR_COULD_NOT_PARSE, + DEMUXER_ERROR_COULD_NOT_PARSE, kNullVideoHash); FFMPEG_TEST_CASE(Cr112384, "security/112384.webm", DEMUXER_ERROR_COULD_NOT_PARSE, DEMUXER_ERROR_COULD_NOT_PARSE, kNullVideoHash); @@ -119,12 +108,10 @@ FFMPEG_TEST_CASE(MP4_5, "security/clockh264aac_3022500.mp4", DEMUXER_ERROR_NO_SUPPORTED_STREAMS, kNullVideoHash); FFMPEG_TEST_CASE(MP4_6, "security/clockh264aac_344289.mp4", PIPELINE_OK, PIPELINE_OK, kNullVideoHash); -FFMPEG_TEST_CASE(MP4_7, "security/clockh264mp3_187697.mp4", - DECODER_ERROR_NOT_SUPPORTED, DECODER_ERROR_NOT_SUPPORTED, - kNullVideoHash); -FFMPEG_TEST_CASE(MP4_8, "security/h264.705767.mp4", - DEMUXER_ERROR_COULD_NOT_PARSE, DEMUXER_ERROR_COULD_NOT_PARSE, - kNullVideoHash); +FFMPEG_TEST_CASE(MP4_7, "security/clockh264mp3_187697.mp4", PIPELINE_OK, + PIPELINE_OK, kNullVideoHash); +FFMPEG_TEST_CASE(MP4_8, "security/h264.705767.mp4", PIPELINE_ERROR_DECODE, + PIPELINE_ERROR_DECODE, kNullVideoHash); FFMPEG_TEST_CASE(MP4_9, "security/smclockmp4aac_1_0.mp4", DEMUXER_ERROR_COULD_NOT_OPEN, DEMUXER_ERROR_COULD_NOT_OPEN, kNullVideoHash); diff --git a/media/ffmpeg/ffmpeg_unittest.cc b/media/ffmpeg/ffmpeg_unittest.cc index 442a57c..607fc97 100644 --- a/media/ffmpeg/ffmpeg_unittest.cc +++ b/media/ffmpeg/ffmpeg_unittest.cc @@ -460,6 +460,11 @@ FFMPEG_TEST_CASE(sync2, webm); // Covers our LayoutTest file. FFMPEG_TEST_CASE(counting, ogv); +// The following are bugs reported by users. +FFMPEG_TEST_CASE(crbug47761, ogg); +FFMPEG_TEST_CASE(crbug50045, mp4); +FFMPEG_TEST_CASE(crbug62127, webm); + TEST_P(FFmpegTest, Perf) { { PerfTimeLogger timer("Opening file"); |