summaryrefslogtreecommitdiffstats
path: root/src/jogl/native/openmax/omx_tool.c
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-04-02 08:36:38 +0200
committerSven Gothel <[email protected]>2012-04-02 08:36:38 +0200
commit5911b729b69b7fb327e441b33f22eb1ef31a03df (patch)
tree21d91c7d84bc99e6341029e9d233d37f5a1adc23 /src/jogl/native/openmax/omx_tool.c
parentde2b129a56335262a44a05541a3ab2e35668cc6e (diff)
Initial commit for AudioVideo (com.jogamp.opengl.av) rework, introducing Android API 14 MediaPlayer impl of GLMediaPlayer.
Android API 14 MediaPlayer allows usage of OMX AL direct decode to texture via libstagefright (OMX AL usage included). Status: Untested, not working - Need to fix native OMX IL (stream detect and split) and/or GStreamer implementation.
Diffstat (limited to 'src/jogl/native/openmax/omx_tool.c')
-rw-r--r--src/jogl/native/openmax/omx_tool.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/jogl/native/openmax/omx_tool.c b/src/jogl/native/openmax/omx_tool.c
index 57fa8ad21..1f2ce7da7 100644
--- a/src/jogl/native/openmax/omx_tool.c
+++ b/src/jogl/native/openmax/omx_tool.c
@@ -627,14 +627,14 @@ static int StartClock(OMXToolBasicAV_t * pOMXAV, KDboolean start, KDfloat32 time
return (OMX_ErrorNotReady == eError)?-1:0;
}
-static KDfloat32 GetClockPosition(OMXToolBasicAV_t * pOMXAV)
+static KDint GetClockPosition(OMXToolBasicAV_t * pOMXAV)
{
OMX_TIME_CONFIG_TIMESTAMPTYPE stamp;
INIT_PARAM(stamp);
stamp.nPortIndex = 0;
OMX_GetConfig(pOMXAV->comp[OMXAV_H_CLOCK], OMX_IndexConfigTimeCurrentMediaTime, &stamp);
- return (KDfloat32) (stamp.nTimestamp * (1.0f/(1000.0f*1000.0f)));
+ return (int) ( stamp.nTimestamp / 1000 );
}
static KDfloat32 GetClockScale(OMXToolBasicAV_t * pOMXAV)
@@ -1474,7 +1474,7 @@ GLuint OMXToolBasicAV_GetNextTextureID(OMXToolBasicAV_t * pOMXAV) {
return texID;
}
-KDfloat32 OMXToolBasicAV_GetCurrentPosition(OMXToolBasicAV_t * pOMXAV) {
+KDint OMXToolBasicAV_GetCurrentPosition(OMXToolBasicAV_t * pOMXAV) {
KDfloat32 res = -1.0f;
if(NULL==pOMXAV) {
java_throwNewRuntimeException(0, "OMX instance null\n");