From patchwork Fri Dec 10 02:21:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenbin Chen X-Patchwork-Id: 32252 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1201286iog; Thu, 9 Dec 2021 18:22:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJxDLgi5ByRAM/vNChyzKcAs9MKaFUa1avz8EIwnZZiLb6Y9+iXYO9EIOqKb4Dw6x+X0NDQW X-Received: by 2002:a17:907:3daa:: with SMTP id he42mr20735227ejc.160.1639102945403; Thu, 09 Dec 2021 18:22:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639102945; cv=none; d=google.com; s=arc-20160816; b=FMTG1qYNhAg02Z53jxIcsWZM/kCu1K5SC22UphNFQSKTzW3jQ3sif4fo3yiEsdXHF3 TgB8XdyGdxaRMiKdQYvibH3JV35KDSU8oEQLNi0y9wpbDZRchCmtocITLOzGFa5f4Kwz ocfQuHfw6PyRC0AqdP5ssq8kFpMeUnvRhq4BN+dZQYIGLJ8blCFW4iPa1ZdMKTVd9R+x 6D7gNioTp38pkQkx5VKqYgyi+TGHOHHM9xpCwZ6eZlJmyHYjrWEZaS+aRrEVYahPM+6b zG9vchI2mxcf3yj/UY3EUP0yKC86FWtXWCW+o54Uz49Nutk/rqVPelw5/pNhsJXs/bfI DjqQ== 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=IzpqZ3EpWn7+B9VGzQoE3GelIn7UHFFpYXZMLp88yCw=; b=vK8NQEZCzhOHNh/oAmV6Uuf1EOkqyKPkFSDklqbIe2HvJGPWrpQ+g3ylcVQb6lg4d/ KRArIC2OhLuhrDPuhqd8FIIQofLQ0UrMZT1BGKMWdoPJPCD5sHv+RF+HbH/Z/6oRTYKq l8e/dv85Tf+uBNjC86pBRW2BycQBB9RmBShGG1JdinmMQcwDr1sZNdAR1fof3BTVNl0u AcdNskxfPxCkIlUcM+D34YzT2Euv7A+WAaYLPYlOduoI+L5VpOLnytPoG+HaOTlHXSII LPFaHkr6WNfOOK9tKWZu/OZfxvjG8j98UOJwWdLbVW+0LfqwNkhYhkrI4sSs5q1p8LG5 aGCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=GFt4kqyy; 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 qk9si2744443ejc.171.2021.12.09.18.22.24; Thu, 09 Dec 2021 18:22:25 -0800 (PST) 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=GFt4kqyy; 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 DCF4068ACAE; Fri, 10 Dec 2021 04:22:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51A0168AAE6 for ; Fri, 10 Dec 2021 04:22:12 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639102938; x=1670638938; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=7ArEOCHkdyyvziwc8JPNyvv5XCtIdZWJnpZD5cKqSuw=; b=GFt4kqyyjq+uiuTR9oEshHYQBYGyKWjLP9SKbvCqdAZWD26C8sT5JJAY Hf3a8eFQCUNAUfvn9qtcQvDO3wMPs4t59VYyy9KM+kD/TDiUi629tdxXk lmdWGtoOyFbvsis3a3ctCj1JARFvSYYFX4tGYX24x43DrECW5qB5p+rPK xq8nAr/ZAefCJyE0cWWe0z2BeMciKVdgXqRDYwCYzxLkR1evbyIjL16fh 1EZFS0A6Iw+NuY6UpI1aF5cOCtX97CsqB40rpDaXISu4YDc8iojkUZacs 5+6lgWEShNhRXF2kkasrz/SpZhDxd42hKbZMf2xdPIe+F5N+3GCfSxClP g==; X-IronPort-AV: E=McAfee;i="6200,9189,10193"; a="238200255" X-IronPort-AV: E=Sophos;i="5.88,194,1635231600"; d="scan'208";a="238200255" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 18:22:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,194,1635231600"; d="scan'208";a="503750803" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga007.jf.intel.com with ESMTP; 09 Dec 2021 18:22:09 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Dec 2021 10:21:52 +0800 Message-Id: <20211210022152.3782708-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavfilter/vf_overlay_qsv: Use format of first input to set output format for overlay_qsv 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: Wenbin Chen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CNCFpoC2DCp6 overlay_qsv hard coded to use nv12 as output format. Now use the format of the first input to set output format. Now the following command works: ffmpeg -hwaccel qsv -c:v hevc_qsv -i input_p010.265 -hwaccel qsv -c:v hevc_qsv \ -i input2_p010.265 -filter_complex "[0:v][1:v]overlay_qsv=x=0:y=0:alpha=255, \ hwdownload,format=p010le" -f rawvideo -y output_p010.yuv Signed-off-by: Wenbin Chen --- libavfilter/vf_overlay_qsv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavfilter/vf_overlay_qsv.c b/libavfilter/vf_overlay_qsv.c index 7e76b39aa9..d947a1faa1 100644 --- a/libavfilter/vf_overlay_qsv.c +++ b/libavfilter/vf_overlay_qsv.c @@ -276,6 +276,7 @@ static int config_output(AVFilterLink *outlink) int ret; av_log(ctx, AV_LOG_DEBUG, "Output is of %s.\n", av_get_pix_fmt_name(outlink->format)); + vpp->qsv_param.out_sw_format = in0->format; if ((in0->format == AV_PIX_FMT_QSV && in1->format != AV_PIX_FMT_QSV) || (in0->format != AV_PIX_FMT_QSV && in1->format == AV_PIX_FMT_QSV)) { av_log(ctx, AV_LOG_ERROR, "Mixing hardware and software pixel formats is not supported.\n"); @@ -288,6 +289,7 @@ static int config_output(AVFilterLink *outlink) av_log(ctx, AV_LOG_ERROR, "Inputs with different underlying QSV devices are forbidden.\n"); return AVERROR(EINVAL); } + vpp->qsv_param.out_sw_format = hw_frame0->sw_format; } outlink->w = vpp->var_values[VAR_MW];