From e05e3a4ec36708b35eea9a2db67f6007b68564cf Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 14 Aug 2013 06:33:08 +0200 Subject: Fix regression of commit 6332e13b2f0aa9818d37802302f04c90a4fa4239 causing optional OMX to fail to compile --- src/jogl/native/openmax/omx_tool.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/jogl/native/openmax/omx_tool.h') diff --git a/src/jogl/native/openmax/omx_tool.h b/src/jogl/native/openmax/omx_tool.h index 414befca0..022c56cf9 100644 --- a/src/jogl/native/openmax/omx_tool.h +++ b/src/jogl/native/openmax/omx_tool.h @@ -28,6 +28,7 @@ #include #include +// FIXME: Move all sync/buffer handling to Java - Already done -> GLMediaPlayerImpl #define EGLIMAGE_MAX_BUFFERS 4 extern int USE_OPENGL; @@ -90,6 +91,7 @@ typedef struct { KDThreadMutex * mutex; KDThreadSem * flushSem; + // FIXME: Move all sync/buffer handling to Java - Already done -> GLMediaPlayerImpl OMXToolImageBuffer_t buffers[EGLIMAGE_MAX_BUFFERS]; int vBufferNum; int glPos; @@ -118,7 +120,7 @@ KDint OMXToolBasicAV_SetState(OMXToolBasicAV_t * pOMXAV, OMX_STATETYPE state, KD // OMXToolBasicAV_t * OMXToolBasicAV_CreateInstance(EGLDisplay dpy); // #1 void OMXToolBasicAV_SetStream(OMXToolBasicAV_t * pOMXAV, int vBufferNum, const KDchar * stream); // #2 -void OMXToolBasicAV_SetStreamEGLImageTexture2D(OMXToolBasicAV_t * pOMXAV, KDint i, GLuint tex, EGLImageKHR image, EGLSyncKHR sync); // #3 +void OMXToolBasicAV_SetStreamEGLImageTexture2D(OMXToolBasicAV_t * pOMXAV, GLuint tex, EGLImageKHR image, EGLSyncKHR sync); // #3 void OMXToolBasicAV_ActivateStream(OMXToolBasicAV_t * pOMXAV); // #4 void OMXToolBasicAV_AttachVideoRenderer(OMXToolBasicAV_t * pOMXAV); // Stop, DetachVideoRenderer, SetEGLImageTexture2D .. before .. -- cgit v1.2.3