Chromium Code Reviews| Index: content/browser/media/media_browsertest.cc |
| diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc |
| index 0ca34d11cb899073242e534eb9a5d19f7daecea7..6b5e37bf86f6fb00d6379d1d984e245b08ceb3bb 100644 |
| --- a/content/browser/media/media_browsertest.cc |
| +++ b/content/browser/media/media_browsertest.cc |
| @@ -4,6 +4,7 @@ |
| #include "content/browser/media/media_browsertest.h" |
| +#include "base/strings/string_number_conversions.h" |
| #include "base/strings/utf_string_conversions.h" |
| #include "content/public/browser/web_contents.h" |
| #include "content/public/test/browser_test_utils.h" |
| @@ -97,6 +98,17 @@ class MediaTest : public testing::WithParamInterface<bool>, |
| query_params.push_back(std::make_pair(tag, media_file)); |
| RunMediaTestPage("player.html", query_params, kEnded, http); |
| } |
| + |
| + void RunVideoSizeTest(const char* media_file, bool http, |
|
scherkus (not reviewing)
2014/08/07 00:55:46
remove http param -- we always pass in true
also,
suderman
2014/08/07 00:58:40
Done.
|
| + int width, int height) { |
| + std::string expected; |
| + expected += base::IntToString(width); |
| + expected += " "; |
| + expected += base::IntToString(height); |
| + 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) { |
| @@ -142,6 +154,22 @@ IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearMovPcmS16be) { |
| IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearMovPcmS24be) { |
| PlayVideo("bear_pcm_s24be.mov", GetParam()); |
| } |
| + |
| +IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearRotated0) { |
| + RunVideoSizeTest("bear_rotate_0.mp4", true, 1280, 720); |
| +} |
| + |
| +IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearRotated90) { |
| + RunVideoSizeTest("bear_rotate_90.mp4", true, 720, 1280); |
| +} |
| + |
| +IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearRotated180) { |
| + RunVideoSizeTest("bear_rotate_180.mp4", true, 1280, 720); |
| +} |
| + |
| +IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearRotated270) { |
| + RunVideoSizeTest("bear_rotate_270.mp4", true, 720, 1280); |
| +} |
| #endif // defined(USE_PROPRIETARY_CODECS) |
| #if defined(OS_CHROMEOS) |