Add VP9 to chrome_webrtc_video_quality_browsertest.cc.

chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc

 // Copyright 2013 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.
 
 #include <stddef.h>
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file.h"
@@ skipping 180 matching lines @@
   // The barcode decoder decodes the captured video containing barcodes overlaid
   // into every frame of the video (produced by rgba_to_i420_converter). It
   // produces a set of PNG images and a |stats_file| that maps each captured
   // frame to a frame in the reference video. The frames should be of size
   // |width| x |height|.
   // All measurements calculated are printed as perf parsable numbers to stdout.
   bool CompareVideosAndPrintResult(
       const char* test_label,
       int width,
       int height,
+      const std::string& video_codec,

[phoglund_chromium, 2016/03/07 10:57:12]

I don't see why this function needs to know about the video codec; encode the
video codec in the test label from the caller instead.

[asapersson2, 2016/03/07 13:05:29]

Done.

       const base::FilePath& captured_video_filename,
       const base::FilePath& reference_video_filename,
       const base::FilePath& stats_file) {
 
     base::FilePath path_to_analyzer = base::MakeAbsoluteFilePath(
         GetBrowserDir().Append(kFrameAnalyzerExecutable));
     base::FilePath path_to_compare_script = GetSourceDir().Append(
         FILE_PATH_LITERAL("third_party/webrtc/tools/compare_videos.py"));
 
     if (!base::PathExists(path_to_analyzer)) {
@@ skipping 12 matching lines @@
     if (!base::PathExists(path_to_zxing)) {
       LOG(ERROR) << "Missing zxing: should be in " << path_to_zxing.value();
       return false;
     }
     base::FilePath path_to_ffmpeg = test::GetToolForPlatform("ffmpeg");
     if (!base::PathExists(path_to_ffmpeg)) {
       LOG(ERROR) << "Missing ffmpeg: should be in " << path_to_ffmpeg.value();
       return false;
     }
 
+    std::string codec_label =
+        video_codec.empty() ? video_codec : "_" + video_codec;
+
     // Note: don't append switches to this command since it will mess up the
     // -u in the python invocation!
     base::CommandLine compare_command(base::CommandLine::NO_PROGRAM);
     EXPECT_TRUE(GetPythonCommand(&compare_command));
 
     compare_command.AppendArgPath(path_to_compare_script);
-    compare_command.AppendArg(base::StringPrintf("--label=%s", test_label));
+    compare_command.AppendArg(base::StringPrintf("--label=%s", test_label) +
+                              codec_label);
     compare_command.AppendArg("--ref_video");
     compare_command.AppendArgPath(reference_video_filename);
     compare_command.AppendArg("--test_video");
     compare_command.AppendArgPath(captured_video_filename);
     compare_command.AppendArg("--frame_analyzer");
     compare_command.AppendArgPath(path_to_analyzer);
     compare_command.AppendArg("--yuv_frame_width");
     compare_command.AppendArg(base::IntToString(width));
     compare_command.AppendArg("--yuv_frame_height");
     compare_command.AppendArg(base::IntToString(height));
@@ skipping 13 matching lines @@
     printf("Output was:\n\n%s\n", output.c_str());
     bool has_result_lines = output.find("RESULT") != std::string::npos;
     if (!ok || !has_result_lines) {
       LOG(ERROR) << "Failed to compare videos; see output above to see what "
                  << "the error was.";
       return false;
     }
     return true;
   }
 
+  void TestVideoQuality(const std::string& video_codec) {
+    ASSERT_GE(TestTimeouts::action_max_timeout().InSeconds(), 150)
+        << "This is a long-running test; you must specify "
+           "--ui-test-action-max-timeout to have a value of at least 150000.";
+    ASSERT_TRUE(test::HasReferenceFilesInCheckout());
+    ASSERT_TRUE(embedded_test_server()->Start());
+
+    content::WebContents* left_tab =
+        OpenPageAndGetUserMediaInNewTabWithConstraints(
+            embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage),
+            test_config_.constraints);
+    content::WebContents* right_tab =
+        OpenPageAndGetUserMediaInNewTabWithConstraints(
+            embedded_test_server()->GetURL(kCapturingWebrtcHtmlPage),
+            test_config_.constraints);
+
+    SetupPeerconnectionWithLocalStream(left_tab);
+    SetupPeerconnectionWithLocalStream(right_tab);
+
+    NegotiateCall(left_tab, right_tab, video_codec);
+
+    // Poll slower here to avoid flooding the log with messages: capturing and
+    // sending frames take quite a bit of time.
+    int polling_interval_msec = 1000;
+
+    EXPECT_TRUE(test::PollingWaitUntil("doneFrameCapturing()", "done-capturing",
+                                       right_tab, polling_interval_msec));
+
+    HangUp(left_tab);
+
+    WriteCapturedFramesToWorkingDir(right_tab);
+
+    // Shut everything down to avoid having the javascript race with the
+    // analysis

[phoglund_chromium, 2016/03/07 10:57:12]

Nit: pull up to previous line

[asapersson2, 2016/03/07 13:05:29]

Done.

+    // tools. For instance, dont have console log printouts interleave with the
+    // RESULT lines from the analysis tools (crbug.com/323200).
+    chrome::CloseWebContents(browser(), left_tab, false);
+    chrome::CloseWebContents(browser(), right_tab, false);
+
+    ASSERT_TRUE(
+        RunARGBtoI420Converter(test_config_.width, test_config_.height,
+                               GetWorkingDir().Append(kCapturedYuvFileName)));

[phoglund_chromium, 2016/03/07 10:57:12]

What about:

std::string codec_label = video_codec.empty() ? "" : "_" + video_codec;
std::string test_label = base::StringPrintf("%s%s", 
    test_config_.test_name, codec_label.c_str());
ASSERT_TRUE(CompareVideosAndPrintResult(
    test_label, ...);

Consider making a helper function MakeLabel(test_config_.test_name, video_codec)
if you think that makes sense.

[asapersson2, 2016/03/07 13:05:29]

Done.

+    ASSERT_TRUE(CompareVideosAndPrintResult(
+        test_config_.test_name, test_config_.width, test_config_.height,
+        video_codec, GetWorkingDir().Append(kCapturedYuvFileName),
+        test::GetReferenceFilesDir()
+            .Append(test_config_.reference_video)
+            .AddExtension(test::kYuvFileExtension),
+        GetWorkingDir().Append(kStatsFileName)));
+  }
+
  protected:
   VideoQualityTestConfig test_config_;
 
-  base::FilePath GetWorkingDir() {
-    return temp_working_dir_.path();
-  }
+  base::FilePath GetWorkingDir() { return temp_working_dir_.path(); }
 
  private:
   base::FilePath GetSourceDir() {
     base::FilePath source_dir;
     PathService::Get(base::DIR_SOURCE_ROOT, &source_dir);
     return source_dir;
   }
 
   base::FilePath GetBrowserDir() {
     base::FilePath browser_dir;
     EXPECT_TRUE(PathService::Get(base::DIR_MODULE, &browser_dir));
     return browser_dir;
   }
 
   scoped_ptr<base::Environment> environment_;
   base::FilePath webrtc_reference_video_y4m_;
   base::ScopedTempDir temp_working_dir_;
 };
 
 INSTANTIATE_TEST_CASE_P(
     WebRtcVideoQualityBrowserTests,
     WebRtcVideoQualityBrowserTest,
     testing::ValuesIn(kVideoConfigurations));
 
