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

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

Issue 858653002: vaapi plumbing to allow hardware video overlays (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: make buildable before cc plumbing is in Created 5 years, 11 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
Index: content/common/gpu/media/vaapi_drm_picture.h
diff --git a/content/common/gpu/media/vaapi_drm_picture.h b/content/common/gpu/media/vaapi_drm_picture.h
index 46c7304823535e6f8e244c92b75a1eb5310d10db..7815507289162b6dcd49a72f4b36460a1d366d75 100644
--- a/content/common/gpu/media/vaapi_drm_picture.h
+++ b/content/common/gpu/media/vaapi_drm_picture.h
@@ -15,7 +15,7 @@
#include "ui/gfx/geometry/size.h"
namespace gfx {
-class GLImageLinuxDMABuffer;
+class GLImage;
}
namespace ui {
@@ -37,7 +37,8 @@ class VaapiDrmPicture : public VaapiPicture {
~VaapiDrmPicture() override;
- bool Initialize() override;
+ bool Initialize(gpu::gles2::TextureManager* texture_manager,
+ gpu::gles2::TextureRef* texture_ref) override;
bool DownloadFromSurface(const scoped_refptr<VASurface>& va_surface) override;
@@ -49,7 +50,7 @@ class VaapiDrmPicture : public VaapiPicture {
scoped_refptr<ui::NativePixmap> pixmap_;
// EGLImage bound to the GL textures used by the VDA client.
Pawel Osciak 2015/01/21 13:07:08 Please update documentation.
achaulk 2015/01/21 17:10:03 This is still right, it is still an EGLImage, just
- scoped_refptr<gfx::GLImageLinuxDMABuffer> gl_image_;
+ scoped_refptr<gfx::GLImage> gl_image_;
// VASurface used to transfer from the decoder's pixel format.
scoped_refptr<VASurface> va_surface_;

Powered by Google App Engine
This is Rietveld 408576698