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

Unified Diff: cc/resources/video_resource_updater.cc

Issue 1957583002: cc: Add GpuMemoryBufferId to TextureMailbox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unsigned -> signed Created 4 years, 7 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/transferable_resource.h ('k') | cc/test/test_gpu_memory_buffer_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/video_resource_updater.cc
diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc
index e74383ea753bcdba526abed62831542199f548df..d2fb73139da42854f4441cf36adcb738b28468b2 100644
--- a/cc/resources/video_resource_updater.cc
+++ b/cc/resources/video_resource_updater.cc
@@ -660,9 +660,9 @@ void VideoResourceUpdater::CopyPlaneTexture(
// Done with the source video frame texture at this point.
video_frame->UpdateReleaseSyncToken(&client);
- external_resources->mailboxes.push_back(
- TextureMailbox(resource->mailbox, sync_token, GL_TEXTURE_2D,
- video_frame->coded_size(), false, false));
+ external_resources->mailboxes.push_back(TextureMailbox(
+ resource->mailbox, sync_token, GL_TEXTURE_2D, video_frame->coded_size(),
+ gfx::GpuMemoryBufferId(), false, false));
external_resources->release_callbacks.push_back(
base::Bind(&RecycleResource, AsWeakPtr(), resource->resource_id));
@@ -698,12 +698,13 @@ VideoFrameExternalResources VideoResourceUpdater::CreateForHardwarePlanes(
media::VideoFrameMetadata::COPY_REQUIRED)) {
CopyPlaneTexture(video_frame.get(), mailbox_holder, &external_resources);
} else {
- external_resources.mailboxes.push_back(TextureMailbox(
- mailbox_holder.mailbox, mailbox_holder.sync_token,
- mailbox_holder.texture_target, video_frame->coded_size(),
- video_frame->metadata()->IsTrue(
- media::VideoFrameMetadata::ALLOW_OVERLAY),
- false));
+ external_resources.mailboxes.push_back(
+ TextureMailbox(mailbox_holder.mailbox, mailbox_holder.sync_token,
+ mailbox_holder.texture_target,
+ video_frame->coded_size(), gfx::GpuMemoryBufferId(),
+ video_frame->metadata()->IsTrue(
+ media::VideoFrameMetadata::ALLOW_OVERLAY),
+ false));
external_resources.release_callbacks.push_back(
base::Bind(&ReturnTexture, AsWeakPtr(), video_frame));
« no previous file with comments | « cc/resources/transferable_resource.h ('k') | cc/test/test_gpu_memory_buffer_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698