From: Li Xiaowei <xiaowei.a.li@intel.com>
Date: Sat, 5 Jan 2013 03:02:18 +0000 (+0800)
Subject: VEBOX: clean supported fourcc format in VPP pipeline
X-Git-Tag: submit/upstream/20130321.072122~53
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c94e85adc8df3b7710309df825e2b89f605e9ad7;p=profile%2Fivi%2Fvaapi-intel-driver.git

VEBOX: clean supported fourcc format in VPP pipeline

clean up the supported surface format at the begining
and the ending of post processing pipepile, these formats
will be convertd to/from vebox supported formats.

Signed-off-by: Li Xiaowei <xiaowei.a.li@intel.com>
---

diff --git a/src/gen75_vpp_vebox.c b/src/gen75_vpp_vebox.c
index 33c292d..64809c7 100644
--- a/src/gen75_vpp_vebox.c
+++ b/src/gen75_vpp_vebox.c
@@ -962,16 +962,16 @@ int hsw_veb_pre_format_convert(VADriverContextP ctx,
 
      /* convert the following format to NV12 format */
      if(obj_surf_input->fourcc ==  VA_FOURCC('Y','V','1','2') ||
-           obj_surf_input->fourcc ==  VA_FOURCC('I','4','2','0') ||
-           obj_surf_input->fourcc ==  VA_FOURCC('I','M','C','1') ||
-           obj_surf_input->fourcc ==  VA_FOURCC('I','M','C','2')){
+        obj_surf_input->fourcc ==  VA_FOURCC('I','4','2','0') ||
+        obj_surf_input->fourcc ==  VA_FOURCC('I','M','C','1') ||
+        obj_surf_input->fourcc ==  VA_FOURCC('I','M','C','3')){
 
          proc_ctx->format_convert_flags |= PRE_FORMAT_CONVERT;
 
       } else if(obj_surf_input->fourcc ==  VA_FOURCC('R','G','B','A') ||
-               obj_surf_input->fourcc ==  VA_FOURCC('A','Y','U','V') ||
-               obj_surf_input->fourcc ==  VA_FOURCC('Y','U','Y','2') ||
-               obj_surf_input->fourcc ==  VA_FOURCC('N','V','1','2')){
+                obj_surf_input->fourcc ==  VA_FOURCC('A','Y','U','V') ||
+                obj_surf_input->fourcc ==  VA_FOURCC('Y','U','Y','2') ||
+                obj_surf_input->fourcc ==  VA_FOURCC('N','V','1','2')){
                 // nothing to do here
      } else {
            /* not support other format as input */ 
@@ -998,7 +998,7 @@ int hsw_veb_pre_format_convert(VADriverContextP ctx,
      if(obj_surf_output->fourcc ==  VA_FOURCC('Y','V','1','2') ||
         obj_surf_output->fourcc ==  VA_FOURCC('I','4','2','0') ||
         obj_surf_output->fourcc ==  VA_FOURCC('I','M','C','1') ||
-        obj_surf_output->fourcc ==  VA_FOURCC('I','M','C','2')) {  
+        obj_surf_output->fourcc ==  VA_FOURCC('I','M','C','3')) {  
 
         proc_ctx->format_convert_flags |= POST_FORMAT_CONVERT;
     } else if(obj_surf_output->fourcc ==  VA_FOURCC('R','G','B','A') ||
@@ -1074,10 +1074,12 @@ int hsw_veb_post_format_convert(VADriverContextP ctx,
 
         /* second step: color format convert and copy to output */
         struct object_surface *obj_surf = SURFACE(proc_ctx->surface_output);
-        if(obj_surf->fourcc ==  VA_FOURCC('Y','V','1','2') ||
+        if(obj_surf->fourcc ==  VA_FOURCC('N','V','1','2') ||
+           obj_surf->fourcc ==  VA_FOURCC('Y','V','1','2') ||
            obj_surf->fourcc ==  VA_FOURCC('I','4','2','0') ||
            obj_surf->fourcc ==  VA_FOURCC('Y','U','Y','2') ||
-           obj_surf->fourcc ==  VA_FOURCC('I','M','C','2')) {  
+           obj_surf->fourcc ==  VA_FOURCC('I','M','C','1') ||
+           obj_surf->fourcc ==  VA_FOURCC('I','M','C','3')) {  
            vpp_surface_convert(ctx,proc_ctx->surface_output, proc_ctx->surface_output_scaled);
        }else {
            assert(0);