From patchwork Fri May 14 04:53:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 27749 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp119768iof; Thu, 13 May 2021 21:54:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxHpdVTrZnxeOshtssPDjszvXld2guVgvSbzQlMtobFDzYnEB6UFWSrtXpv8xUBVHLuvlLF X-Received: by 2002:a17:906:3b49:: with SMTP id h9mr45648480ejf.6.1620968080467; Thu, 13 May 2021 21:54:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620968080; cv=none; d=google.com; s=arc-20160816; b=wZkmiwh1SYFlembhQAIbULxabNcFgLUG4wkVHphVCIMEfdLq1Ge/bMU04WRmQQX+93 oi7pJegDYZbzdj++zF7PMViRN2f+c/LjMCKFS18wr/Lu1K7FL09k1PYvoCLGv2yfkaQZ D1WI95iaCSPi2qsFw8W1JJDBC1eRs8uROkQ6cdp77rrbxjm3DYXeRnUChRTfeOzciENe 4eEirVa6JSkLZrIYDYzRGi6KI+x6swGDEgALTt9hLrOtuBwZjCyobrzJPAj30SoaizrZ VKqV/0uWBer8Ut6lSG1uEZ3CSVNUaebl5t8s44a8E29E7tLQxpziowxwNAiRnQAYHGYD oNaQ== 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:message-id:date:to:from :ironport-sdr:ironport-sdr:delivered-to; bh=gOvXeWtjlQ8T7lQvexuDb7Z3nrAZ+O20sLsd+4E01UY=; b=MlEGiYZIlfTF6uQEpFMN6r/5DqG/gaL6W2BIkw3I2T+1q3m3BrhiR2Li4fAui0jyol vlgKMt35qFpmwaxovmz26j/s8dvQZmCcjD8GHWaRTFrn12CI7tuLJLb74hZbSv6oGJpx GiXQ9l+BXKrNfWXXQYssSzd0BH9pdzmemlTyBvBE3fwLESghX/9+MKnRdmydXJAfu3yy nScRovc+5ly1gU+iyD+maAtFv7LvEgntPETmYE2sPmAhmInda2g+KnHLnUQ/IKNsNggg Ca5qZN6yQ/XtNTr0ATSq4btOt9Ps+f52dxt64JaXNA5wbKeH2O4NsrR6j0ghi/ls5HD4 xPUQ== 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 f12si5343291edx.227.2021.05.13.21.54.39; Thu, 13 May 2021 21:54:40 -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 1F40F687F64; Fri, 14 May 2021 07:54:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B0D368049E for ; Fri, 14 May 2021 07:54:28 +0300 (EEST) IronPort-SDR: W+ohwscWo+3v0gzyqXLPLNo7TSIY1GJ6P7qC72GuHAAqsrVyMwaWUsCX+YNskEiFiuxXi84wFP 54B+PKxGJQng== X-IronPort-AV: E=McAfee;i="6200,9189,9983"; a="200165333" X-IronPort-AV: E=Sophos;i="5.82,299,1613462400"; d="scan'208";a="200165333" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2021 21:54:24 -0700 IronPort-SDR: vzcqVxD4BcXEWdiGOzNiToesu6N6YB/NZXd4uouftvTbVyJPGA9DCyokHAAKJjwxTSyoaJzsi+ AzPDOjjOQA1Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,299,1613462400"; d="scan'208";a="626673048" Received: from xhh-tgl64.sh.intel.com ([10.239.159.130]) by fmsmga005.fm.intel.com with ESMTP; 13 May 2021 21:54:23 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 May 2021 12:53:38 +0800 Message-Id: <20210514045400.3277256-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 00/22] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: skgQq4sAAm2W 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. Haihao Xiang (22): lavf/qsv: use QSVVPPContext as base context in vf_vpp_qsv/vf_overlay_qsv lavf/scale_qsv: simplify scale_qsv filter lavf/scale_qsv: don't need variables for constants in FFmpeg lavf/vpp_qsv: add "a", "dar" and "sar" variables lavf/vpp_qsv: handle NULL pointer when evaluating an expression lavf/vpp_qsv: allow special values for the output dimensions lavf/vpp_qsv: factorize extra MFX configuration lavf/vpp_qsv: pass scaling mode to the SDK lavf/vpp_qsv: add vpp_preinit callback lavf/scale_qsv: re-use VPPContext for scale_qsv filter lavf/vpp_qsv: factor common QSV filter definition lavf/scale_qsv: add new options for scale_qsv filter lavf/scale_qsv: add more input / output pixel formats lavf/vpp_qsv: double the framerate for deinterlacing lavf/qsvvpp: avoid overriding the returned value lavf/qsvvpp: set PTS for output frame lavf/vpp_qsv: check output format string against NULL pointer lavf/deinterlace_qsv: simplify deinterlace_qsv filter lavf/deinterlace_qsv: re-use VPPContext for deinterlace_qsv filter lavf/deinterlace_qsv: add async_depth option lavf/deinterlace_qsv: add more input / output pixel formats lavf/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 | 474 +++++++++++++-------- 7 files changed, 353 insertions(+), 1500 deletions(-) delete mode 100644 libavfilter/vf_deinterlace_qsv.c delete mode 100644 libavfilter/vf_scale_qsv.c