+// The video codec name is now appended to the test label (e.g. '720p_VP8').
+// TODO(asapersson): Keep test below using the default video codec (which do
+// not have the codec name appended ('720p')) until new tests have been
+// running for some time.
 IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest,
-                       MANUAL_TestVideoQuality) {
-  ASSERT_GE(TestTimeouts::action_max_timeout().InSeconds(), 150) <<
-      "This is a long-running test; you must specify "
-      "--ui-test-action-max-timeout to have a value of at least 150000.";
-  ASSERT_TRUE(test::HasReferenceFilesInCheckout());
-  ASSERT_TRUE(embedded_test_server()->Start());
+                       MANUAL_TestVideoQualityDefault) {
+  TestVideoQuality("");
+}
 
-  content::WebContents* left_tab =
-      OpenPageAndGetUserMediaInNewTabWithConstraints(
-          embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage),
-          test_config_.constraints);
-  content::WebContents* right_tab =
-      OpenPageAndGetUserMediaInNewTabWithConstraints(
-          embedded_test_server()->GetURL(kCapturingWebrtcHtmlPage),
-          test_config_.constraints);
+IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest,
+                       MANUAL_TestVideoQualityVp8) {
+  TestVideoQuality("VP8");
+}
 
-  SetupPeerconnectionWithLocalStream(left_tab);
-  SetupPeerconnectionWithLocalStream(right_tab);
-
-  NegotiateCall(left_tab, right_tab);
-
-  // Poll slower here to avoid flooding the log with messages: capturing and
-  // sending frames take quite a bit of time.
-  int polling_interval_msec = 1000;
-
-  EXPECT_TRUE(test::PollingWaitUntil(
-      "doneFrameCapturing()", "done-capturing", right_tab,
-      polling_interval_msec));
-
-  HangUp(left_tab);
-
-  WriteCapturedFramesToWorkingDir(right_tab);
-
-  // Shut everything down to avoid having the javascript race with the analysis
-  // tools. For instance, dont have console log printouts interleave with the
-  // RESULT lines from the analysis tools (crbug.com/323200).
-  chrome::CloseWebContents(browser(), left_tab, false);
-  chrome::CloseWebContents(browser(), right_tab, false);
-
-  ASSERT_TRUE(RunARGBtoI420Converter(
-      test_config_.width, test_config_.height,
-      GetWorkingDir().Append(kCapturedYuvFileName)));
-  ASSERT_TRUE(CompareVideosAndPrintResult(
-      test_config_.test_name,
-      test_config_.width,
-      test_config_.height,
-      GetWorkingDir().Append(kCapturedYuvFileName),
-      test::GetReferenceFilesDir()
-          .Append(test_config_.reference_video)
-          .AddExtension(test::kYuvFileExtension),
-      GetWorkingDir().Append(kStatsFileName)));
+IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest,
+                       MANUAL_TestVideoQualityVp9) {
+  TestVideoQuality("VP9");
 }