Roll FFMpeg for M22.

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 124 matching lines @@
                  DEMUXER_ERROR_COULD_NOT_OPEN, kNullHash, kNullHash);
 FFMPEG_TEST_CASE(Cr123481, "security/123481.ogv", PIPELINE_OK,
                  PIPELINE_OK, "e6dd853fcbd746c8bb2ab2b8fc376fc7",
                  "da909399f17e8f8ad7f1fcb3c4ccc33a");
 FFMPEG_TEST_CASE(Cr132779, "security/132779.webm",
                  DEMUXER_ERROR_COULD_NOT_PARSE, DEMUXER_ERROR_COULD_NOT_PARSE,
                  kNullHash, kNullHash);
 
 // General MKV test cases.
 FFMPEG_TEST_CASE(MKV_0, "security/nested_tags_lang.mka.627.628", PIPELINE_OK,
-                 PIPELINE_OK, kNullHash, "29b9dd707e75eb0a8cf29ec6213fd8c8");
+                 PIPELINE_ERROR_DECODE, kNullHash,
+                 "abc9702fc46f49d6f26da5c62d118cf7");

[scherkus (not reviewing), 2012/07/28 21:31:58]

what's going on with these two?

[DaleCurtis, 2012/07/28 22:02:21]

My guess is upstream tightened decoder compliance. These are both invalid files
and have never played well, now they throws an explicit error which is good.

Per rbultje decoded output isn't guaranteed under error, so the hashes are
really just to help me track what's changing in the event we _don't_ get an
error code.

 FFMPEG_TEST_CASE(MKV_1, "security/nested_tags_lang.mka.667.628", PIPELINE_OK,
-                 PIPELINE_OK, kNullHash, "117643fcab3ef06461c769686d05ccfb");
+                 PIPELINE_ERROR_DECODE, kNullHash,
+                 "414669ce405e681bda578f90c6c08951");
 
 // General MP4 test cases.
 FFMPEG_TEST_CASE(MP4_0, "security/aac.10419.mp4", PIPELINE_OK, PIPELINE_OK,
                  kNullHash, kNullHash);
 FFMPEG_TEST_CASE(MP4_1, "security/clockh264aac_200021889.mp4",
                  DEMUXER_ERROR_COULD_NOT_OPEN, DEMUXER_ERROR_COULD_NOT_OPEN,
                  kNullHash, kNullHash);
 FFMPEG_TEST_CASE(MP4_2, "security/clockh264aac_200701257.mp4", PIPELINE_OK,
                  PIPELINE_OK, kNullHash, "d8bee104916f9f10db767d13400296b6");
 FFMPEG_TEST_CASE(MP4_5, "security/clockh264aac_3022500.mp4",
                  DEMUXER_ERROR_NO_SUPPORTED_STREAMS,
                  DEMUXER_ERROR_NO_SUPPORTED_STREAMS, kNullHash, kNullHash);
 FFMPEG_TEST_CASE(MP4_6, "security/clockh264aac_344289.mp4", PIPELINE_OK,
                  PIPELINE_OK, kNullHash, kNullHash);
 FFMPEG_TEST_CASE(MP4_7, "security/clockh264mp3_187697.mp4",
                  DEMUXER_ERROR_NO_SUPPORTED_STREAMS,
                  DEMUXER_ERROR_NO_SUPPORTED_STREAMS,
                  kNullHash, kNullHash);
 FFMPEG_TEST_CASE(MP4_8, "security/h264.705767.mp4",
                  DEMUXER_ERROR_COULD_NOT_PARSE, DEMUXER_ERROR_COULD_NOT_PARSE,
                  kNullHash, kNullHash);
 FFMPEG_TEST_CASE(MP4_9, "security/smclockmp4aac_1_0.mp4",
                  DEMUXER_ERROR_COULD_NOT_OPEN, DEMUXER_ERROR_COULD_NOT_OPEN,
                  kNullHash, kNullHash);
