VPP/HSW: don't use VAProcFilterColorStandard

VAProcFilterColorStandard will be removed from va_vpp.h

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

diff --git a/src/gen75_vpp_vebox.c b/src/gen75_vpp_vebox.c
index bf65aae..e4991a6 100644 (file)
--- a/src/gen75_vpp_vebox.c
+++ b/src/gen75_vpp_vebox.c
@@ -1084,12 +1084,14 @@ VAStatus gen75_vebox_process_picture(VADriverContextP ctx,
              proc_ctx->filters_mask |= VPP_IECP_PRO_AMP;
              proc_ctx->filter_iecp_amp = filter;
              proc_ctx->filter_iecp_amp_num_elements = obj_buf->num_elements;
-         } else if (filter->type == VAProcFilterColorStandard){
-             proc_ctx->filters_mask |= VPP_IECP_CSC;
-             proc_ctx->filter_iecp_csc = filter;
-         } 
+         }
     }
 
+    if (pipe->surface_color_standard != VAProcColorStandardNone &&
+        pipe->output_color_standard != VAProcColorStandardNone &&
+        pipe->surface_color_standard != pipe->output_color_standard)
+        proc_ctx->filters_mask |= VPP_IECP_CSC;
+
     hsw_veb_pre_format_convert(ctx, proc_ctx);
     hsw_veb_surface_reference(ctx, proc_ctx);
 

diff --git a/src/gen75_vpp_vebox.h b/src/gen75_vpp_vebox.h
index d192898..668f4c8 100644 (file)
--- a/src/gen75_vpp_vebox.h
+++ b/src/gen75_vpp_vebox.h
@@ -135,7 +135,6 @@ struct intel_vebox_context
     void * filter_iecp_ace;
     void * filter_iecp_tcc;
     void * filter_iecp_amp;
-    void * filter_iecp_csc;
 
     unsigned int  filter_iecp_amp_num_elements;
     unsigned char format_convert_flags;