[vlc-devel] [PATCH] omxil: Add a prefix to the iomx function symbols

[Rafaël Carré]

Le 2012-01-24 02:27, Martin Storsjö a écrit :
> On some devices (apparently froyo and earlier), some OMX core
> (with sw-only codecs) already is loaded into the process, and
> dlsym(RTLD_DEFAULT) can just as well return functions from that
> one instead of the ones from the iomx wrapper that we've loaded.
> 
> This makes sure we really get the functions we want.
> ---
>  modules/codec/omxil/iomx.cpp |   16 ++++++++++------
>  modules/codec/omxil/omxil.c  |    2 +-
>  2 files changed, 11 insertions(+), 7 deletions(-)
> 
> diff --git a/modules/codec/omxil/iomx.cpp b/modules/codec/omxil/iomx.cpp
> index ccc4abb..1316c0b 100644
> --- a/modules/codec/omxil/iomx.cpp
> +++ b/modules/codec/omxil/iomx.cpp
> @@ -29,6 +29,8 @@
>  #include <binder/MemoryDealer.h>
>  #include <OMX_Component.h>
>  
> +#define PREFIX(x) I ## x

shouldn't we use "vlc" ?

> +
>  using namespace android;
>  
>  class IOMXContext {
> @@ -270,7 +272,8 @@ static OMX_ERRORTYPE iomx_set_config(OMX_HANDLETYPE component, OMX_INDEXTYPE ind
>      return get_error(ctx->iomx->setConfig(node->node, index, param, sizeof(OMX_BOOL)));
>  }
>  
> -OMX_ERRORTYPE OMX_GetHandle(OMX_HANDLETYPE *handle_ptr, OMX_STRING component_name, OMX_PTR app_data, OMX_CALLBACKTYPE *callbacks)
> +extern "C" {

not related? is that needed though?