-FFMPEG_TEST_CASE(MP4_10, "security/null1.m4a", PIPELINE_OK, PIPELINE_OK,
-                 kNullHash, "287b6f06b6b45ac9e2839f4f397036af");
 FFMPEG_TEST_CASE(MP4_11, "security/null1.mp4", PIPELINE_OK, PIPELINE_OK,
                  kNullHash, "f20676c5de9b3c7c174c141762afb957");
 FFMPEG_TEST_CASE(MP4_16, "security/looping2.mov",
                  DEMUXER_ERROR_COULD_NOT_OPEN, DEMUXER_ERROR_COULD_NOT_OPEN,
                  kNullHash, kNullHash);
 
 // General OGV test cases.
 FFMPEG_TEST_CASE(OGV_1, "security/out.163.ogv", DECODER_ERROR_NOT_SUPPORTED,
                  DECODER_ERROR_NOT_SUPPORTED, kNullHash, kNullHash);
 FFMPEG_TEST_CASE(OGV_2, "security/out.391.ogv", DECODER_ERROR_NOT_SUPPORTED,
@@ skipping 101 matching lines @@
 // Allocate gigabytes of memory, likely can't be run on 32bit machines.
 FFMPEG_TEST_CASE(BIG_MEM_1, "security/bigmem1.mov",
                  DEMUXER_ERROR_COULD_NOT_OPEN, DEMUXER_ERROR_COULD_NOT_OPEN,
                  kNullHash, kNullHash);
 FFMPEG_TEST_CASE(BIG_MEM_2, "security/looping1.mov",
                  DEMUXER_ERROR_COULD_NOT_PARSE, DEMUXER_ERROR_COULD_NOT_PARSE,
                  kNullHash, kNullHash);
 FFMPEG_TEST_CASE(BIG_MEM_5, "security/looping5.mov",
                  DEMUXER_ERROR_COULD_NOT_PARSE, DEMUXER_ERROR_COULD_NOT_PARSE,
                  kNullHash, kNullHash);
+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(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");
-FLAKY_FFMPEG_TEST_CASE(BIG_MEM_3, "security/looping3.mov");
-FLAKY_FFMPEG_TEST_CASE(BIG_MEM_4, "security/looping4.mov");
+// Not really flaky, but can't pass the seek test.
+FLAKY_FFMPEG_TEST_CASE(MP4_10, "security/null1.m4a");

[scherkus (not reviewing), 2012/07/28 21:31:58]

do we know why?

[DaleCurtis, 2012/07/28 22:02:21]

The test fails because after seek to zero we get a PIPELINE_ERROR_DECODE and the
test doesn't have a way to specify an after seek status that's different from
the initial status; which is required to be PIPELINE_OK to run the seek test.

I haven't looked closely beyond making sure loop worked with a valid m4a file. 
It's not a valid file, so the fact that it fails isn't surprising.  I'll take a
closer look on Monday.

Again though, this file has never played well and is not valid, so getting an
error is good.  What would be better is getting the error before the seek
though!

 
 // Videos with massive gaps between frame timestamps that result in long hangs
 // with our pipeline.  Should be uncommented when we support clockless playback.
 // FFMPEG_TEST_CASE(WEBM_0, "security/memcpy.webm", PIPELINE_OK, PIPELINE_OK,
 //                  kNullHash, kNullHash);
 // FFMPEG_TEST_CASE(MP4_17, "security/assert2.mov", PIPELINE_OK, PIPELINE_OK,
 //                  kNullHash, kNullHash);
 // FFMPEG_TEST_CASE(OGV_23, "security/assert2.ogv", PIPELINE_OK, PIPELINE_OK,
 //                  kNullHash, kNullHash);
 
@@ skipping 22 matching lines @@
 }
 
 TEST_P(FlakyFFmpegRegressionTest, BasicPlayback) {
   if (Start(GetTestDataURL(GetParam().filename))) {
     Play();
     WaitUntilEndedOrError();
   }
 }
 
 }  // namespace media