From patchwork Mon May 17 03:24:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 27803 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2457256iof; Sun, 16 May 2021 20:29:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyTtn81fK0PLNoETjbL95FTEfKZT9G7yHsDpSEwGrQfRZ60ouEV2urk/1zM8mLH9jWR9QYB X-Received: by 2002:a17:906:24c7:: with SMTP id f7mr10386629ejb.511.1621222148262; Sun, 16 May 2021 20:29:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621222148; cv=none; d=google.com; s=arc-20160816; b=YBJf8AFi16ncehLVoNTFM0n+YhsQ+I5HIIRe+udFmp5+G210S014YrcB7p53pYUG4t CAKzk5ocqE2Y40+rBLSh0T7KEDVZS3X6Y3wvMje/hgW5DM1h62t8USoel3aoTW4Dz6B0 t/SdRRKHRAoZrx16a04giUinPnSScfdrfG5wdAM7AOHXxUMsytVLbXHHVrBiq4HCJh1R aM9QFyb7198kDR1blGf6ZGw6gwmx7byP6s9r3tI8tNs0yIIYdyfF6CeHvk9lYkPEwUT5 ZprewBcGFfPKOeyAlkDhm04V4TPXlw4wvYqqbMeKXebYPVDOQpKXXQwq8n34EIcCc13K W51w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:ironport-sdr:ironport-sdr:delivered-to; bh=d/YxUnDXRxiI3rqUlwC2YwYdgbQBdV8XPEYKs44zSzo=; b=rU8vTxbi79FDVgyHyBX75i7G1BGh6CDwA6lApKdLSqmEqNvFaZHuWEE9xB7xpazCDE u0jOo5J53ug0AQFOJ+G9GCrdlI6ypTKwF50DHd7hRb+hYA9olU+31GF5d4N1RKso60vk H8wybLGTYl7YyyQNU/qVpXqs4sDoLJAGkvIJ4/Mj37TcAWkbjLm7f9RBv72H+ijsWcrf IodDsyAQtnXv1L3qU0eBhgHjn16og6EEXvInuybGmYBncn6dGPWOhxgXfRgn4gC+1LG8 MiVvH5/qO58fEMc/Z0nP99dmbmRIrZcZEpcrTYS71WK+kJlCl753x4TXJKX/Nw2uMScy vicw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z26si1957841ejr.452.2021.05.16.20.29.07; Sun, 16 May 2021 20:29:08 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 23FC7689248; Mon, 17 May 2021 06:28:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3984687FED for ; Mon, 17 May 2021 06:28:17 +0300 (EEST) IronPort-SDR: O2ELKVBpbOdaVjtOtSuEwE4ealAb/JSgKEpYJ2vxMPwZZ0CPphVHTRh3yQsNUk02/JlU3OZ+rt IBDAXZk7AK8Q== X-IronPort-AV: E=McAfee;i="6200,9189,9986"; a="187498233" X-IronPort-AV: E=Sophos;i="5.82,306,1613462400"; d="scan'208";a="187498233" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2021 20:28:08 -0700 IronPort-SDR: lw6EunqNptRy/S7vtm8dwn4L0K+OMHro+coArryvkYQrGEn4hLfNrBWgrU1YIJwiGzMt3D6BoW FWsI+d0houhw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,306,1613462400"; d="scan'208";a="626277618" Received: from xhh-tgl64.sh.intel.com ([10.239.159.130]) by fmsmga006.fm.intel.com with ESMTP; 16 May 2021 20:28:07 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 May 2021 11:24:08 +0800 Message-Id: <20210517032426.3376661-5-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210517032426.3376661-1-haihao.xiang@intel.com> References: <20210517032426.3376661-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 04/22] lavfi/vpp_qsv: add "a", "dar" and "sar" variables X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zj1eSqYoZv4R Also fix the coding style for VAR index. This is in preparation for re-using VPPContext for scale_qsv filter --- libavfilter/vf_vpp_qsv.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index 72df8a8373..e7d2c9385a 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -141,18 +141,22 @@ static const char *const var_names[] = { "ch", "cx", "cy", + "a", "dar", + "sar", NULL }; enum var_name { - VAR_iW, VAR_IN_W, - VAR_iH, VAR_IN_H, - VAR_oW, VAR_OUT_W, VAR_W, - VAR_oH, VAR_OUT_H, VAR_H, + VAR_IW, VAR_IN_W, + VAR_IH, VAR_IN_H, + VAR_OW, VAR_OUT_W, VAR_W, + VAR_OH, VAR_OUT_H, VAR_H, CW, CH, CX, CY, + VAR_A, VAR_DAR, + VAR_SAR, VAR_VARS_NB }; @@ -184,12 +188,17 @@ static int eval_expr(AVFilterContext *ctx) PASS_EXPR(cx_expr, vpp->cx); PASS_EXPR(cy_expr, vpp->cy); - var_values[VAR_iW] = + var_values[VAR_IW] = var_values[VAR_IN_W] = ctx->inputs[0]->w; - var_values[VAR_iH] = + var_values[VAR_IH] = var_values[VAR_IN_H] = ctx->inputs[0]->h; + var_values[VAR_A] = (double)var_values[VAR_IN_W] / var_values[VAR_IN_H]; + var_values[VAR_SAR] = ctx->inputs[0]->sample_aspect_ratio.num ? + (double)ctx->inputs[0]->sample_aspect_ratio.num / ctx->inputs[0]->sample_aspect_ratio.den : 1; + var_values[VAR_DAR] = var_values[VAR_A] * var_values[VAR_SAR]; + /* crop params */ CALC_EXPR(cw_expr, var_values[CW], vpp->crop_w); CALC_EXPR(ch_expr, var_values[CH], vpp->crop_h); @@ -198,15 +207,15 @@ static int eval_expr(AVFilterContext *ctx) CALC_EXPR(cw_expr, var_values[CW], vpp->crop_w); CALC_EXPR(w_expr, - var_values[VAR_OUT_W] = var_values[VAR_oW] = var_values[VAR_W], + var_values[VAR_OUT_W] = var_values[VAR_OW] = var_values[VAR_W], vpp->out_width); CALC_EXPR(h_expr, - var_values[VAR_OUT_H] = var_values[VAR_oH] = var_values[VAR_H], + var_values[VAR_OUT_H] = var_values[VAR_OH] = var_values[VAR_H], vpp->out_height); /* calc again in case ow is relative to oh */ CALC_EXPR(w_expr, - var_values[VAR_OUT_W] = var_values[VAR_oW] = var_values[VAR_W], + var_values[VAR_OUT_W] = var_values[VAR_OW] = var_values[VAR_W], vpp->out_width); @@ -216,7 +225,7 @@ static int eval_expr(AVFilterContext *ctx) /* calc again in case cx is relative to cy */ CALC_EXPR(cx_expr, var_values[CX], vpp->crop_x); - if ((vpp->crop_w != var_values[VAR_iW]) || (vpp->crop_h != var_values[VAR_iH])) + if ((vpp->crop_w != var_values[VAR_IW]) || (vpp->crop_h != var_values[VAR_IH])) vpp->use_crop = 1; release: