content/common/gpu/media/vaapi_drm_picture.cc - Issue 1258713002: ozone: unify GpuMemoryBufferFactoryOzoneNativePixmap in content/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/common/gpu/media/vaapi_drm_picture.cc

Issue 1258713002: ozone: unify GpuMemoryBufferFactoryOzoneNativePixmap in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Re-factor ui/gl/gl_image_ozone_native_pixmap.h/cc so there's only one Created 5 years, 5 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 | « content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc ('k') | content/content_common.gypi » ('j') | ui/gl/gl_image_ozone_native_pixmap.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/media/vaapi_drm_picture.cc

diff --git a/content/common/gpu/media/vaapi_drm_picture.cc b/content/common/gpu/media/vaapi_drm_picture.cc

index 87be82e32fcbcbac5a0d29a72c2135ec05a3a70a..8a98418839131d63e26a4bfc0e7bcaad279de46f 100644

--- a/content/common/gpu/media/vaapi_drm_picture.cc

+++ b/content/common/gpu/media/vaapi_drm_picture.cc

@@ -11,9 +11,8 @@

#include "third_party/libva/va/va_drmcommon.h"

#include "ui/gfx/gpu_memory_buffer.h"

#include "ui/gl/gl_bindings.h"

-#include "ui/gl/gl_image_linux_dma_buffer.h"

+#include "ui/gl/gl_image_ozone_native_pixmap.h"

#include "ui/gl/scoped_binders.h"

-#include "ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h"

#include "ui/ozone/public/native_pixmap.h"

#include "ui/ozone/public/ozone_platform.h"

#include "ui/ozone/public/surface_factory_ozone.h"

@@ -128,7 +127,7 @@ bool VaapiDrmPicture::Initialize() {

gfx::ScopedTextureBinder texture_binder(GL_TEXTURE_EXTERNAL_OES,

texture_id());

- gl_image_ = ui::GpuMemoryBufferFactoryOzoneNativePixmap::CreateImageForPixmap(

+ gl_image_ = gfx::GLImageOzoneNativePixmap::Create(

pixmap_, size(), gfx::GpuMemoryBuffer::BGRA_8888, GL_BGRA_EXT);

if (!gl_image_) {

LOG(ERROR) << "Failed to create GLImage";

« no previous file with comments | « content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc ('k') | content/content_common.gypi » ('j') | ui/gl/gl_image_ozone_native_pixmap.h » ('J')