Commit 2ff4954e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

OMX: rename GetVlcAudioFormat to OmxToVlcAudioFormat

parent 7ad0c654
...@@ -338,7 +338,7 @@ static OMX_ERRORTYPE SetPortDefinition(decoder_t *p_dec, OmxPort *p_port, ...@@ -338,7 +338,7 @@ static OMX_ERRORTYPE SetPortDefinition(decoder_t *p_dec, OmxPort *p_port,
} }
else else
{ {
if( !GetVlcAudioFormat(def->format.audio.eEncoding, if( !OmxToVlcAudioFormat(def->format.audio.eEncoding,
&p_fmt->i_codec, 0 ) ) &p_fmt->i_codec, 0 ) )
{ {
omx_error = OMX_ErrorNotImplemented; omx_error = OMX_ErrorNotImplemented;
...@@ -448,7 +448,7 @@ static OMX_ERRORTYPE GetPortDefinition(decoder_t *p_dec, OmxPort *p_port, ...@@ -448,7 +448,7 @@ static OMX_ERRORTYPE GetPortDefinition(decoder_t *p_dec, OmxPort *p_port,
break; break;
case AUDIO_ES: case AUDIO_ES:
if( !GetVlcAudioFormat( def->format.audio.eEncoding, if( !OmxToVlcAudioFormat( def->format.audio.eEncoding,
&p_fmt->i_codec, 0 ) ) &p_fmt->i_codec, 0 ) )
{ {
omx_error = OMX_ErrorNotImplemented; omx_error = OMX_ErrorNotImplemented;
......
...@@ -155,7 +155,7 @@ int GetVlcVideoFormat( OMX_VIDEO_CODINGTYPE i_omx_codec, ...@@ -155,7 +155,7 @@ int GetVlcVideoFormat( OMX_VIDEO_CODINGTYPE i_omx_codec,
int GetOmxAudioFormat( vlc_fourcc_t i_fourcc, int GetOmxAudioFormat( vlc_fourcc_t i_fourcc,
OMX_AUDIO_CODINGTYPE *pi_omx_codec, OMX_AUDIO_CODINGTYPE *pi_omx_codec,
const char **ppsz_name ); const char **ppsz_name );
int GetVlcAudioFormat( OMX_AUDIO_CODINGTYPE i_omx_codec, int OmxToVlcAudioFormat( OMX_AUDIO_CODINGTYPE i_omx_codec,
vlc_fourcc_t *pi_fourcc, const char **ppsz_name ); vlc_fourcc_t *pi_fourcc, const char **ppsz_name );
const char *GetOmxRole( vlc_fourcc_t i_fourcc, int i_cat, bool b_enc ); const char *GetOmxRole( vlc_fourcc_t i_fourcc, int i_cat, bool b_enc );
int GetOmxChromaFormat( vlc_fourcc_t i_fourcc, int GetOmxChromaFormat( vlc_fourcc_t i_fourcc,
......
...@@ -426,7 +426,7 @@ int GetOmxAudioFormat( vlc_fourcc_t i_fourcc, ...@@ -426,7 +426,7 @@ int GetOmxAudioFormat( vlc_fourcc_t i_fourcc,
return !!audio_format_table[i].i_codec; return !!audio_format_table[i].i_codec;
} }
int GetVlcAudioFormat( OMX_AUDIO_CODINGTYPE i_omx_codec, int OmxToVlcAudioFormat( OMX_AUDIO_CODINGTYPE i_omx_codec,
vlc_fourcc_t *pi_fourcc, const char **ppsz_name ) vlc_fourcc_t *pi_fourcc, const char **ppsz_name )
{ {
unsigned int i; unsigned int i;
...@@ -875,7 +875,7 @@ void PrintOmx(decoder_t *p_dec, OMX_HANDLETYPE omx_handle, OMX_U32 i_port) ...@@ -875,7 +875,7 @@ void PrintOmx(decoder_t *p_dec, OMX_HANDLETYPE omx_handle, OMX_U32 i_port)
case OMX_PortDomainAudio: case OMX_PortDomainAudio:
GetVlcAudioFormat( definition.format.audio.eEncoding, OmxToVlcAudioFormat( definition.format.audio.eEncoding,
&i_fourcc, &psz_name ); &i_fourcc, &psz_name );
GetAudioParameters(omx_handle, &format_param, GetAudioParameters(omx_handle, &format_param,
......
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