From patchwork Thu Aug 5 08:18:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 29283 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp190137ioh; Thu, 5 Aug 2021 01:21:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgdGMbipycu4RtC0C3lClyPadJiHz9FtYXTdIC7WvmfSJxCyb++g6IhEewPVQmcM7OiffZ X-Received: by 2002:a05:6402:781:: with SMTP id d1mr5065134edy.32.1628151683846; Thu, 05 Aug 2021 01:21:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628151683; cv=none; d=google.com; s=arc-20160816; b=ZL2zlwH2gMwU0LLv/G2P2UXxoo+Lbdp/9JWSJpm3WEXoUkXzXirJEymtzmRhEqAJbE t66kOclOw9h/edFey9VHV2fsNueVqJD5uUaXEb+asV6l/c9IeeGoCXAWDPWoPjwOpF0E UrytCg37wav+xWHF1MOhjQQ+WgBXFnSmiSevOXWxpgOep41ZFdkY8cwctLXCxBXIyq74 rffnfnHThNH4jlQNPrl2gPc4gMkABqQUkoCxKPo4cCndTny4Bp8HcmBz/LRjPASrSVVU bUa8xzvh4rLFDiNUwIPnxbGtWZ16dCKq3NSVUTOppzJYAUpGpYxnIyXtJwRjUgyWIZtt RGGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=ExfEM1PBau38AsEkhkHxigU4krokSxsOGz4L0G1O110=; b=CYUq1FFO6YTJ2QnthJIAikwR2P/JOIRgLcy0xryI3ndT4rGICY4VBCF2z1B7IIywxY RLq4prR5kuASIjyfVwS0qRnEtT7W+hFY0RAzIPdWWKkKgthNQga6Tp9cSz9TEDdbc9Ad 8xx9NavTBZK7DA2jyU43/cjnpP+5HN9Z9Cx7wcwlP1lFUtuqJKEPIOvXSMH4fpo8tqXl sOAGcI3WUtrICHbua+l4YfHD8+ESy7MMYJ6uL+98VW4toW1yWvPqiulEcAzeJ5MiLHpo 8/tc2dAJI+rqKH0IWVAtHaiUC4w7aZgOYvtlAd82Cm4CLf+wcuJBhxBkn11UihlI8Op3 +TFA== 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 s18si5768574ejh.110.2021.08.05.01.21.22; Thu, 05 Aug 2021 01:21:23 -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 466F068A278; Thu, 5 Aug 2021 11:21:19 +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 40072689C64 for ; Thu, 5 Aug 2021 11:21:11 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10066"; a="236061996" X-IronPort-AV: E=Sophos;i="5.84,296,1620716400"; d="scan'208";a="236061996" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2021 01:19:36 -0700 X-IronPort-AV: E=Sophos;i="5.84,296,1620716400"; d="scan'208";a="522442340" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2021 01:19:35 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Aug 2021 16:18:50 +0800 Message-Id: <20210805081910.9386-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v5 00/20] clean-up QSV filters 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: C56iA3izZJU8 This patchset clean up scale_qsv and deinterlace_qsv filters, and take the two filters as the special cases of vpp_qsv, so vf_scale_qsv.c and vf_deinterlace_qsv.c can be deleted from FFmpeg. In addition, a few small features are added in this patchset. --- v5: * Rebased this patchset against the latest master branch and fixed conflicts Haihao Xiang (20): lavfi/qsv: use QSVVPPContext as base context in vf_vpp_qsv/vf_overlay_qsv lavfi/scale_qsv: simplify scale_qsv filter lavfi/scale_qsv: don't need variables for constants in FFmpeg lavfi/vpp_qsv: add "a", "dar" and "sar" variables lavfi/vpp_qsv: handle NULL pointer when evaluating an expression lavfi/vpp_qsv: allow special values for the output dimensions lavfi/vpp_qsv: factorize extra MFX configuration lavfi/vpp_qsv: allow user to set scale_mode with constant lavfi/vpp_qsv: add vpp_preinit callback lavfi/scale_qsv: re-use VPPContext for scale_qsv filter lavfi/vpp_qsv: factor common QSV filter definition lavfi/scale_qsv: add new options for scale_qsv filter lavfi/scale_qsv: add more input / output pixel formats lavfi/qsvvpp: avoid overriding the returned value lavfi/qsvvpp: set PTS for output frame lavfi/vpp_qsv: check output format string against NULL pointer lavfi/deinterlace_qsv: simplify deinterlace_qsv filter lavfi/deinterlace_qsv: re-use VPPContext for deinterlace_qsv filter lavfi/deinterlace_qsv: add async_depth option lavfi/deinterlace_qsv: add more input / output pixel formats libavfilter/Makefile | 4 +- libavfilter/qsvvpp.c | 57 ++- libavfilter/qsvvpp.h | 11 +- libavfilter/vf_deinterlace_qsv.c | 611 --------------------------- libavfilter/vf_overlay_qsv.c | 11 +- libavfilter/vf_scale_qsv.c | 685 ------------------------------- libavfilter/vf_vpp_qsv.c | 473 +++++++++++++-------- 7 files changed, 347 insertions(+), 1505 deletions(-) delete mode 100644 libavfilter/vf_deinterlace_qsv.c delete mode 100644 libavfilter/vf_scale_qsv.c