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

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

Issue 9346012: Video decode in hardware on ARM platform. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 10 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/gles2_texture_to_egl_image_translator.h
===================================================================
--- content/common/gpu/media/gles2_texture_to_egl_image_translator.h (revision 120554)
+++ content/common/gpu/media/gles2_texture_to_egl_image_translator.h (working copy)
@@ -5,6 +5,10 @@
#ifndef CONTENT_COMMON_GPU_MEDIA_GLES2_TEXTURE_TO_EGL_IMAGE_TRANSLATOR_H_
#define CONTENT_COMMON_GPU_MEDIA_GLES2_TEXTURE_TO_EGL_IMAGE_TRANSLATOR_H_
+#include <utility>
Ami GONE FROM CHROMIUM 2012/02/07 17:05:40 unneeded
+#include <vector>
+#include "base/scoped_ptr.h"
Ami GONE FROM CHROMIUM 2012/02/07 17:05:40 unneeded
+
#include "base/basictypes.h"
#include "media/video/picture.h"
#include "third_party/angle/include/EGL/egl.h"
@@ -12,6 +16,10 @@
#include "third_party/angle/include/GLES2/gl2.h"
#include "third_party/angle/include/GLES2/gl2ext.h"
+#include <X11/Xutil.h>
+#include <X11/extensions/Xrender.h>
+#include <X11/extensions/Xcomposite.h>
Ami GONE FROM CHROMIUM 2012/02/07 17:05:40 None of these includes are necessary, are they?
+
// Class to wrap egl-opengles related operations.
// PPAPI will give the textures to OmxVideoDecodeAccelerator.
// OmxVideoDecodeAccelerator will use this class to convert
@@ -29,10 +37,16 @@
EGLImageKHR TranslateToEglImage(EGLDisplay egl_display,
EGLContext egl_context,
uint32 texture);
+ EGLImageKHR CreateEglImage(Display* x_display, EGLDisplay egl_display,
Ami GONE FROM CHROMIUM 2012/02/07 17:05:40 Having a "Create" call per underlying implementati
+ EGLContext egl_context, EGLSurface egl_surface,
+ uint32 texture, int width, int height);
+
uint32 TranslateToTexture(EGLImageKHR egl_image);
- void DestroyEglImage(EGLDisplay egl_display, EGLImageKHR egl_image);
+ void DestroyEglImage(Display* x_display, EGLDisplay egl_display,
+ EGLImageKHR egl_image);
private:
+ std::vector<Pixmap> pixmap_;
DISALLOW_COPY_AND_ASSIGN(Gles2TextureToEglImageTranslator);
};

Powered by Google App Engine
This is Rietveld 408576698