[Libva] [PATCH] VPP: Fix the typo error of "VV16"

[Gwenole Beauchesne]

2014-03-18 9:35 GMT+01:00 Zhao Yakui <yakui.zhao at intel.com>:
> Thank Gwenole for finding this typo error which is caused by
> the commit 2b5fad11a5c12d3c6ffbef15c02449a3b4e90b98.

OK, but please also schedule another patch where you have
programmatically (script, command) replaced any instance of
VA_FOURCC('A','B','C','D') with VA_FOURCC_ABCD instead. And, another
patch where i965_drv_video.h (or intel_driver.h, never remember which
one -- or new: vaapi_compat.h), you define the VA_FOURCC_xxx if it was
not defined before, i.e. once and for all.

Something like
#ifndef VA_FOURCC_YV16
#define VA_FOURCC_YV16 VA_FOURCC('Y','V','1','6')
#endif

Notes:
- Don't forget any possible whitespace after the comma in the sed/perl pattern
- Commit the patch for both master and staging branches, hence the
"programatically"

Thanks,
Gwenole.

> Signed-off-by: Zhao Yakui <yakui.zhao at intel.com>
> ---
>  src/gen8_post_processing.c | 2 +-
>  src/i965_post_processing.c | 8 ++++----
>  2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/src/gen8_post_processing.c b/src/gen8_post_processing.c
> index a5b3b90..6f3afe7 100644
> --- a/src/gen8_post_processing.c
> +++ b/src/gen8_post_processing.c
> @@ -566,7 +566,7 @@ gen8_pp_set_media_rw_message_surface(VADriverContextP ctx, struct i965_post_proc
>              height[2] = obj_image->image.height / 2;
>              pitch[2] = obj_image->image.pitches[V];
>              offset[2] = obj_image->image.offsets[V];
> -            if (fourcc == VA_FOURCC('V', 'V', '1', '6')) {
> +            if (fourcc == VA_FOURCC('Y', 'V', '1', '6')) {
>                  width[1] = obj_image->image.width / 2;
>                  height[1] = obj_image->image.height;
>                  width[2] = obj_image->image.width / 2;
> diff --git a/src/i965_post_processing.c b/src/i965_post_processing.c
> index 3242257..35bc515 100755
> --- a/src/i965_post_processing.c
> +++ b/src/i965_post_processing.c
> @@ -1836,7 +1836,7 @@ pp_set_media_rw_message_surface(VADriverContextP ctx, struct i965_post_processin
>              height[2] = obj_image->image.height / 2;
>              pitch[2] = obj_image->image.pitches[2];
>              offset[2] = obj_image->image.offsets[2];
> -            if (fourcc == VA_FOURCC('V', 'V', '1', '6')) {
> +            if (fourcc == VA_FOURCC('Y', 'V', '1', '6')) {
>                  width[1] = obj_image->image.width / 2;
>                  height[1] = obj_image->image.height;
>                  width[2] = obj_image->image.width / 2;
> @@ -1885,10 +1885,10 @@ gen7_pp_set_media_rw_message_surface(VADriverContextP ctx, struct i965_post_proc
>      dri_bo *bo;
>      int fourcc = pp_get_surface_fourcc(ctx, surface);
>      const int U = (fourcc == VA_FOURCC('Y', 'V', '1', '2') ||
> -                   fourcc == VA_FOURCC('V', 'V', '1', '6') ||
> +                   fourcc == VA_FOURCC('Y', 'V', '1', '6') ||
>                     fourcc == VA_FOURCC('I', 'M', 'C', '1')) ? 2 : 1;
>      const int V = (fourcc == VA_FOURCC('Y', 'V', '1', '2') ||
> -                   fourcc == VA_FOURCC('V', 'V', '1', '6') ||
> +                   fourcc == VA_FOURCC('Y', 'V', '1', '6') ||
>                     fourcc == VA_FOURCC('I', 'M', 'C', '1')) ? 1 : 2;
>      int interleaved_uv = fourcc == VA_FOURCC('N', 'V', '1', '2');
>      int packed_yuv = (fourcc == VA_FOURCC('Y', 'U', 'Y', '2') || fourcc == VA_FOURCC('U', 'Y', 'V', 'Y'));
> @@ -1954,7 +1954,7 @@ gen7_pp_set_media_rw_message_surface(VADriverContextP ctx, struct i965_post_proc
>              height[2] = obj_image->image.height / 2;
>              pitch[2] = obj_image->image.pitches[V];
>              offset[2] = obj_image->image.offsets[V];
> -            if (fourcc == VA_FOURCC('V', 'V', '1', '6')) {
> +            if (fourcc == VA_FOURCC('Y', 'V', '1', '6')) {
>                  width[1] = obj_image->image.width / 2;
>                  height[1] = obj_image->image.height;
>                  width[2] = obj_image->image.width / 2;
> --
> 1.8.2-rc2
>
> _______________________________________________
> Libva mailing list
> Libva at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libva