From patchwork Tue Jun 15 06:13:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 28312 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3528649iol; Mon, 14 Jun 2021 23:18:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzCY6tDQmWIJZmQb5WL4+ZKkgNtqVnA7Ogi+7gutGmJzZDY5ZsDGQgTTkE8cW8geDejlvC X-Received: by 2002:a17:906:b19:: with SMTP id u25mr18677485ejg.238.1623737918718; Mon, 14 Jun 2021 23:18:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623737918; cv=none; d=google.com; s=arc-20160816; b=i8t1WICSkT51haDKQc03q89b+mrPGzp3923FUWFfSlU4zBfy4+wtgrHIHSr9uRUwcE 7RDc+2fGL08cr+yM6SqhQ+KAvSl4IBOZbDxfVV06xa7AqSOgxMKB6eZgNvESGWycPfHQ lXdAF83BHnHBmNu4y+t7ehImmHg9bEZfrXPDmNj8NiTgi0tHdp1jj9txkQE2m7D2komX /kOFLTVV4VF7tdMOZKTFqDL3yI9N4i9+BQXPhwXWaE6ZmYs3gScyOeUJVpi7T4z6fw9J v3R+mygs06j0moGvowhzKS8dsqDhh+jGzb1cTTh8/TZhZ/lJunIzYySo5TF08QshQvUK obIQ== 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=brn35WrmzxxkZx0sxsZlLTWB91vPVDo9kdVYkv/DQGI=; b=JV468bBN6qtiF2F17a+BburAeKzsWOCE9XvRqlgFXnVa22IdSuMTqBbSIZ+LOXWXk3 3Gc8r7USYdF5qpT8QK6rI2fksjtMbXn0IR7/Jnh1owJ+nDRkasHq9LZNid72zdE08lgU DnomtE5jaz0jltKD6Ztci7zjdKUY2WZyulWuYJVikHEvQzo6RFtB5TzJY2c7Bn8/dIiF Fmzf/KQHXaHpHMDK3IhOuBWH6YxcNK2NLxpzA70bXjeoBQ+nBtuahqOUGOh8KNYmBQYu +5JmRMnVE9HO2NF58m0XnuGykPUx7Yv8kpZNXVWIDROj485Lf2xof9U7oPvILkwi7oQ4 6RBQ== 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 jg15si12922402ejc.143.2021.06.14.23.18.38; Mon, 14 Jun 2021 23:18:38 -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 E476A689A4E; Tue, 15 Jun 2021 09:16:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 63A1B6891F1 for ; Tue, 15 Jun 2021 09:15:46 +0300 (EEST) IronPort-SDR: 9fuFMyVazWjqayTPhOxVlIaozoR4Pjv1X9IrpEFzYhkv1srbHsTR9IbN6Q6b7HY5Df54PrzNr0 7BFYkAkWh33A== X-IronPort-AV: E=McAfee;i="6200,9189,10015"; a="227395433" X-IronPort-AV: E=Sophos;i="5.83,275,1616482800"; d="scan'208";a="227395433" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2021 23:15:41 -0700 IronPort-SDR: mX20ztrPeT6G1GrcvIhHGagfmtFmRqAhhUGVeVzz3IT0Fxswallillhf3uc6mNW8OX3N7b6JZf N5P/fV4CF9Og== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,275,1616482800"; d="scan'208";a="451857201" Received: from xhh-tgl64.sh.intel.com ([10.239.159.53]) by fmsmga008.fm.intel.com with ESMTP; 14 Jun 2021 23:15:40 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 14:13:55 +0800 Message-Id: <20210615061403.1576282-15-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210615061403.1576282-1-haihao.xiang@intel.com> References: <20210615061403.1576282-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: 3PQfp+LZNVFB --- libavfilter/vf_vpp_qsv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index 29ba220665..cde1acdbb0 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -255,10 +255,16 @@ 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) { + av_log(ctx, AV_LOG_WARNING, "Ignore user setting of output framerate " + "when bob / advanced deinterlace is used.\n"); + 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);