From patchwork Mon Mar 27 06:23:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 40858 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp1078795pzh; Sun, 26 Mar 2023 23:24:15 -0700 (PDT) X-Google-Smtp-Source: AKy350b6P/246pkin3vqoGETFn/bIgzjQXTb+wIn0CDAc5XhOj3UeyKL72x6m86WYkOy41BMBcI+ X-Received: by 2002:a17:907:9d1a:b0:92e:eecf:b742 with SMTP id kt26-20020a1709079d1a00b0092eeecfb742mr11304202ejc.2.1679898255523; Sun, 26 Mar 2023 23:24:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679898255; cv=none; d=google.com; s=arc-20160816; b=K/EIAxmoti/cp/AlEKZK8yAtOyo/OkjHWS4JoVBG55EotP0Rjaiw8AVC/tHPSe/c7I eXxI5E8bAFOC0BRyKIk8IvYjVBY95EayMgRFTWSBW0kBk6M8yep3tqHMtU4WxntXzX4I avA/KEbNIRJt5seSed5jlym0BIGgsSaZs8HtzXQ+1ckkYQ5fUBai5CxZhquxHZsmVCT/ 3yLcBlKar32Z93MCEH7uGBrxi0iHpt+N/J3k5BAaK1iTt2I9LOYdxFf//jIMHeOk+D3g JpijXNyZBa0a8GTWi/uJo/jeUQrOZ15mawRZVrbM81GEKPUBwRw9+q/g59YR+UQcZRjL LOMg== 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 :dkim-signature:delivered-to; bh=w7hqMsrsk5x3Az5A3cVV2529CtWeQSRPPtH5I1o6TcE=; b=TSm9iZAEXf+xpzgij6CYYH7Reb6mREVrknb40MjHNdHb1+I4Fx4dv8n1tJfSrtcRbd O3heKML8BaQkfG1/qH7VJMJp1xfUpN2hN1ru0yYQJ69b3nE8p++7MpN7gy0hm6jFj0I2 12IsSsl5vNBITpN01pVmFcTyfszJGUwtKMw3oHZAxfE2xEmJMFPp484PMs5CnXPoGTuf QWibxEfQKF/pL25tCAmdEUhrD5zc1t5JtUGYmw56HRxqMcGPiir7whvCGDYCg3HANxfl OvZpxj/FGE4nyaetLuE7rD9IcYnOoh7HQk8iATOUwWD9QrD3AE/l3fuz+fd+nG8ECIGE HIHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=A3vT9f2a; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cw9-20020a170906478900b00935b1b87416si20319224ejc.866.2023.03.26.23.24.14; Sun, 26 Mar 2023 23:24:15 -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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=A3vT9f2a; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F2FB168C9E5; Mon, 27 Mar 2023 09:24:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A66C868C877 for ; Mon, 27 Mar 2023 09:24:04 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679898249; x=1711434249; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=cuDgs302WSvAqoPP5hnyWyyurj/ZUD9TpTT7qkw+zY8=; b=A3vT9f2aR17UnPc8Eanlp8TqkzUotuQPNDlfuWc4ej4VhGcRnqbBY41J amRBPEWKWhXb4FvCNNAuFnGkyCF/hSyoXKCRop5AlGx4ioEnIhpKJ9LoF WRvmgTGTe9M+1Qr7jFmm8RZSYdslGH2TgjcdOUqVH0Op/KfaISbQZscWn dm0QRzwwT4oI9dDaJbHSJPJjOU5wtt29PPnRLZmyh6FBfbu478jyDpshG Z5wfUTU5O4wtUuG4yk5ej0NsQUI54LynCiF+8n4xh4e0C4AEi/ypowds8 uoJ2G1XygUTlM88v7FECZfepCChrb1Sypelpn66w+YGSsx7by0PJniyfl Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10661"; a="324073842" X-IronPort-AV: E=Sophos;i="5.98,293,1673942400"; d="scan'208";a="324073842" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2023 23:24:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10661"; a="794201443" X-IronPort-AV: E=Sophos;i="5.98,293,1673942400"; d="scan'208";a="794201443" Received: from xhh-dg164.sh.intel.com ([10.238.5.169]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2023 23:24:01 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Mar 2023 14:23:35 +0800 Message-Id: <20230327062335.156641-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavfi/vf_vpp_qsv: only add the given output sw format to output pad 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: k+H3o73roKIB From: Haihao Xiang Otherwise the output format is not changed when output is in system memory. For example, the output format is still p010le in the following case: $ ffmpeg -qsv_device /dev/dri/renderD128 -f lavfi -i testsrc -vf "format=p010le,vpp_qsv=extra_hw_frames=8:format=nv12" -f null - ... Output #0, null, to 'pipe:': Metadata: encoder : Lavf60.4.100 Stream #0:0: Video: wrapped_avframe, p010le(tv, progressive), 320x240 [SAR 1:1 DAR 4:3], q=2-31, 200 kb/s, 25 fps, 25 tbn Signed-off-by: Haihao Xiang --- libavfilter/vf_vpp_qsv.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index 76f0bc3df1..334a86551b 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -714,7 +714,8 @@ static const AVOption vpp_options[] = { static int vpp_query_formats(AVFilterContext *ctx) { - int ret; + VPPContext *vpp = ctx->priv; + int ret, i = 0; static const enum AVPixelFormat in_pix_fmts[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NV12, @@ -727,17 +728,25 @@ static int vpp_query_formats(AVFilterContext *ctx) AV_PIX_FMT_QSV, AV_PIX_FMT_NONE }; - static const enum AVPixelFormat out_pix_fmts[] = { - AV_PIX_FMT_NV12, - AV_PIX_FMT_P010, - AV_PIX_FMT_QSV, - AV_PIX_FMT_NONE - }; + static enum AVPixelFormat out_pix_fmts[4]; ret = ff_formats_ref(ff_make_format_list(in_pix_fmts), &ctx->inputs[0]->outcfg.formats); if (ret < 0) return ret; + + /* User specifies the output format */ + if (vpp->out_format == AV_PIX_FMT_NV12 || + vpp->out_format == AV_PIX_FMT_P010) + out_pix_fmts[i++] = vpp->out_format; + else { + out_pix_fmts[i++] = AV_PIX_FMT_NV12; + out_pix_fmts[i++] = AV_PIX_FMT_P010; + } + + out_pix_fmts[i++] = AV_PIX_FMT_QSV; + out_pix_fmts[i++] = AV_PIX_FMT_NONE; + return ff_formats_ref(ff_make_format_list(out_pix_fmts), &ctx->outputs[0]->incfg.formats); }