From patchwork Mon May 17 03:24:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 27810 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2457330iof; Sun, 16 May 2021 20:29:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvhjIitkkgt6DWkajw8O++9yJ7Rd7H9IBpul5TaqyeqC+ulsqRq31N8+4w8ErIBazweDU4 X-Received: by 2002:a17:906:600b:: with SMTP id o11mr59679361ejj.345.1621222157205; Sun, 16 May 2021 20:29:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621222157; cv=none; d=google.com; s=arc-20160816; b=hbKwR8O0EAMcgS8c7OH6EuYrJ5JcypIffRACQsuVxLAGnF8ffOeup9Iuc2gMFvU9XI pgM5YcEEPgHmt8/dyDB4F0d5jeKLmlAtauwB/EKd5Up7KTfFY1T5YPCGTxCvMdKo8izq 62sdJuCJTCkz4Uf65ia4PLcZfe3wNqmvPgO3/skHR51XcWhvSMw0mzW/uRfzD+BIIJUK xxhn52QPMYsC9edAaLklSLFIH+yN82Eyev/Qa6buKrpPa/N12cYtyxYLM23L3qzzYSsc yUAtQJME4AD3+dpgXr8yGb6TSQfjBvnH3Q5s9UF8fmaAmwtNTTba99f6cl+ty2kqYN7q qfaA== 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=50EvU/9Jk2jO9NJkew3KpTF5MD2Vy5hsK5R2ThA5Wos=; b=zJzMHcI4mO/ycCMvctDQxclfCqHRRx2pGGgJoqNS0qGdg51nRea7IIwDIAzsQ7kLSl MOfdCtaV+3onC0jwI/YoKgVmvYRNBEghcL+Dc9fYHKPbJsUOEW70u9embZz5LreSdB7d u5MX1WiYT+LUynj8Lc5eQovd0c0jwy7cp3ZdQ9oG4+Nx9byqGzbTZ+uapcICj8r+3nCX 4UUsCstkyM6ZtTu6c/YIvO2OBqDw4qpSh8mKTafRfi44iWwltcPuY9hfQDiHoxzKVb75 ohTdCqm8yBLVPrtIKJ/qK021wOkIVIBufDJT+BS/VD+6CI2Krien9k7xyTpxJ1ScRFHQ AFgg== 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 q19si14075038edv.466.2021.05.16.20.29.16; Sun, 16 May 2021 20:29:17 -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 161E4687FC5; Mon, 17 May 2021 06:28:26 +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 D5813687FED for ; Mon, 17 May 2021 06:28:19 +0300 (EEST) IronPort-SDR: 8BINiTaTvDNrq20JUq2cXajSrwhHE5eejNKxuZSQavyzycb+VjwYYGnAGPXh12+iXUPvopQpdV bUY8sqq0f7Yg== X-IronPort-AV: E=McAfee;i="6200,9189,9986"; a="187498234" X-IronPort-AV: E=Sophos;i="5.82,306,1613462400"; d="scan'208";a="187498234" 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:09 -0700 IronPort-SDR: vs6iLvLdAP3j8dWrDg2T0MK7gRuKTINtYji91Nu3AGmyMgNf4Q0FIIPCMx6G98k4FArfci4JAW kKQ0a36bR2wQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,306,1613462400"; d="scan'208";a="626277624" Received: from xhh-tgl64.sh.intel.com ([10.239.159.130]) by fmsmga006.fm.intel.com with ESMTP; 16 May 2021 20:28:08 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 May 2021 11:24:09 +0800 Message-Id: <20210517032426.3376661-6-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 05/22] lavfi/vpp_qsv: handle NULL pointer when evaluating an expression 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: H7DVguz4Giic This is in preparation for re-using VPPContext but with a different option array for scale_qsv filter --- libavfilter/vf_vpp_qsv.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index e7d2c9385a..adcfd0484d 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -163,14 +163,19 @@ enum var_name { static int eval_expr(AVFilterContext *ctx) { #define PASS_EXPR(e, s) {\ - ret = av_expr_parse(&e, s, var_names, NULL, NULL, NULL, NULL, 0, ctx); \ - if (ret < 0) {\ - av_log(ctx, AV_LOG_ERROR, "Error when passing '%s'.\n", s);\ - goto release;\ + if (s) {\ + ret = av_expr_parse(&e, s, var_names, NULL, NULL, NULL, NULL, 0, ctx); \ + if (ret < 0) { \ + av_log(ctx, AV_LOG_ERROR, "Error when passing '%s'.\n", s); \ + goto release; \ + } \ }\ } -#define CALC_EXPR(e, v, i) {\ - i = v = av_expr_eval(e, var_values, NULL); \ +#define CALC_EXPR(e, v, i, d) {\ + if (e)\ + i = v = av_expr_eval(e, var_values, NULL); \ + else\ + i = v = d;\ } VPPContext *vpp = ctx->priv; double var_values[VAR_VARS_NB] = { NAN }; @@ -200,30 +205,29 @@ static int eval_expr(AVFilterContext *ctx) 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[CW], vpp->crop_w, var_values[VAR_IW]); + CALC_EXPR(ch_expr, var_values[CH], vpp->crop_h, var_values[VAR_IH]); /* 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[CW], vpp->crop_w, var_values[VAR_IW]); CALC_EXPR(w_expr, var_values[VAR_OUT_W] = var_values[VAR_OW] = var_values[VAR_W], - vpp->out_width); + vpp->out_width, var_values[CW]); CALC_EXPR(h_expr, var_values[VAR_OUT_H] = var_values[VAR_OH] = var_values[VAR_H], - vpp->out_height); + vpp->out_height, var_values[CH]); /* 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], - vpp->out_width); + vpp->out_width, var_values[CW]); - - 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[CX], vpp->crop_x, (var_values[VAR_IW] - var_values[VAR_OW]) / 2); + CALC_EXPR(cy_expr, var_values[CY], vpp->crop_y, (var_values[VAR_IH] - var_values[VAR_OH]) / 2); /* 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[CX], vpp->crop_x, (var_values[VAR_IW] - var_values[VAR_OW]) / 2); if ((vpp->crop_w != var_values[VAR_IW]) || (vpp->crop_h != var_values[VAR_IH])) vpp->use_crop = 1;