From patchwork Tue Jan 22 01:08:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zachary Zhou X-Patchwork-Id: 11814 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 36BB144C54F for ; Tue, 22 Jan 2019 03:08:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 52B1E68A6FF; Tue, 22 Jan 2019 03:08:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5724368A590 for ; Tue, 22 Jan 2019 03:08:19 +0200 (EET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Jan 2019 17:08:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,504,1539673200"; d="scan'208";a="312268085" Received: from unknown (HELO u18-kbl-zz.sh.intel.com) ([10.239.13.23]) by fmsmga006.fm.intel.com with ESMTP; 21 Jan 2019 17:08:33 -0800 From: Zachary Zhou To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Jan 2019 09:08:35 +0800 Message-Id: <20190122010835.2299-1-zachary.zhou@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH V1] avfilter: clean vaapi vpp code X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: zachary.zhou@intel.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" params.pipeline_flags: https://github.com/intel/libva/blob/master/va/va_vpp.h#L503-L529 params.filter_flags: https://github.com/intel/libva/blob/master/va/va.h#L217-L220 Signed-off-by: Zachary Zhou --- libavfilter/vf_deinterlace_vaapi.c | 4 ---- libavfilter/vf_misc_vaapi.c | 10 +++------- libavfilter/vf_procamp_vaapi.c | 5 +---- libavfilter/vf_scale_vaapi.c | 2 -- 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/libavfilter/vf_deinterlace_vaapi.c b/libavfilter/vf_deinterlace_vaapi.c index 97aee6588f..36adeebeb7 100644 --- a/libavfilter/vf_deinterlace_vaapi.c +++ b/libavfilter/vf_deinterlace_vaapi.c @@ -255,13 +255,9 @@ static int deint_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame) params.surface_color_standard = ff_vaapi_vpp_colour_standard(input_frame->colorspace); - params.output_region = NULL; params.output_background_color = VAAPI_VPP_BACKGROUND_BLACK; params.output_color_standard = params.surface_color_standard; - params.pipeline_flags = 0; - params.filter_flags = VA_FRAME_PICTURE; - if (!ctx->auto_enable || input_frame->interlaced_frame) { vas = vaMapBuffer(vpp_ctx->hwctx->display, vpp_ctx->filter_buffers[0], &filter_params_addr); diff --git a/libavfilter/vf_misc_vaapi.c b/libavfilter/vf_misc_vaapi.c index e227c9ff6b..df32478a09 100644 --- a/libavfilter/vf_misc_vaapi.c +++ b/libavfilter/vf_misc_vaapi.c @@ -164,10 +164,9 @@ static int misc_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame) .height = input_frame->height, }; - if (vpp_ctx->nb_filter_buffers) { - params.filters = &vpp_ctx->filter_buffers[0]; - params.num_filters = vpp_ctx->nb_filter_buffers; - } + params.filters = &vpp_ctx->filter_buffers[0]; + params.num_filters = vpp_ctx->nb_filter_buffers; + params.surface = input_surface; params.surface_region = &input_region; params.surface_color_standard = @@ -177,9 +176,6 @@ static int misc_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame) params.output_background_color = VAAPI_VPP_BACKGROUND_BLACK; params.output_color_standard = params.surface_color_standard; - params.pipeline_flags = 0; - params.filter_flags = VA_FRAME_PICTURE; - err = ff_vaapi_vpp_render_picture(avctx, ¶ms, output_surface); if (err < 0) goto fail; diff --git a/libavfilter/vf_procamp_vaapi.c b/libavfilter/vf_procamp_vaapi.c index 46f3ab6465..e528dc5f5e 100644 --- a/libavfilter/vf_procamp_vaapi.c +++ b/libavfilter/vf_procamp_vaapi.c @@ -174,11 +174,8 @@ static int procamp_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame params.output_background_color = VAAPI_VPP_BACKGROUND_BLACK; params.output_color_standard = params.surface_color_standard; - params.pipeline_flags = 0; - params.filter_flags = VA_FRAME_PICTURE; - params.filters = &vpp_ctx->filter_buffers[0]; - params.num_filters = 1; + params.num_filters = vpp_ctx->nb_filter_buffers; err = ff_vaapi_vpp_render_picture(avctx, ¶ms, output_surface); if (err < 0) diff --git a/libavfilter/vf_scale_vaapi.c b/libavfilter/vf_scale_vaapi.c index 3699363140..9fcf44d2f8 100644 --- a/libavfilter/vf_scale_vaapi.c +++ b/libavfilter/vf_scale_vaapi.c @@ -132,11 +132,9 @@ static int scale_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame) params.surface_color_standard = ff_vaapi_vpp_colour_standard(input_frame->colorspace); - params.output_region = 0; params.output_background_color = VAAPI_VPP_BACKGROUND_BLACK; params.output_color_standard = params.surface_color_standard; - params.pipeline_flags = 0; params.filter_flags = ctx->mode; err = ff_vaapi_vpp_render_picture(avctx, ¶ms, output_surface);