[Libva] [libva-intel-driver PATCH] Replace --enable-wrapper with --enable-hybrid-codec

[Zhao Yakui]

On 09/09/2015 12:25 PM, Xiang, Haihao wrote:
> hybrid-codec is more meaningful.

This looks good to me.

Thanks.
    Yakui
>
> Signed-off-by: Xiang, Haihao<haihao.xiang at intel.com>
> ---
>   configure.ac         | 14 ++++++--------
>   src/i965_drv_video.c |  4 ++--
>   2 files changed, 8 insertions(+), 10 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 6f1a66a..993a529 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -56,10 +56,10 @@ AC_ARG_ENABLE([wayland],
>                       [build with VA/Wayland API support @<:@default=yes@:>@])],
>       [], [enable_wayland="yes"])
>
> -AC_ARG_ENABLE([wrapper],
> -    [AC_HELP_STRING([--enable-wrapper],
> -                    [build with hybrid_wrapper support @<:@default=no@:>@])],
> -    [], [enable_wrapper="no"])
> +AC_ARG_ENABLE([hybrid-codec],
> +    [AC_HELP_STRING([--enable-hybrid-codec],
> +                    [build with hybrid codec support @<:@default=no@:>@])],
> +    [], [enable_hybrid_codec="no"])
>
>   AC_DISABLE_STATIC
>   AC_PROG_LIBTOOL
> @@ -112,10 +112,8 @@ if test "$USE_DRM" = "yes"; then
>   fi
>   AM_CONDITIONAL(USE_DRM, test "$USE_DRM" = "yes")
>
> -USE_WRAPPER="no"
> -if test "$enable_wrapper" = "yes"; then
> -    USE_WRAPPER="yes"
> -    AC_DEFINE([HAVE_USE_WRAPPER], [1], [Defined to 1 if hybrid_wrapper is needed])
> +if test "$enable_hybrid_codec" = "yes"; then
> +    AC_DEFINE([HAVE_HYBRID_CODEC], [1], [Defined to 1 if hybrid codec is needed])
>   fi
>
>   VA_VERSION=`$PKG_CONFIG --modversion libva`
> diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
> index 361441b..4ea6d2c 100644
> --- a/src/i965_drv_video.c
> +++ b/src/i965_drv_video.c
> @@ -6180,7 +6180,7 @@ error:
>    * to initialize/load the wrapper context of backend driver.
>    * Otherwise it is not loaded.
>    */
> -#if HAVE_USE_WRAPPER
> +#if HAVE_HYBRID_CODEC
>
>   static VAStatus
>   i965_initialize_wrapper(VADriverContextP ctx, const char *driver_name)
> @@ -6330,7 +6330,7 @@ i965_Init(VADriverContextP ctx)
>           if (i965->codec_info&&  i965->codec_info->preinit_hw_codec)
>               i965->codec_info->preinit_hw_codec(ctx, i965->codec_info);
>
> -#if HAVE_USE_WRAPPER
> +#if HAVE_HYBRID_CODEC
>           i965_initialize_wrapper(ctx, "hybrid");
>   #endif
>