From patchwork Fri May 14 04:53:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 27760 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp121344iof; Thu, 13 May 2021 21:57:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmcu6JE+ykGwo4uce3zRtauSEBj9VhP7hr+q3cjFggDR03mkMoIioUtvP1Yek0Du3zpD/p X-Received: by 2002:a17:906:f742:: with SMTP id jp2mr47876074ejb.199.1620968250760; Thu, 13 May 2021 21:57:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620968250; cv=none; d=google.com; s=arc-20160816; b=pmY4ck/2t/TXbme3J2bGWkur9p965QPUBxDccq/2s7Fy1/Ws1R/jmtmadqfWzXLJb+ rRCHRC8BVWr6gXIOZJx74uZ9jYQ+Oq8/76TIByDQaiwRcjmzzGnHCrv0P8AsplGSc5ey it7yr1BLT268TcvTCS+ZeLtY8FuKi+Q0ULohIvAj0Ji36WCpFkiWAUjjVcHCrVNbNH9e vaJsLEbqf42ThFOzxdd4HCyE0qINpsy6msEexc0aa0NnkfU1PxtD/SlQ10HRthPWWPOV MGhpfYZLLbybKEVcK1Rx7I2wJK7NgnW37P7FtgPIbbfPy7tjKl/vb13PAUui/6gslWpg WDuQ== 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=tmIkHybscrbEMj9FSz7G/V13eZHEHj6dehEjvIG6uSD+Iw6yggpZjw8TrpCxlTAYUR x9d9+bmdqpyn1Wgofy392KF0+rHh8xxh+fPxPzexsByvxgvgg0XjWIHob2i17YrT5ceR 9m7dh80oWb2vwhtOdrr4IYvmyuqqnqn1p2kcL5J0cVv2+d3wOnOlsWlm2bSOSlwOJ8u1 gpN31o3Si4skFqvx473PufSnMmy1oAqyXM7+ttMrODQzgJPaL5Ak00j+NX+yrR4bDUOW 0N0NBcIALHJoV+lYrtJVOeuXY//yrDU/m7xTvf/FCm9+MDKaC7s5iJM63EHTcrX4UxcH 9XuQ== 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 c14si5425517edr.0.2021.05.13.21.57.30; Thu, 13 May 2021 21:57:30 -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 167676898DF; Fri, 14 May 2021 07:54:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1972068814B for ; Fri, 14 May 2021 07:54:47 +0300 (EEST) IronPort-SDR: lbFKkCiTNhOaZRYxnvFkdZ+VnWAkLlgKJHJp4Gu/HqddiKEVuLT+PpD+ZasYtVWyMoIF617vCb qQo+6xKfyyUw== X-IronPort-AV: E=McAfee;i="6200,9189,9983"; a="179711909" X-IronPort-AV: E=Sophos;i="5.82,299,1613462400"; d="scan'208";a="179711909" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2021 21:54:39 -0700 IronPort-SDR: SZ1UAfRLT95L70tzt1NkebaIJwp5mEkZ+RD1GX4JrNigSrFxSv7Es5DZ1dzZYVuntD3Nm28UpX Xt5Ofl+7nRiw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,299,1613462400"; d="scan'208";a="626673112" Received: from xhh-tgl64.sh.intel.com ([10.239.159.130]) by fmsmga005.fm.intel.com with ESMTP; 13 May 2021 21:54:37 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 May 2021 12:53:52 +0800 Message-Id: <20210514045400.3277256-15-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 14/22] lavf/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: m6hVKDKaVO8S --- 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);