Roll DEPS for FFmpeg merge. Shuffle testing.

media/ffmpeg/ffmpeg_regression_tests.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Regression tests for FFmpeg.  Security test files can be found in the
 // internal media test data directory:
 //
 //    svn://svn.chromium.org/chrome-internal/trunk/data/media/security/
 //
 // Simply add the custom_dep below to your gclient and sync:
 //
 //    "src/media/test/data/security":
 //        "svn://chrome-svn/chrome-internal/trunk/data/media/security"
 //
 // Many of the files here do not cause issues outside of tooling, so you'll need
 // to run this test under ASAN, TSAN, and Valgrind to ensure that all issues are
 // caught.
 //
 // Test cases labeled FLAKY may not always pass, but they should never crash or
 // cause any kind of warnings or errors under tooling.
 //
 // Frame hashes must be generated with --video-threads=1 for correctness.
 //
 // Known issues:
 //    Cr47325 will generate an UninitValue error under Valgrind inside of the
 //    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"
 
 #include "base/bind.h"
 #include "media/base/test_data_util.h"
 #include "media/filters/chunk_demuxer_client.h"
 
 namespace media {
 
 struct RegressionTestData {
@@ skipping 19 matching lines @@
 #define FFMPEG_TEST_CASE(name, fn, init_status, end_status, md5) \
     INSTANTIATE_TEST_CASE_P(name, FFmpegRegressionTest, \
                             testing::Values(RegressionTestData(fn, \
                                                                init_status, \
                                                                end_status, \
                                                                md5)));
 
 // 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,
                  DECODER_ERROR_NOT_SUPPORTED, kNullVideoHash);
 FFMPEG_TEST_CASE(Cr100543, "security/100543.webm", PIPELINE_OK, PIPELINE_OK,
                  "c16691cc9178db3adbf7e562cadcd6e6");
 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", DEMUXER_ERROR_COULD_NOT_PARSE,
-                 DEMUXER_ERROR_COULD_NOT_PARSE, kNullVideoHash);
+FFMPEG_TEST_CASE(Cr110849, "security/110849.mkv", DECODER_ERROR_NOT_SUPPORTED,
+                 DECODER_ERROR_NOT_SUPPORTED, kNullVideoHash);
 FFMPEG_TEST_CASE(Cr112384, "security/112384.webm",
                  DEMUXER_ERROR_COULD_NOT_PARSE, DEMUXER_ERROR_COULD_NOT_PARSE,
                  kNullVideoHash);
 FFMPEG_TEST_CASE(Cr112670, "security/112670.mp4", PIPELINE_ERROR_DECODE,
                  PIPELINE_ERROR_DECODE, kNullVideoHash);
 FFMPEG_TEST_CASE(Cr112976, "security/112976.ogg", PIPELINE_OK, PIPELINE_OK,
                  kNullVideoHash);
 FFMPEG_TEST_CASE(Cr116927, "security/116927.ogv", PIPELINE_ERROR_DECODE,
                  PIPELINE_ERROR_DECODE, kNullVideoHash);
 FFMPEG_TEST_CASE(Cr123481, "security/123481.ogv", PIPELINE_OK,
@@ skipping 11 matching lines @@
 FFMPEG_TEST_CASE(MP4_1, "security/clockh264aac_200021889.mp4",
                  DEMUXER_ERROR_COULD_NOT_OPEN, DEMUXER_ERROR_COULD_NOT_OPEN,
                  kNullVideoHash);
 FFMPEG_TEST_CASE(MP4_2, "security/clockh264aac_200701257.mp4", PIPELINE_OK,
                  PIPELINE_OK, kNullVideoHash);
 FFMPEG_TEST_CASE(MP4_5, "security/clockh264aac_3022500.mp4",
                  DEMUXER_ERROR_NO_SUPPORTED_STREAMS,
                  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", 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_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_9, "security/smclockmp4aac_1_0.mp4",
                  DEMUXER_ERROR_COULD_NOT_OPEN, DEMUXER_ERROR_COULD_NOT_OPEN,
                  kNullVideoHash);
 
 // General OGV test cases.
 FFMPEG_TEST_CASE(OGV_1, "security/out.163.ogv", DECODER_ERROR_NOT_SUPPORTED,
                  DECODER_ERROR_NOT_SUPPORTED, kNullVideoHash);
 FFMPEG_TEST_CASE(OGV_2, "security/out.391.ogv", DECODER_ERROR_NOT_SUPPORTED,
                  DECODER_ERROR_NOT_SUPPORTED, kNullVideoHash);
 FFMPEG_TEST_CASE(OGV_5, "security/smclocktheora_1_0.ogv",
@@ skipping 92 matching lines @@
       Seek(base::TimeDelta::FromMilliseconds(0));
     }
   } else {
     ASSERT_FALSE(Start(GetTestDataURL(GetParam().filename),
                        GetParam().init_status));
     ASSERT_EQ(GetVideoHash(), GetParam().md5);
   }
 }
 
 }  // namespace media