Merge 268831 "Replicate FFmpeg's video frame allocation strategy."

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:
@@ skipping 305 matching lines @@
                  kNullVideoHash, kNullAudioHash);
 FLAKY_FFMPEG_TEST_CASE(BIG_MEM_3, "security/looping3.mov");
 FLAKY_FFMPEG_TEST_CASE(BIG_MEM_4, "security/looping4.mov");
 
 // Flaky under threading or for other reasons.  Per rbultje, most of these will
 // never be reliable since FFmpeg does not guarantee consistency in error cases.
 // We only really care that these don't cause crashes or errors under tooling.
 FLAKY_FFMPEG_TEST_CASE(Cr99652, "security/99652.webm");
 FLAKY_FFMPEG_TEST_CASE(Cr100464, "security/100464.webm");
 FLAKY_FFMPEG_TEST_CASE(Cr111342, "security/111342.ogm");
+FLAKY_FFMPEG_TEST_CASE(Cr368980, "security/368980.mp4");
 FLAKY_FFMPEG_TEST_CASE(OGV_0, "security/big_dims.ogv");
 FLAKY_FFMPEG_TEST_CASE(OGV_3, "security/smclock_1_0.ogv");
 FLAKY_FFMPEG_TEST_CASE(OGV_4, "security/smclock.ogv.1.0.ogv");
 FLAKY_FFMPEG_TEST_CASE(OGV_6, "security/smclocktheora_1_10000.ogv");
 FLAKY_FFMPEG_TEST_CASE(OGV_13, "security/smclocktheora_1_790.ogv");
 FLAKY_FFMPEG_TEST_CASE(MP4_3, "security/clockh264aac_300413969.mp4");
 FLAKY_FFMPEG_TEST_CASE(MP4_4, "security/clockh264aac_301350139.mp4");
 FLAKY_FFMPEG_TEST_CASE(MP4_12, "security/assert1.mov");
 // Not really flaky, but can't pass the seek test.
 FLAKY_FFMPEG_TEST_CASE(MP4_10, "security/null1.m4a");
@@ skipping 50 matching lines @@
 }
 
 TEST_P(FlakyFFmpegRegressionTest, BasicPlayback) {
   if (Start(GetTestDataFilePath(GetParam().filename))) {
     Play();
     WaitUntilEndedOrError();
   }
 }
 
 }  // namespace media