diff options
| author | Sven Gothel <[email protected]> | 2010-11-06 06:15:21 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-11-06 06:15:21 +0100 |
| commit | 1be7b5271ec1d08b6929a88dd811754d33d149de (patch) | |
| tree | 2c321a1952035509eacc3bca1c46fa7385d31def /src/jogl/native/openmax/omx_tool.h | |
| parent | b0845ac49e7717c88b1714766518ac553751fa97 (diff) | |
Complete removal of NV KD and OMX started with 46f17013c7cd59d551371edb2c1a4a57f8cbd84f (code dependencies)
This currently removes KD fullscreen for NV devices and
the whole OMX NV stream/file type detection, which renders the OMX hack useless.
However, updated EGL sync (NV proprietary) to EGL_KHR_reusable_sync and EGL_KHR_fence_sync.
Diffstat (limited to 'src/jogl/native/openmax/omx_tool.h')
| -rw-r--r-- | src/jogl/native/openmax/omx_tool.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/jogl/native/openmax/omx_tool.h b/src/jogl/native/openmax/omx_tool.h index 1a0adf0a0..dbc375dd7 100644 --- a/src/jogl/native/openmax/omx_tool.h +++ b/src/jogl/native/openmax/omx_tool.h @@ -1,3 +1,6 @@ +/** + * Uses the EGL Extensions: EGL_KHR_reusable_sync and EGL_KHR_fence_sync + */ #ifndef _OMX_TOOL_H #define _OMX_TOOL_H @@ -27,13 +30,12 @@ #endif #include <OMX_Core.h> +#include <OMX_Component.h> #include <OMX_Index.h> -#include <OMX_Video.h> -#include <OMX_Audio.h> -#include <OMX_Other.h> -#include <OMX_Image.h> + #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> +#include <EGL/egl.h> #include <EGL/eglext.h> #include <KD/kd.h> @@ -80,6 +82,7 @@ typedef enum typedef struct { + EGLDisplay dpy; OMX_VERSIONTYPE version; OMX_HANDLETYPE comp[OMXAV_H_NUMBER]; OMX_HANDLETYPE endComponent; @@ -138,7 +141,7 @@ KDint OMXToolBasicAV_SetState(OMXToolBasicAV_t * pOMXAV, OMX_STATETYPE state, KD // // User related functionality, mutex managed // -OMXToolBasicAV_t * OMXToolBasicAV_CreateInstance(); // #1 +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_ActivateStream(OMXToolBasicAV_t * pOMXAV); // #4 |