Use IMC3 for JPEG decoding

To match the pre-defined VA FOURCC in va.h

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>

diff --git a/src/gen75_mfd.c b/src/gen75_mfd.c
index 0194d6f..6c6c4ff 100644 (file)
--- a/src/gen75_mfd.c
+++ b/src/gen75_mfd.c
@@ -2213,7 +2213,7 @@ gen75_mfd_jpeg_decode_init(VADriverContextP ctx,
 
     /* Current decoded picture */
     obj_surface = decode_state->render_object;
-    i965_check_alloc_surface_bo(ctx, obj_surface, 1, VA_FOURCC('I','M','C','1'), subsampling);
+    i965_check_alloc_surface_bo(ctx, obj_surface, 1, VA_FOURCC('I','M','C','3'), subsampling);
 
     dri_bo_unreference(gen7_mfd_context->pre_deblocking_output.bo);
     gen7_mfd_context->pre_deblocking_output.bo = obj_surface->bo;

diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c
index b89b576..1600fe0 100755 (executable)
--- a/src/gen7_mfd.c
+++ b/src/gen7_mfd.c
@@ -1840,7 +1840,7 @@ gen7_mfd_jpeg_decode_init(VADriverContextP ctx,
 
     /* Current decoded picture */
     obj_surface = decode_state->render_object;
-    i965_check_alloc_surface_bo(ctx, obj_surface, 1, VA_FOURCC('I','M','C','1'), subsampling);
+    i965_check_alloc_surface_bo(ctx, obj_surface, 1, VA_FOURCC('I','M','C','3'), subsampling);
 
     dri_bo_unreference(gen7_mfd_context->pre_deblocking_output.bo);
     gen7_mfd_context->pre_deblocking_output.bo = obj_surface->bo;

diff --git a/src/i965_output_wayland.c b/src/i965_output_wayland.c
index fb07b0a..be7f32c 100644 (file)
--- a/src/i965_output_wayland.c
+++ b/src/i965_output_wayland.c
@@ -249,6 +249,7 @@ va_GetSurfaceBufferWl(
     case VA_FOURCC('Y','V','1','2'):
     case VA_FOURCC('I','4','2','0'):
     case VA_FOURCC('I','M','C','1'):
+    case VA_FOURCC('I','M','C','3'):
         switch (obj_surface->subsampling) {
         case SUBSAMPLE_YUV411:
             drm_format = WL_DRM_FORMAT_YUV411;