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

Unified Diff: gpu/ipc/service/image_transport_surface_overlay_mac.mm

Issue 1910633004: Mac video: Enable AVSampleBufferDisplayLayer for h264 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 8 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 | « no previous file | ui/accelerated_widget_mac/ca_layer_tree_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/ipc/service/image_transport_surface_overlay_mac.mm
diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.mm b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
index 355af81b90738f506602c58286050dd7f90b007a..0442c36b01f2a3718ad8fdfa4357a76d0e24924b 100644
--- a/gpu/ipc/service/image_transport_surface_overlay_mac.mm
+++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
@@ -301,16 +301,19 @@ bool ImageTransportSurfaceOverlayMac::ScheduleCALayer(
int sorting_context_id,
unsigned filter) {
base::ScopedCFTypeRef<IOSurfaceRef> io_surface;
+ base::ScopedCFTypeRef<CVPixelBufferRef> cv_pixel_buffer;
if (contents_image) {
- io_surface =
- static_cast<gl::GLImageIOSurface*>(contents_image)->io_surface();
+ gl::GLImageIOSurface* io_surface_image =
+ static_cast<gl::GLImageIOSurface*>(contents_image);
+ io_surface = io_surface_image->io_surface();
+ cv_pixel_buffer = io_surface_image->cv_pixel_buffer();
}
if (!pending_ca_layer_tree_)
pending_ca_layer_tree_.reset(new ui::CALayerTree);
return pending_ca_layer_tree_->ScheduleCALayer(
is_clipped, gfx::ToEnclosingRect(clip_rect), sorting_context_id,
- transform, io_surface, contents_rect, gfx::ToEnclosingRect(rect),
- background_color, edge_aa_mask, opacity);
+ transform, io_surface, cv_pixel_buffer, contents_rect,
+ gfx::ToEnclosingRect(rect), background_color, edge_aa_mask, opacity);
}
bool ImageTransportSurfaceOverlayMac::IsSurfaceless() const {
« no previous file with comments | « no previous file | ui/accelerated_widget_mac/ca_layer_tree_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698