summaryrefslogtreecommitdiff
path: root/chromium/media/base/video_util_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/media/base/video_util_unittest.cc')
-rw-r--r--chromium/media/base/video_util_unittest.cc39
1 files changed, 33 insertions, 6 deletions
diff --git a/chromium/media/base/video_util_unittest.cc b/chromium/media/base/video_util_unittest.cc
index ff01110f00a..a62f0cbaf0b 100644
--- a/chromium/media/base/video_util_unittest.cc
+++ b/chromium/media/base/video_util_unittest.cc
@@ -38,9 +38,8 @@ class VideoUtilTest : public testing::Test {
void CreateDestinationFrame(int width, int height) {
gfx::Size size(width, height);
- destination_frame_ =
- VideoFrame::CreateFrame(VideoFrame::YV12, size, gfx::Rect(size), size,
- base::TimeDelta());
+ destination_frame_ = VideoFrame::CreateFrame(
+ PIXEL_FORMAT_YV12, size, gfx::Rect(size), size, base::TimeDelta());
}
void CopyPlanes() {
@@ -66,6 +65,35 @@ class VideoUtilTest : public testing::Test {
DISALLOW_COPY_AND_ASSIGN(VideoUtilTest);
};
+TEST_F(VideoUtilTest, GetNaturalSize) {
+ gfx::Size visible_size(320, 240);
+
+ // Test 0 sizes.
+ EXPECT_EQ(gfx::Size(0, 0), GetNaturalSize(gfx::Size(0, 0), 1, 1));
+ EXPECT_EQ(gfx::Size(0, 1), GetNaturalSize(gfx::Size(0, 1), 1, 1));
+ EXPECT_EQ(gfx::Size(1, 0), GetNaturalSize(gfx::Size(1, 0), 1, 1));
+
+ // Test abnormal ratios.
+ EXPECT_EQ(gfx::Size(0, 0), GetNaturalSize(visible_size, 0, 0));
+ EXPECT_EQ(gfx::Size(0, 0), GetNaturalSize(visible_size, 1, 0));
+ EXPECT_EQ(gfx::Size(0, 0), GetNaturalSize(visible_size, 1, -1));
+ EXPECT_EQ(gfx::Size(0, 0), GetNaturalSize(visible_size, -1, 1));
+
+ // Test normal sizes and ratios.
+ EXPECT_EQ(gfx::Size(0, 240), GetNaturalSize(visible_size, 0, 1));
+ EXPECT_EQ(gfx::Size(320, 240), GetNaturalSize(visible_size, 1, 1));
+ EXPECT_EQ(gfx::Size(640, 240), GetNaturalSize(visible_size, 2, 1));
+ EXPECT_EQ(gfx::Size(160, 240), GetNaturalSize(visible_size, 1, 2));
+ EXPECT_EQ(gfx::Size(427, 240), GetNaturalSize(visible_size, 4, 3));
+ EXPECT_EQ(gfx::Size(240, 240), GetNaturalSize(visible_size, 3, 4));
+ EXPECT_EQ(gfx::Size(569, 240), GetNaturalSize(visible_size, 16, 9));
+ EXPECT_EQ(gfx::Size(180, 240), GetNaturalSize(visible_size, 9, 16));
+
+ // Test some random ratios.
+ EXPECT_EQ(gfx::Size(495, 240), GetNaturalSize(visible_size, 17, 11));
+ EXPECT_EQ(gfx::Size(207, 240), GetNaturalSize(visible_size, 11, 17));
+}
+
TEST_F(VideoUtilTest, CopyPlane_Exact) {
CreateSourceFrame(16, 16, 16, 8, 8);
CreateDestinationFrame(16, 16);
@@ -396,9 +424,8 @@ TEST_F(VideoUtilTest, LetterboxYUV) {
int width = 40;
int height = 30;
gfx::Size size(width, height);
- scoped_refptr<VideoFrame> frame(
- VideoFrame::CreateFrame(VideoFrame::YV12, size, gfx::Rect(size), size,
- base::TimeDelta()));
+ scoped_refptr<VideoFrame> frame(VideoFrame::CreateFrame(
+ PIXEL_FORMAT_YV12, size, gfx::Rect(size), size, base::TimeDelta()));
for (int left_margin = 0; left_margin <= 10; left_margin += 10) {
for (int right_margin = 0; right_margin <= 10; right_margin += 10) {