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/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
@@ skipping 37 matching lines @@
     gurl = GetFileUrlWithQuery(test_file_path, query);
   }
   RunTest(gurl, expected);
 }
 
 void MediaBrowserTest::RunTest(const GURL& gurl, const char* expected) {
   const base::string16 expected_title = base::ASCIIToUTF16(expected);
   DVLOG(1) << "Running test URL: " << gurl;
   TitleWatcher title_watcher(shell()->web_contents(), expected_title);
   AddWaitForTitles(&title_watcher);
+  title_watcher.AlsoWaitForTitle(expected_title);
   NavigateToURL(shell(), gurl);
 
   base::string16 final_title = title_watcher.WaitAndGetTitle();
   EXPECT_EQ(expected_title, final_title);
 }
 
 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 20 matching lines @@
   void RunColorFormatTest(const char* media_file, const char* expected) {
     base::FilePath test_file_path = GetTestFilePath("media", "blackwhite.html");
     RunTest(GetFileUrlWithQuery(test_file_path, media_file), expected);
   }
 
   void PlayMedia(const char* tag, const char* media_file, bool http) {
     std::vector<StringPair> 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) {
+    std::vector<StringPair> 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(), "1280 720");
+}
+
+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(), "1280 720");
+}
 #endif
 
 #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 95 matching lines @@
 }
 
 #if defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) {
   RunColorFormatTest("yuv420p.avi", "ENDED");
 }
 #endif  // defined(OS_CHROMEOS)
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
 }  // namespace content