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

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,13 +5,14 @@
#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 <map>
+
#include "base/basictypes.h"
#include "media/video/picture.h"
#include "third_party/angle/include/EGL/egl.h"
#include "third_party/angle/include/EGL/eglext.h"
-#include "third_party/angle/include/GLES2/gl2.h"
-#include "third_party/angle/include/GLES2/gl2ext.h"
-
+#include "third_party/mesa/MesaLib/include/GL/gl.h"
+#include "third_party/mesa/MesaLib/include/GL/glext.h"
Ami GONE FROM CHROMIUM 2012/02/18 00:00:25 What's the deal with the s/angle/mesa/ here and ab
// Class to wrap egl-opengles related operations.
// PPAPI will give the textures to OmxVideoDecodeAccelerator.
// OmxVideoDecodeAccelerator will use this class to convert
@@ -22,17 +23,21 @@
// just in-line them into the only caller, OmxVideoDecodeAccelerator.
class Gles2TextureToEglImageTranslator {
public:
- Gles2TextureToEglImageTranslator();
+ Gles2TextureToEglImageTranslator(Display* x_display);
~Gles2TextureToEglImageTranslator();
// Translates texture into EGLImage and back.
EGLImageKHR TranslateToEglImage(EGLDisplay egl_display,
EGLContext egl_context,
- uint32 texture);
+ uint32 texture,
+ int width, int height);
uint32 TranslateToTexture(EGLImageKHR egl_image);
void DestroyEglImage(EGLDisplay egl_display, EGLImageKHR egl_image);
private:
+ Display* x_display_;
+ typedef std::map<EGLImageKHR, Pixmap> ImagePixmap;
+ ImagePixmap eglimage_pixmap_;
DISALLOW_COPY_AND_ASSIGN(Gles2TextureToEglImageTranslator);
};

Powered by Google App Engine
This is Rietveld 408576698