Add ffmpeg regression tests for multiple issues from M56 roll

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.  Test files can be found in the internal media
 // test data directory:
 //
 //    https://chrome-internal.googlesource.com/chrome/data/media
 //
 // Simply add the custom_dep below to your gclient and sync:
@@ skipping 13 matching lines @@
 #include "base/bind.h"
 #include "media/test/pipeline_integration_test_base.h"
 
 namespace media {
 
 const char kRegressionTestDataPathPrefix[] = "internal/";
 
 struct RegressionTestData {
   RegressionTestData(const char* filename,
                      PipelineStatus init_status,
-                     PipelineStatus end_status)
+                     PipelineStatus end_status,
+                     base::TimeDelta seek_time)
       : filename(std::string(kRegressionTestDataPathPrefix) + filename),
         init_status(init_status),
-        end_status(end_status) {}
+        end_status(end_status),
+        seek_time(seek_time) {}
 
   std::string filename;
   PipelineStatus init_status;
   PipelineStatus end_status;
+  base::TimeDelta seek_time;
 };
 
 // Used for tests which just need to run without crashing or tooling errors, but
 // which may have undefined PipelineStatus results.
 struct FlakyRegressionTestData {
   FlakyRegressionTestData(const char* filename)
       : filename(std::string(kRegressionTestDataPathPrefix) + filename) {
   }
 
   std::string filename;
 };
 
 class FFmpegRegressionTest
     : public testing::TestWithParam<RegressionTestData>,
       public PipelineIntegrationTestBase {
 };
 
 class FlakyFFmpegRegressionTest
     : public testing::TestWithParam<FlakyRegressionTestData>,
       public PipelineIntegrationTestBase {
 };
 
+#define FFMPEG_TEST_CASE_SEEKING(name, fn, init_status, end_status, seek_time) \
+  INSTANTIATE_TEST_CASE_P(name, FFmpegRegressionTest,                          \
+                          testing::Values(RegressionTestData(                  \
+                              fn, init_status, end_status, seek_time)));
+
 #define FFMPEG_TEST_CASE(name, fn, init_status, end_status) \
-  INSTANTIATE_TEST_CASE_P(                                  \
-      name, FFmpegRegressionTest,                           \
-      testing::Values(RegressionTestData(fn, init_status, end_status)));
+  FFMPEG_TEST_CASE_SEEKING(name, fn, init_status, end_status, base::TimeDelta())

[chcunningham, 2016/12/08 18:34:24]

I'm wondering about the base::TimeDelta() default. It may have been that
GetStartTime() was non-zero for tests before this change, and I think that
*might* be important for some regressions to repro? Maybe the safer thing is to
default to kNoTimestamp() and then use GetStartTime() in the tests if no real
seek time is provided.

[wolenetz, 2016/12/08 19:12:52]

Good catch! I'll change to default of kNoTimeStamp as a signal for the test to
use GetStartTime() at runtime, if it reaches that far in the test. And I'll add
some comments about this.

[wolenetz, 2016/12/08 19:36:49]

Done.

 
 #define FLAKY_FFMPEG_TEST_CASE(name, fn) \
     INSTANTIATE_TEST_CASE_P(FLAKY_##name, FlakyFFmpegRegressionTest, \
                             testing::Values(FlakyRegressionTestData(fn)));
 
 // Test cases from issues.
 FFMPEG_TEST_CASE(Cr47325, "security/47325.mp4", PIPELINE_OK, PIPELINE_OK);
 FFMPEG_TEST_CASE(Cr47761, "crbug47761.ogg", PIPELINE_OK, PIPELINE_OK);
 FFMPEG_TEST_CASE(Cr50045, "crbug50045.mp4", PIPELINE_OK, PIPELINE_OK);
 FFMPEG_TEST_CASE(Cr62127, "crbug62127.webm", PIPELINE_OK, PIPELINE_OK);
