Commit 6fe4bc62 authored by Martin Storsjö's avatar Martin Storsjö Committed by Jean-Baptiste Kempf

omxil: Make the iomx wrapper not depend on the omxil utils.c file

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 407c1ad8
...@@ -23,11 +23,6 @@ ...@@ -23,11 +23,6 @@
/***************************************************************************** /*****************************************************************************
* Preamble * Preamble
*****************************************************************************/ *****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <media/stagefright/OMXClient.h> #include <media/stagefright/OMXClient.h>
#include <media/IOMX.h> #include <media/IOMX.h>
...@@ -35,9 +30,6 @@ ...@@ -35,9 +30,6 @@
#include <OMX_Component.h> #include <OMX_Component.h>
#include "iomx.h" #include "iomx.h"
extern "C" {
#include "omxil_utils.h"
}
using namespace android; using namespace android;
...@@ -147,8 +139,32 @@ static int get_param_size(OMX_INDEXTYPE param_index) ...@@ -147,8 +139,32 @@ static int get_param_size(OMX_INDEXTYPE param_index)
return sizeof(OMX_PORT_PARAM_TYPE); return sizeof(OMX_PORT_PARAM_TYPE);
case OMX_IndexParamNumAvailableStreams: case OMX_IndexParamNumAvailableStreams:
return sizeof(OMX_PARAM_U32TYPE); return sizeof(OMX_PARAM_U32TYPE);
case OMX_IndexParamAudioPcm:
return sizeof(OMX_AUDIO_PARAM_PCMMODETYPE);
case OMX_IndexParamAudioAdpcm:
return sizeof(OMX_AUDIO_PARAM_AMRTYPE);
case OMX_IndexParamAudioAmr:
return sizeof(OMX_AUDIO_PARAM_AMRTYPE);
case OMX_IndexParamAudioG723:
return sizeof(OMX_AUDIO_PARAM_G723TYPE);
case OMX_IndexParamAudioG726:
return sizeof(OMX_AUDIO_PARAM_G726TYPE);
case OMX_IndexParamAudioG729:
return sizeof(OMX_AUDIO_PARAM_G729TYPE);
case OMX_IndexParamAudioAac:
return sizeof(OMX_AUDIO_PARAM_AACPROFILETYPE);
case OMX_IndexParamAudioMp3:
return sizeof(OMX_AUDIO_PARAM_MP3TYPE);
case OMX_IndexParamAudioSbc:
return sizeof(OMX_AUDIO_PARAM_SBCTYPE);
case OMX_IndexParamAudioVorbis:
return sizeof(OMX_AUDIO_PARAM_VORBISTYPE);
case OMX_IndexParamAudioWma:
return sizeof(OMX_AUDIO_PARAM_WMATYPE);
case OMX_IndexParamAudioRa:
return sizeof(OMX_AUDIO_PARAM_RATYPE);
default: default:
return GetAudioParamSize(param_index); return 0;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment