Rotation into Video Layer + Content Transform

content/browser/media/media_browsertest.cc

 // Copyright (c) 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 "content/browser/media/media_browsertest.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test_utils.h"
@@ skipping 36 matching lines @@
   std::string final_title = RunTest(gurl, expected_title);
   EXPECT_EQ(expected_title, final_title);
 }
 
 std::string MediaBrowserTest::RunTest(const GURL& gurl,
                                       const std::string& expected_title) {
   VLOG(0) << "Running test URL: " << gurl;
   TitleWatcher title_watcher(shell()->web_contents(),
                              base::ASCIIToUTF16(expected_title));
   AddWaitForTitles(&title_watcher);
+  title_watcher.AlsoWaitForTitle(base::ASCIIToUTF16(expected_title));

[scherkus (not reviewing), 2014/08/06 23:06:42]

we already pass this into the TitleWatcher constructor -- is this needed?

[suderman, 2014/08/07 00:31:31]

The title when the video terminates must match the expected title.
In order to terminate for the dimensions title it needs to add the
title to the title_watcher, however as the title varies on the size
of the video it must explicitly have the expected title added to
the title watcher.

[scherkus (not reviewing), 2014/08/07 00:38:48]

I get that part, but on line 56 we already add |expected_title| via the
TitleWatcher() constructor, which pushes it into its vector:
https://code.google.com/p/chromium/codesearch#chromium/src/content/public/tes...

I'm confused why we need to add the same string to TitleWatcher's vector twice

[suderman, 2014/08/07 00:49:36]

Ah, okay. I wasn't aware that the title_watcher automatically added the expected
title. I believe I saw the title timing out and thought it was due to not
watching for the expected title. Removed.

   NavigateToURL(shell(), gurl);
   base::string16 result = title_watcher.WaitAndGetTitle();
   return base::UTF16ToASCII(result);
 }
 
 void MediaBrowserTest::AddWaitForTitles(content::TitleWatcher* title_watcher) {
   title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEnded));
   title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kError));
   title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kFailed));
 }
@@ skipping 23 matching lines @@
     RunTest(GetFileUrlWithQuery(test_file_path, media_file), expected);
   }
 
   void PlayMedia(const std::string& tag,
                  const std::string& media_file,
                  bool http) {
     media::QueryParams query_params;
     query_params.push_back(std::make_pair(tag, media_file));
     RunMediaTestPage("player.html", query_params, kEnded, http);
   }
+
+  void PlayVideoSize(const char* media_file, bool http, const char* expected) {

[scherkus (not reviewing), 2014/08/06 23:06:42]

nit: PlayVideoSize isn't really the best name

how about something along the lines of RunVideoSizeTest()

also it's a minor detail, but instead of requiring callers to know the format of
the string, it'd be preferable to have them pass in the sizes as int and have
this helper method construct the string seeing as this method is the one picking
the html page to run

[suderman, 2014/08/07 00:31:31]

Done.

+    media::QueryParams query_params;
+    query_params.push_back(std::make_pair("video", media_file));
+    RunMediaTestPage("player.html", query_params, expected, http);
+  }
 };
 
 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearTheora) {
   PlayVideo("bear.ogv", GetParam());
 }
 
 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearSilentTheora) {
   PlayVideo("bear_silent.ogv", GetParam());
 }
 
@@ skipping 25 matching lines @@
 // While we support the big endian (be) PCM codecs on Chromium, Quicktime seems
 // to be the only creator of this format and only for .mov files.
 // TODO(dalecurtis/ihf): Find or create some .wav test cases for "be" format.
 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearMovPcmS16be) {
   PlayVideo("bear_pcm_s16be.mov", GetParam());
 }
 
 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearMovPcmS24be) {
   PlayVideo("bear_pcm_s24be.mov", GetParam());
 }
+
+IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearRotated0) {
+  PlayVideoSize("bear_rotate_0.mp4", GetParam(), "1280 720");
+}
+
+IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearRotated90) {
+  PlayVideoSize("bear_rotate_90.mp4", GetParam(), "720 1280");
+}
+
+IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearRotated180) {
+  PlayVideoSize("bear_rotate_180.mp4", GetParam(), "1280 720");
+}
+
+IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearRotated270) {
+  PlayVideoSize("bear_rotate_270.mp4", GetParam(), "720 1280");
+}
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
 #if defined(OS_CHROMEOS)
 #if defined(USE_PROPRIETARY_CODECS)
 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearAviMp3Mpeg4) {
   PlayVideo("bear_mpeg4_mp3.avi", GetParam());
 }
 
 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearAviMp3Mpeg4Asp) {
   PlayVideo("bear_mpeg4asp_mp3.avi", GetParam());
@@ skipping 94 matching lines @@
 }
 
 #if defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) {
   RunColorFormatTest("yuv420p.avi", kEnded);
 }
 #endif  // defined(OS_CHROMEOS)
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
 }  // namespace content