diff options
| author | Sven Gothel <[email protected]> | 2013-08-14 06:33:08 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-08-14 06:33:08 +0200 |
| commit | e05e3a4ec36708b35eea9a2db67f6007b68564cf (patch) | |
| tree | bfbe25d2c119434e878fbf887e0fec84bffcfdfb /src/jogl/native/openmax | |
| parent | 6332e13b2f0aa9818d37802302f04c90a4fa4239 (diff) | |
Fix regression of commit 6332e13b2f0aa9818d37802302f04c90a4fa4239 causing optional OMX to fail to compile
Diffstat (limited to 'src/jogl/native/openmax')
| -rw-r--r-- | src/jogl/native/openmax/jogamp_opengl_util_av_impl_OMXGLMediaPlayer.c | 4 | ||||
| -rw-r--r-- | src/jogl/native/openmax/omx_tool.c | 4 | ||||
| -rw-r--r-- | src/jogl/native/openmax/omx_tool.h | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/jogl/native/openmax/jogamp_opengl_util_av_impl_OMXGLMediaPlayer.c b/src/jogl/native/openmax/jogamp_opengl_util_av_impl_OMXGLMediaPlayer.c index 964ac64a7..ec68a24aa 100644 --- a/src/jogl/native/openmax/jogamp_opengl_util_av_impl_OMXGLMediaPlayer.c +++ b/src/jogl/native/openmax/jogamp_opengl_util_av_impl_OMXGLMediaPlayer.c @@ -107,11 +107,11 @@ JNIEXPORT void JNICALL Java_jogamp_opengl_util_av_impl_OMXGLMediaPlayer__1setStr } JNIEXPORT void JNICALL Java_jogamp_opengl_util_av_impl_OMXGLMediaPlayer__1setStreamEGLImageTexture2D - (JNIEnv *env, jobject instance, jlong ptr, jint i, jint tex, jlong image, jlong sync) + (JNIEnv *env, jobject instance, jlong ptr, jint tex, jlong image, jlong sync) { OMXToolBasicAV_t *pOMXAV = (OMXToolBasicAV_t *)((void *)((intptr_t)ptr)); if (pOMXAV != NULL) { - OMXToolBasicAV_SetStreamEGLImageTexture2D( pOMXAV, i, (GLuint) tex, + OMXToolBasicAV_SetStreamEGLImageTexture2D( pOMXAV, (GLuint) tex, (EGLImageKHR)(intptr_t)image, (EGLSyncKHR)(intptr_t)sync); } diff --git a/src/jogl/native/openmax/omx_tool.c b/src/jogl/native/openmax/omx_tool.c index 26a3b93f1..35d5cfa58 100644 --- a/src/jogl/native/openmax/omx_tool.c +++ b/src/jogl/native/openmax/omx_tool.c @@ -1059,7 +1059,7 @@ void OMXToolBasicAV_SetStreamEGLImageTexture2D(OMXToolBasicAV_t * pOMXAV, GLuint kdThreadMutexLock(pOMXAV->mutex); { - OMXToolImageBuffer_t *pBuf = &pOMXAV->buffers[i]; + OMXToolImageBuffer_t *pBuf = &pOMXAV->buffers[0]; // FIXME: Move all sync/buffer handling to Java - Already done -> GLMediaPlayerImpl pBuf->tex=tex; pBuf->image=image; pBuf->sync=sync; @@ -1640,7 +1640,7 @@ int ModuleTest() printf("6 eglGetError: 0x%x\n", eglGetError()); - if(OMXToolBasicAV_SetStreamEGLImageTexture2D(pOMXAV, i, tex, image, sync)) { + if(OMXToolBasicAV_SetStreamEGLImageTexture2D(pOMXAV, tex, image, sync)) { return -1; } } 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 <stdlib.h> #include <string.h> +// 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 .. |