VAProcFilterNone isn't a actual filter

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

diff --git a/src/gen75_picture_process.c b/src/gen75_picture_process.c
index fd437f5..e2344aa 100644 (file)
--- a/src/gen75_picture_process.c
+++ b/src/gen75_picture_process.c
@@ -172,11 +172,9 @@ gen75_proc_picture(VADriverContextP ctx,
        VAProcFilterParameterBuffer* filter =
            (VAProcFilterParameterBuffer*)obj_buf-> buffer_store->buffer;
 
-       if(filter->type == VAProcFilterNone){ 
-           gen75_vpp_fmt_cvt(ctx, profile, codec_state, hw_context);
-       } else if(filter->type == VAProcFilterNoiseReduction   ||
-                 filter->type == VAProcFilterDeinterlacing    ||
-                 filter->type == VAProcFilterColorBalance){
+       if (filter->type == VAProcFilterNoiseReduction   ||
+           filter->type == VAProcFilterDeinterlacing    ||
+           filter->type == VAProcFilterColorBalance){
            gen75_vpp_vebox(ctx, proc_ctx);
        }else if(filter->type == VAProcFilterSharpening){
            assert(obj_src_surf->fourcc == VA_FOURCC('N','V','1','2') && 
@@ -205,8 +203,7 @@ gen75_proc_picture(VADriverContextP ctx,
 
              if (filter->type != VAProcFilterNoiseReduction &&
                  filter->type != VAProcFilterDeinterlacing  &&
-                 filter->type != VAProcFilterColorBalance   && 
-                 filter->type != VAProcFilterNone ){ 
+                 filter->type != VAProcFilterColorBalance) {
                  printf("Do not support multiply filters outside vebox pipeline \n");
                  assert(0);
              }

diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
index fdc0e7a..33cdb11 100755 (executable)
--- a/src/i965_drv_video.c
+++ b/src/i965_drv_video.c
@@ -4486,7 +4486,6 @@ VAStatus i965_QueryVideoProcFilters(
     }
 
     if(IS_HASWELL(i965->intel.device_id)){
-        filters[i++] = VAProcFilterNone;
         filters[i++] = VAProcFilterSharpening;
         filters[i++] = VAProcFilterColorBalance;
     }