@@ skipping 86 matching lines @@
                  PIPELINE_OK,
                  PIPELINE_ERROR_DECODE);
 // TODO(liberato): before crbug.com/658440 was fixed, this would fail if run
 // twice under ASAN.  If run once, then it doesn't.  However, it still catches
 // issues in crbug.com/662118, so it's included anyway.
 FFMPEG_TEST_CASE(Cr658440, "security/658440.flac", PIPELINE_OK, PIPELINE_OK);
 FFMPEG_TEST_CASE(Cr665305,
                  "crbug665305.flac",
                  PIPELINE_OK,
                  PIPELINE_ERROR_DECODE);
+FFMPEG_TEST_CASE_SEEKING(Cr666770,
+                         "security/666770.mp4",
+                         PIPELINE_OK,
+                         PIPELINE_OK,
+                         base::TimeDelta::FromSecondsD(0.0843));
+FFMPEG_TEST_CASE(Cr666874,
+                 "security/666874.mp3",
+                 DEMUXER_ERROR_COULD_NOT_OPEN,
+                 DEMUXER_ERROR_COULD_NOT_OPEN);
+FFMPEG_TEST_CASE(Cr667063, "security/667063.mp4", PIPELINE_OK, PIPELINE_OK);
 
 // General MP4 test cases.
 FFMPEG_TEST_CASE(MP4_0,
                  "security/aac.10419.mp4",
                  DEMUXER_ERROR_COULD_NOT_OPEN,
                  DEMUXER_ERROR_COULD_NOT_OPEN);
 FFMPEG_TEST_CASE(MP4_1,
                  "security/clockh264aac_200021889.mp4",
                  DEMUXER_ERROR_COULD_NOT_OPEN,
                  DEMUXER_ERROR_COULD_NOT_OPEN);
@@ skipping 155 matching lines @@
 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(WEBM_3, "security/out.webm.139771.2965");
 
+// Init status flakes between PIPELINE_OK and PIPELINE_ERROR_DECODE, and gives
+// PIPELINE_ERROR_DECODE later if initialization was PIPELINE_OK.
+FLAKY_FFMPEG_TEST_CASE(Cr666794, "security/666794.webm");
+
 // Not really flaky, but can't pass the seek test.
 FLAKY_FFMPEG_TEST_CASE(MP4_10, "security/null1.m4a");
 FLAKY_FFMPEG_TEST_CASE(Cr112670, "security/112670.mp4");
 
 // Uses ASSERTs to prevent sharded tests from hanging on failure.
 TEST_P(FFmpegRegressionTest, BasicPlayback) {
   if (GetParam().init_status == PIPELINE_OK) {
     ASSERT_EQ(PIPELINE_OK, Start(GetParam().filename, kClockless));
     Play();
     ASSERT_EQ(GetParam().end_status, WaitUntilEndedOrError());
 
     // Check for ended if the pipeline is expected to finish okay.
     if (GetParam().end_status == PIPELINE_OK) {
       ASSERT_TRUE(ended_);
 
       // Tack a seek on the end to catch any seeking issues.
-      Seek(GetStartTime());
+      Seek(GetParam().seek_time);

[DaleCurtis, 2016/12/08 19:07:47]

Doesn't this change all the existing tests? Seems like this should keep the old
behavior?

[wolenetz, 2016/12/08 19:12:52]

Good catch ditto of chcunningham@'s catch. Thank you! (see my reply above. fixed
patch set is coming soon...)

[wolenetz, 2016/12/08 19:36:49]

Done.

     }
   } else {
     // Don't bother checking the exact status as we only care that the
     // pipeline failed to start.
     EXPECT_NE(PIPELINE_OK, Start(GetParam().filename));
   }
 }
 
 TEST_P(FlakyFFmpegRegressionTest, BasicPlayback) {
   if (Start(GetParam().filename, kClockless) == PIPELINE_OK) {
     Play();
     WaitUntilEndedOrError();
   }
 }
 
 }  // namespace media