Commit 5a31b3f2 authored by Moja Hsu's avatar Moja Hsu Committed by Commit Bot

media/gpu/test: remove 4160*3120 resolution

Cyan device doesn't support 4160*3120 resoltuion, removes this
resolution since not all devices support it.

TEST=ran jpeg encode tests on cyan
BUG=b:119928581

Change-Id: I2593e57f1478cfbd9806e8879b77925e851ccf23
Reviewed-on: https://chromium-review.googlesource.com/c/1350446Reviewed-by: default avatarHirokazu Honda <hiroh@chromium.org>
Commit-Queue: Hsu Wei-Cheng <mojahsu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610992}
parent 4df8e0bd
...@@ -105,8 +105,6 @@ class JpegEncodeAcceleratorTestEnvironment : public ::testing::Environment { ...@@ -105,8 +105,6 @@ class JpegEncodeAcceleratorTestEnvironment : public ::testing::Environment {
// Parsed data from command line. // Parsed data from command line.
std::vector<std::unique_ptr<TestImage>> image_data_user_; std::vector<std::unique_ptr<TestImage>> image_data_user_;
// Generated 4160x3120 white I420 image.
std::unique_ptr<TestImage> image_data_4160x3120_white_;
// Generated 2560x1920 white I420 image. // Generated 2560x1920 white I420 image.
std::unique_ptr<TestImage> image_data_2560x1920_white_; std::unique_ptr<TestImage> image_data_2560x1920_white_;
// Scarlet doesn't support 1080 width, it only suports 1088 width. // Scarlet doesn't support 1080 width, it only suports 1088 width.
...@@ -139,8 +137,6 @@ void JpegEncodeAcceleratorTestEnvironment::SetUp() { ...@@ -139,8 +137,6 @@ void JpegEncodeAcceleratorTestEnvironment::SetUp() {
LOG_ASSERT(log_file_->IsValid()); LOG_ASSERT(log_file_->IsValid());
} }
image_data_4160x3120_white_ =
CreateTestYuvImage(gfx::Size(4160, 3120), false);
image_data_2560x1920_white_ = image_data_2560x1920_white_ =
CreateTestYuvImage(gfx::Size(2560, 1920), false); CreateTestYuvImage(gfx::Size(2560, 1920), false);
image_data_1280x720_white_ = CreateTestYuvImage(gfx::Size(1280, 720), false); image_data_1280x720_white_ = CreateTestYuvImage(gfx::Size(1280, 720), false);
...@@ -680,7 +676,6 @@ TEST_F(JpegEncodeAcceleratorTest, ResolutionChange) { ...@@ -680,7 +676,6 @@ TEST_F(JpegEncodeAcceleratorTest, ResolutionChange) {
} }
TEST_F(JpegEncodeAcceleratorTest, AlignedSizes) { TEST_F(JpegEncodeAcceleratorTest, AlignedSizes) {
test_aligned_images_.push_back(g_env->image_data_4160x3120_white_.get());
test_aligned_images_.push_back(g_env->image_data_2560x1920_white_.get()); test_aligned_images_.push_back(g_env->image_data_2560x1920_white_.get());
test_aligned_images_.push_back(g_env->image_data_1280x720_white_.get()); test_aligned_images_.push_back(g_env->image_data_1280x720_white_.get());
test_aligned_images_.push_back(g_env->image_data_640x480_black_.get()); test_aligned_images_.push_back(g_env->image_data_640x480_black_.get());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment