Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3847)

Unified Diff: cc/resources/video_resource_updater_unittest.cc

Issue 2684993005: (NotForReview) Enable YUV video overlay on Skylake ChromeOS.
Patch Set: rebase to ToT (Mar/27) Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/video_resource_updater.cc ('k') | cc/test/render_pass_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/video_resource_updater_unittest.cc
diff --git a/cc/resources/video_resource_updater_unittest.cc b/cc/resources/video_resource_updater_unittest.cc
index 3c7874e498ecb6e984d5045f95dd2087a0f2904a..047277d212af9d878d9505cbd2723bfe31e20295 100644
--- a/cc/resources/video_resource_updater_unittest.cc
+++ b/cc/resources/video_resource_updater_unittest.cc
@@ -177,7 +177,8 @@ class VideoResourceUpdaterTest : public testing::Test {
static void ReleaseMailboxCB(const gpu::SyncToken& sync_token) {}
scoped_refptr<media::VideoFrame> CreateTestHardwareVideoFrame(
- unsigned target) {
+ unsigned target,
+ media::VideoPixelFormat format) {
const int kDimension = 10;
gfx::Size size(kDimension, kDimension);
@@ -190,8 +191,7 @@ class VideoResourceUpdaterTest : public testing::Test {
gpu::MailboxHolder mailbox_holders[media::VideoFrame::kMaxPlanes] = {
gpu::MailboxHolder(mailbox, sync_token, target)};
scoped_refptr<media::VideoFrame> video_frame =
- media::VideoFrame::WrapNativeTextures(media::PIXEL_FORMAT_ARGB,
- mailbox_holders,
+ media::VideoFrame::WrapNativeTextures(format, mailbox_holders,
base::Bind(&ReleaseMailboxCB),
size, // coded_size
gfx::Rect(size), // visible_rect
@@ -202,18 +202,29 @@ class VideoResourceUpdaterTest : public testing::Test {
}
scoped_refptr<media::VideoFrame> CreateTestRGBAHardwareVideoFrame() {
- return CreateTestHardwareVideoFrame(GL_TEXTURE_2D);
+ return CreateTestHardwareVideoFrame(GL_TEXTURE_2D,
+ media::PIXEL_FORMAT_ARGB);
}
scoped_refptr<media::VideoFrame> CreateTestStreamTextureHardwareVideoFrame(
bool needs_copy) {
- scoped_refptr<media::VideoFrame> video_frame =
- CreateTestHardwareVideoFrame(GL_TEXTURE_EXTERNAL_OES);
+ scoped_refptr<media::VideoFrame> video_frame = CreateTestHardwareVideoFrame(
+ GL_TEXTURE_EXTERNAL_OES, media::PIXEL_FORMAT_ARGB);
video_frame->metadata()->SetBoolean(
media::VideoFrameMetadata::COPY_REQUIRED, needs_copy);
return video_frame;
}
+ scoped_refptr<media::VideoFrame> CreateTestYUV422TextureHardwareVideoFrame(
+ unsigned target,
+ media::VideoPixelFormat format) {
+ scoped_refptr<media::VideoFrame> video_frame =
+ CreateTestHardwareVideoFrame(target, format);
+ video_frame->metadata()->SetBoolean(
+ media::VideoFrameMetadata::COPY_REQUIRED, false);
+ return video_frame;
+ }
+
scoped_refptr<media::VideoFrame> CreateTestYuvHardwareVideoFrame() {
const int kDimension = 10;
gfx::Size size(kDimension, kDimension);
@@ -519,5 +530,41 @@ TEST_F(VideoResourceUpdaterTest, CreateForHardwarePlanes_StreamTexture) {
EXPECT_FALSE(context3d_->WasImmutableTextureCreated());
}
+TEST_F(VideoResourceUpdaterTest, CreateForHardwarePlanes_YUV422Texture) {
+ VideoResourceUpdater updater(context_provider_.get(),
+ resource_provider3d_.get());
+
+ scoped_refptr<media::VideoFrame> video_frame =
+ CreateTestYUV422TextureHardwareVideoFrame(GL_TEXTURE_2D,
+ media::PIXEL_FORMAT_UYVY);
+
+ VideoFrameExternalResources resources =
+ updater.CreateExternalResourcesFromVideoFrame(video_frame);
+ EXPECT_EQ(VideoFrameExternalResources::RGB_RESOURCE, resources.type);
+ EXPECT_EQ(1u, resources.mailboxes.size());
+ EXPECT_EQ(1u, resources.release_callbacks.size());
+ EXPECT_EQ(0u, resources.software_resources.size());
+
+ video_frame = CreateTestYUV422TextureHardwareVideoFrame(
+ GL_TEXTURE_EXTERNAL_OES, media::PIXEL_FORMAT_UYVY);
+ resources = updater.CreateExternalResourcesFromVideoFrame(video_frame);
+ EXPECT_EQ(VideoFrameExternalResources::STREAM_TEXTURE_RESOURCE,
+ resources.type);
+ EXPECT_EQ(1u, resources.mailboxes.size());
+ EXPECT_EQ(1u, resources.release_callbacks.size());
+ EXPECT_EQ(0u, resources.software_resources.size());
+
+ video_frame = CreateTestYUV422TextureHardwareVideoFrame(
+ GL_TEXTURE_2D, media::PIXEL_FORMAT_YUY2);
+ resources = updater.CreateExternalResourcesFromVideoFrame(video_frame);
+ EXPECT_EQ(VideoFrameExternalResources::RGB_RESOURCE, resources.type);
+
+ video_frame = CreateTestYUV422TextureHardwareVideoFrame(
+ GL_TEXTURE_EXTERNAL_OES, media::PIXEL_FORMAT_YUY2);
+ resources = updater.CreateExternalResourcesFromVideoFrame(video_frame);
+ EXPECT_EQ(VideoFrameExternalResources::STREAM_TEXTURE_RESOURCE,
+ resources.type);
+}
+
} // namespace
} // namespace cc
« no previous file with comments | « cc/resources/video_resource_updater.cc ('k') | cc/test/render_pass_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698