chromium/src
0
Fork 0
Code Activity

Replace WrapNativeTextures() with WrapSharedImages()

Browse Source 
As part of the ClientSharedImage refactorization, this CL replaces the
usage of WrapNativeTextures() with WrapSharedImages() in
GpuMemoryBufferVideoFramePool.

Bug: 1494911
Change-Id: I470108851f9275a4cc4f7f0eff8b8f36aa9106c4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5381365
Commit-Queue: Mingjing Zhang <mjzhang@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Vasiliy Telezhnikov <vasilyt@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1277846}
This commit is contained in:
Mingjing Zhang
2024-03-25 19:34:50 +00:00
committed by Chromium LUCI CQ
parent e533152012
commit 8b64b26d72
2 changed files with 11 additions and 14 deletions

2
media/base/video_frame.cc

@ -486,7 +486,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapSharedImages(
if (shared_images[i]) { if (shared_images[i]) {
frame->mailbox_holders_[i] = gpu::MailboxHolder( frame->mailbox_holders_[i] = gpu::MailboxHolder(
shared_images[i]->mailbox(), sync_token, texture_target); shared_images[i]->mailbox(), sync_token, texture_target);
frame->shared_images_[i] = shared_images[i]; frame->shared_images_[i] = shared_images[i]->MakeUnowned();
} }
} }
frame->mailbox_holders_and_gmb_release_cb_ = frame->mailbox_holders_and_gmb_release_cb_ =

23
media/video/gpu_memory_buffer_video_frame_pool.cc

@ -1248,7 +1248,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePool::PoolImpl::
return nullptr; return nullptr;
} }
gpu::MailboxHolder mailbox_holders[VideoFrame::kMaxPlanes]; scoped_refptr<gpu::ClientSharedImage> shared_images[VideoFrame::kMaxPlanes];
bool is_webgpu_compatible = false; bool is_webgpu_compatible = false;
// Set up the planes creating the mailboxes needed to refer to the textures. // Set up the planes creating the mailboxes needed to refer to the textures.
for (size_t plane = 0; plane < NumSharedImages(output_format_); plane++) { for (size_t plane = 0; plane < NumSharedImages(output_format_); plane++) {
@ -1294,8 +1294,6 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePool::PoolImpl::
} }
#endif #endif
const gfx::BufferFormat buffer_format =
GpuMemoryBufferFormat(output_format_, plane);
// Bind the texture and create or rebind the image. This image may be read // Bind the texture and create or rebind the image. This image may be read
// via the raster interface for import into canvas and/or 2-copy import into // via the raster interface for import into canvas and/or 2-copy import into
// WebGL as well as potentially being read via the GLES interface for 1-copy // WebGL as well as potentially being read via the GLES interface for 1-copy
@ -1342,26 +1340,25 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePool::PoolImpl::
sii->UpdateSharedImage(frame_resources->sync_token, sii->UpdateSharedImage(frame_resources->sync_token,
plane_resource.shared_image->mailbox()); plane_resource.shared_image->mailbox());
} }
auto texture_target = plane_resource.shared_image->GetTextureTarget( shared_images[plane] = plane_resource.shared_image;
gfx::BufferUsage::SCANOUT_CPU_READ_WRITE, buffer_format);
mailbox_holders[plane] =
gpu::MailboxHolder(plane_resource.shared_image->mailbox(),
gpu::SyncToken(), texture_target);
} }
// Insert a sync_token, this is needed to make sure that the textures the // Insert a sync_token, this is needed to make sure that the textures the
// mailboxes refer to will be used only after all the previous commands posted // mailboxes refer to will be used only after all the previous commands posted
// in the SharedImageInterface have been processed. // in the SharedImageInterface have been processed.
gpu::SyncToken sync_token = sii->GenUnverifiedSyncToken(); gpu::SyncToken sync_token = sii->GenUnverifiedSyncToken();
for (size_t plane = 0; plane < NumSharedImages(output_format_); plane++) const gfx::BufferFormat buffer_format =
mailbox_holders[plane].sync_token = sync_token; GpuMemoryBufferFormat(output_format_, 0);
auto texture_target = shared_images[0]->GetTextureTarget(
gfx::BufferUsage::SCANOUT_CPU_READ_WRITE, buffer_format);
VideoPixelFormat frame_format = VideoFormat(output_format_); VideoPixelFormat frame_format = VideoFormat(output_format_);
// Create the VideoFrame backed by native textures. // Create the VideoFrame backed by native textures.
scoped_refptr<VideoFrame> frame = VideoFrame::WrapNativeTextures( scoped_refptr<VideoFrame> frame = VideoFrame::WrapSharedImages(
frame_format, mailbox_holders, VideoFrame::ReleaseMailboxCB(), coded_size, frame_format, shared_images, sync_token, texture_target,
visible_rect, natural_size, timestamp); VideoFrame::ReleaseMailboxCB(), coded_size, visible_rect, natural_size,
timestamp);
if (!frame) { if (!frame) {
frame_resources->MarkUnused(tick_clock_->NowTicks()); frame_resources->MarkUnused(tick_clock_->NowTicks());