From patchwork Mon May 17 03:24:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 27799 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2458180iof; Sun, 16 May 2021 20:30:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2oCVEUS61z8cnwqf38tBst7xrxi7Q/EOur4i0wmjKjZUVd/y/xDuX/MmDW1+X9D4VdfXc X-Received: by 2002:a05:6402:10c9:: with SMTP id p9mr69717775edu.268.1621222251290; Sun, 16 May 2021 20:30:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621222251; cv=none; d=google.com; s=arc-20160816; b=IpBWmA+zmxN1Uf3zQb9my/11GqmeI1w/YWcero3O3xs3X+Cl4xCzCyhZ2lgzdV8FEv Xo8SS8D+rjILKrc0x+H6KWf9IUKJF71RNIHY+fTUR+Bq5LGMpRDM8HAkYp0M2b3h/KFJ nDGYyimDyUjWPTww4DeKIIcTGTyZpbdSGkPYf6sUHeAv4QPsX1qsej/2lVtx8PlGIFRV 9hYUwNlWGwMgs/bsEsjB3eIGVScDH44jtnRev7NbXHZp7+iQ3eYXGYm6Sj0YwJrNhkHC jgx7BSFg2GbhtBBibDWsYNtOANE1xKAdPMyVB1oIguBI3hNFi7knYpzaA/Ot0/zfHJpk HQfQ== 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=TOEP7uhI9HTVoumxq374/A5o1hHFUf20LmngXG+8tMQ=; b=H7i/tnQUJS4OvwCsX/QCIwmCM9yrNHTU3B/zFrkBGYMV7QFv1bSURhGRTGz2k8QiJc ghByRQa3/CS++SXn3UjL3es2TFbeInqQMyBiZ7rmXBpKb4/LzMBiArD2dZSQBMLI1izJ WW3gW8V7d4h4p5A+adB0FlMLyYfrWvPq4g2cln2E8m4hDk9rMVNE3XRZ4Ls9e7td7eKg 1yHgw+YLWl/vC1uTcPkT5hyl6a1Sx5P3eAL2gBp2ETWyc6agy30yFwkA2J+xJyCSCNek YFLooSFmu5y1A4idsdyg6tPs6rDVuY2VSTe/umjaDK+f7/oBFrk2VRQP9Nhjbz2h9d85 gG9A== 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 l3si14863315ejd.313.2021.05.16.20.30.50; Sun, 16 May 2021 20:30:51 -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 921CF6898E0; Mon, 17 May 2021 06:28:38 +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 08551689907 for ; Mon, 17 May 2021 06:28:30 +0300 (EEST) IronPort-SDR: W1eimSHUns8EXhbju5BKxFXgA89OeTclK4OgJTc9eZXW7F2R+kw6mRlvznn2qE8xHGYq07Aa8M WxlhTuoVsKRQ== X-IronPort-AV: E=McAfee;i="6200,9189,9986"; a="187498244" X-IronPort-AV: E=Sophos;i="5.82,306,1613462400"; d="scan'208";a="187498244" 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:17 -0700 IronPort-SDR: B+y7OZShp0ozyQkwYBDaspLdIxnJV7PajY0zgJz+t0/8BDi17fvTOktuOk+8vjx0GXMynOj/mt vJmdN62cleRQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,306,1613462400"; d="scan'208";a="626277681" Received: from xhh-tgl64.sh.intel.com ([10.239.159.130]) by fmsmga006.fm.intel.com with ESMTP; 16 May 2021 20:28:16 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 May 2021 11:24:18 +0800 Message-Id: <20210517032426.3376661-15-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 14/22] lavfi/vpp_qsv: double the framerate for deinterlacing 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: pPKdDPFcLbC6 --- libavfilter/vf_vpp_qsv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index 29ba220665..ec35f85b04 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -255,10 +255,14 @@ static int config_input(AVFilterLink *inlink) int ret; int64_t ow, oh; - if (vpp->framerate.den == 0 || vpp->framerate.num == 0) + /* Ignore user's setting for framerate when deinterlacing is used */ + if (vpp->deinterlace) + vpp->framerate = av_mul_q(inlink->frame_rate, + (AVRational){ 2, 1 }); + else if (vpp->framerate.den == 0 || vpp->framerate.num == 0) vpp->framerate = inlink->frame_rate; - if (av_cmp_q(vpp->framerate, inlink->frame_rate)) + if (!vpp->deinterlace && av_cmp_q(vpp->framerate, inlink->frame_rate)) vpp->use_frc = 1; ret = eval_expr(ctx);