From patchwork Fri May 14 04:53:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 27748 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp120134iof; Thu, 13 May 2021 21:55:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyVTTdentimt0q09LeDlGPx1J8+2OKHVmXMJCz7CyYpzGixuR+fLm3ng9W5PG3KmLv2Fr5Z X-Received: by 2002:a17:906:2482:: with SMTP id e2mr46569350ejb.212.1620968120692; Thu, 13 May 2021 21:55:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620968120; cv=none; d=google.com; s=arc-20160816; b=j57caQWTy68eLtLRrb+box9cxgb4QOLtxa8RRfYMn3xTqIspPEP/v1D1LZBObyO+XF 0kJBmuJt7Ib9nHDRfT2gnjW1m+JNqoTWORSZsrEOTIxX+HJ76gGYB1KkZW/ZzL0lznID VA7euygUU4oEnBfNaQNMZW/F9cMRWtDpT40T0OmtmflSRVaQ2+mgiap2sEkA/M4XrGLs cfzzjnrTn0n/HcTCj726h6BDQ3mNNZwQIQYfsWImPioydSx6d/JdETsr3PYTZAv1d25q /f3UN2ixZNYZQgCYN18rV6ynWXx8HclNT3szvsCAXRmGjbIne7pfQhO7nTUoMDEc8VTR 40fw== 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=BrTBjGA0T/NIs4qjB0eHSg637wgWj9Goex26IGSjQr+bLSnDsBj49SzOsoRSi/male d/P5tllgITb93fN8XE1ow9eHDZXN7JmZH0p8AZnuCxRFjxyv4+VjSNjAVkRJEUqv2xKc dZK3p8RnVFkMcH+4l/QAGO4NWqfTdYG5HA6VcJBO7AFOh8KdBThu1qpGuHgsjFuiDxG2 foyaehNpnStEf2dMi1+ZkjMv0z1ZifJpbJgxwfAt51gB+3QODFFqo/Qe+C7B8dFfltyb eASuAAP8NW7QpzrJWg3g8M1f2Kr3DqEZqvRem7T0/kNQVmEqOB8ExXxhLmN4kk9ZWimG K5Wg== 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 de20si4717252edb.211.2021.05.13.21.55.20; Thu, 13 May 2021 21:55:20 -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 1A95F68817C; Fri, 14 May 2021 07:54:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC758688138 for ; Fri, 14 May 2021 07:54:34 +0300 (EEST) IronPort-SDR: tmgFOj6rLZc0kBYA/37zqqROuVsDeAOI2aUxQjjmIFpIKSN62esRZnaZFacYDeJcX8kQLr/HRc kBxNiCjwktTA== X-IronPort-AV: E=McAfee;i="6200,9189,9983"; a="200165340" X-IronPort-AV: E=Sophos;i="5.82,299,1613462400"; d="scan'208";a="200165340" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2021 21:54:28 -0700 IronPort-SDR: Qzs3yFDdBUV+zVYGaohOdvc4u7PKgru+6wnE/+M8XxOnijiBIX12yPvKZk5/zANjER2R7jKXEc BAWCb8ffuTog== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,299,1613462400"; d="scan'208";a="626673068" Received: from xhh-tgl64.sh.intel.com ([10.239.159.130]) by fmsmga005.fm.intel.com with ESMTP; 13 May 2021 21:54:27 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 May 2021 12:53:42 +0800 Message-Id: <20210514045400.3277256-5-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210514045400.3277256-1-haihao.xiang@intel.com> References: <20210514045400.3277256-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/22] lavf/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: unXc6uMCoaB1 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: