From patchwork Thu Jul 29 05:24:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 29103 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp5500123ios; Wed, 28 Jul 2021 22:26:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuy0J0Uw88KNchcqcSbDgakj1gJFCAiexD85cewaoZguK/ck2T1o5tLg/0/oGcOGE40bPj X-Received: by 2002:a17:906:4310:: with SMTP id j16mr3027071ejm.182.1627536367657; Wed, 28 Jul 2021 22:26:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627536367; cv=none; d=google.com; s=arc-20160816; b=dpG+ijXc3qJX3MzTJF157uQOJzdLVThYBjwt/46j0VRarEcOlNbuHSv+T4PkhsGPHX T6LxDXNwjoYHD+p0uqgclCkGo3IVt1eBAa5+zNsnQMlGgbWESDM+tUbYAe8uaCsvaLb0 dNowUhJR5xih17A1lq0dpZ/BIl/hgV4pF7cQKBmsOEx1v65tAu+LRdyuBfXcWCKLxXXW 3pVbV3CB9Fsd/2Uwm2dDUr9FeyeNgxYjzevRjqMIc6GnpgVnYpCEo9eoRFrbGUOfd1s5 y/SYIvG/Hb+7yEO5IQkdWbPa57h5hWs3DmpjK+5DZHJiEuNPHunLrPit2DryBqxhP/Hv mXKA== 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=3IfUFTmjwoILJ/3KX/1wdxDAuVldIC5a2ytxf+djtaY=; b=qlmLM7cV4Js1kN4bbwSyTg3RU4yD0cPfWH32sl529HLrUcVNjFAG9CBEBi+SaldWQy fQh4gt3eIeZAn0tyKp+cwxi0CPjOBCP2qJxTzEFBHZIZ+iWu+eIBAqn6afy5iXV1Yz/c pFqmLysErtmonrjwP9iLKJCPdAzMNg9u822/qbrzPbT3U0+yoo6GSgaksccAyfuq+tpJ +DL+a8u3yp96PwQOTpTixEPc7rpx4miAw81ReG9F8K8BWVBl96PDy7/wVtEh20QZwNCt 6ceqm7SN74ur3RXxoYY+OyAbzCdhVeyvI4nQeyUk0vZI38kuMKBo2v95zfyW0La2+JKE xApw== 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 t15si2322614ejx.247.2021.07.28.22.26.06; Wed, 28 Jul 2021 22:26:07 -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 2BBAD680210; Thu, 29 Jul 2021 08:26:03 +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 6A9F06899B3 for ; Thu, 29 Jul 2021 08:25:55 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10059"; a="234696411" X-IronPort-AV: E=Sophos;i="5.84,278,1620716400"; d="scan'208";a="234696411" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jul 2021 22:25:40 -0700 X-IronPort-AV: E=Sophos;i="5.84,278,1620716400"; d="scan'208";a="456730020" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jul 2021 22:25:39 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Jul 2021 13:24:48 +0800 Message-Id: <20210729052509.30992-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v4 00/21] 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: zjfNfwFFtqTS 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. --- v4: * Rebase this patchset against the latest master branch * Don't change the functionality of '-vf vpp_qsv=deinterlace=1' Haihao Xiang (21): 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: pass scaling mode to the SDK 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 lavfi/vpp_qsv: allow user to set scaling mode for vpp_qsv filter 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 | 481 ++++++++++++++-------- 7 files changed, 361 insertions(+), 1499 deletions(-) delete mode 100644 libavfilter/vf_deinterlace_qsv.c delete mode 100644 libavfilter/vf_scale_qsv.c