From patchwork Mon Jan 9 07:12:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 39929 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp2884031pzb; Sun, 8 Jan 2023 23:12:41 -0800 (PST) X-Google-Smtp-Source: AMrXdXuL+7pLh51dNH6VNATd8CdlmxWR+ag0qXgZFAR76Ig3QG20lxhhaCNNP4/7J2MaJ5WAX2QI X-Received: by 2002:aa7:cf94:0:b0:47b:16f5:61dc with SMTP id z20-20020aa7cf94000000b0047b16f561dcmr55828315edx.37.1673248361457; Sun, 08 Jan 2023 23:12:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673248361; cv=none; d=google.com; s=arc-20160816; b=QavxN9HFzrL54KkN4KJwz69yvfAsPxleM7pID5H2ZZAOg7rwLVtDH8eGmLUm1lTRaO 4KY//p5Om5k63/uj+n4rHVwrlCbqh9rJXkNblypejtXULcnnVegWsJle5nNRYGQ+1Qo7 191BVriAZSIyJ2eNRR3xeBCQWTxb0wpe1xAK1nDL5BlwLb8hGe7IOPug4xAaLyqSD7a+ 93lJLqxldNIu3/iIYASRuEaDvh1Px43fLXJU6YIQUZWO7zbN+cA1OETvXlFHNbUk3uvT 61QRNaCK1nUv1s5hgebZaeng2U+QBGalirLTfIskzS6vLLz5QXFIpvl1sQ/b2i4VjwGH 96/g== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=F48UHfdrnUpfE4K/p84x7DMwF9sTMPdCgDkXI4gDt9w=; b=cKxwq5uevdhQVxvdHOBLeEFLhuNkMPdEBdz5X2Ww8QadVjTc0sp4xhpH5OXm0shqb7 Al5dNXa9EufSdaOtipHBDpNQnh+IeLHup/1rMJqzua81EBoqKw7ELWG29MaQ9LaZJDuo pRV5F6DhMXzwPglChf17syDEfJsE5LyD9iS/wF6RKt4pqLT+CPERwfyBEKHkSJH1iFbC h9DvB9s9e9QY4FHjn1MU7YMhXyqg9y+qWru0xJr8N8y5fCsGGP5tGdLjKyEK9C+l99XC IeDRGxRS7tkRDlH9+kXRJygO3El1rjhQ7hQgz/IJRu5I3HuiALr9IqHcT2Jm3nagAQKs O5xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=kM5J8tEb; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i19-20020a056402055300b0048c7fb50a40si8540894edx.321.2023.01.08.23.12.40; Sun, 08 Jan 2023 23:12:41 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=kM5J8tEb; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 96D8368BAAE; Mon, 9 Jan 2023 09:12:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 91F6968B613 for ; Mon, 9 Jan 2023 09:12:29 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673248354; x=1704784354; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=uiTia80vi+cRnnH8zWxV/kcNPhf978PRaZTgadTPWy0=; b=kM5J8tEbClflX+rQA6egYsxu/R+Woubd42tB5umGMD20vkVGGf23OHxp VVTZgb3sAKMNmVrPmzoP+8UQDWXum7xw/oNInRsgxrt9rHG4SIahUBtsS 1lLs0Pd/6VaitCypGNplBF0hQ0qwTRAsqzc6xCzjVF+iwzUjEbdSGsaqq 5q/YSlee9VduHBBBeisDGhQev44dD2oJbAz8izySA7MFwsvtU0QNXf7/J m0vASPh02o2hyerEBvFX7biWM5Uqp/4JM9k9A8zyijSOY7T5TelJxrLFl Oh3uakblSUgcJYpu1xfczVoMUdwSeO5XYOk9hbo5vye+VZ/ohSiNiRE1Y A==; X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="385110838" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="385110838" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jan 2023 23:12:26 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="745262785" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="745262785" Received: from xhh-tgl64.sh.intel.com ([10.238.2.19]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jan 2023 23:12:25 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 9 Jan 2023 15:12:03 +0800 Message-Id: <20230109071210.1829699-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/8] lavfi/vf_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: VCLB+KvG0F/1 From: Haihao Xiang Also fix the naming style in enum var_name. This is in preparation for reusing the code for other QSV filters. Signed-off-by: Haihao Xiang --- libavfilter/vf_vpp_qsv.c | 49 ++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index 317ae06c12..8d4227f841 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -150,18 +150,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, - CW, - CH, - CX, - CY, + 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_CW, + VAR_CH, + VAR_CX, + VAR_CY, + VAR_A, VAR_DAR, + VAR_SAR, VAR_VARS_NB }; @@ -193,39 +197,44 @@ 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); + CALC_EXPR(cw_expr, var_values[VAR_CW], vpp->crop_w); + CALC_EXPR(ch_expr, var_values[VAR_CH], vpp->crop_h); /* calc again in case cw is relative to ch */ - CALC_EXPR(cw_expr, var_values[CW], vpp->crop_w); + CALC_EXPR(cw_expr, var_values[VAR_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); - CALC_EXPR(cx_expr, var_values[CX], vpp->crop_x); - CALC_EXPR(cy_expr, var_values[CY], vpp->crop_y); + CALC_EXPR(cx_expr, var_values[VAR_CX], vpp->crop_x); + CALC_EXPR(cy_expr, var_values[VAR_CY], vpp->crop_y); /* calc again in case cx is relative to cy */ - CALC_EXPR(cx_expr, var_values[CX], vpp->crop_x); + CALC_EXPR(cx_expr, var_values[VAR_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: