From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2362D450E0 for ; Mon, 6 Feb 2023 07:38:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E199168BD65; Mon, 6 Feb 2023 09:38:46 +0200 (EET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B679568BC6C for ; Mon, 6 Feb 2023 09:38:39 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675669124; x=1707205124; h=from:to:subject:date:message-id:references:in-reply-to: content-id:content-transfer-encoding:mime-version; bh=pV2dMvEUc+487OD1y74QG/hZ47uPrPGA7hvQ1PhkweM=; b=C5BnF+SdiZ3OJ6TWKB5udUlzeA/kzFP3Oo3cySgqKmgpn0f42zNRndC5 tcZ4i3XXHfQvxJmsG3/0qdfXntSVBzbUuCloSrxJ0kEVeBBl2P1gxc9X0 paXiKtAHWN26C4avP0cQdxr0r+qG7kP1Rz11E8xnSuVsZ/3gY24p1AEqU rbmrlnNL/1E2l5AZJniVnSw+0D90KYKQQoO/C70nUU9uVgzoTrGQT1mni gbAgSLDXFn+xmRghXduEz0JpAUG0XJIcRax6Fyf5lwYKmZPsRvcBGNg32 hD3JJ74zL5mU3DseCH5z2Nh673WgmMWbFMFIfghOaXzyPuXVjHn26IYb4 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10612"; a="309481973" X-IronPort-AV: E=Sophos;i="5.97,276,1669104000"; d="scan'208";a="309481973" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Feb 2023 23:38:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10612"; a="698758014" X-IronPort-AV: E=Sophos;i="5.97,276,1669104000"; d="scan'208";a="698758014" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga001.jf.intel.com with ESMTP; 05 Feb 2023 23:38:22 -0800 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Sun, 5 Feb 2023 23:38:21 -0800 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16 via Frontend Transport; Sun, 5 Feb 2023 23:38:21 -0800 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.103) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.16; Sun, 5 Feb 2023 23:38:20 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vur83GybLYprG5pHnmOKt3dciSSNN1bPs2Lk86Mvkd2H5gORw+vpua6vwiEHcjzhjyY1mdGDbdI7gtkKeh79kyBXX0v3h2/Pv/GbUwQSfRNhXe/5W6+zr1tsVMyd+c32MH045GyB5IxT+XZD3S+Gy81Gi4QC5zw1tjFyNyj+okRh8/h72P9uy+kR6ElU3+oqt/fBv3s4RZe5m/lL6Neoigy8a2FhboD4+gcHivNU/azgePFB1MJgsoY4G3ucqA3EooVQl95Hb2BfDojr56wNAZ50IvTde6PWfsE4NBIwmJKTcoTXm/DCxg9EAEOp6qdE0JQSEng1u9vyUwTkuMV/VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pV2dMvEUc+487OD1y74QG/hZ47uPrPGA7hvQ1PhkweM=; b=fRZ2EazCmIkrxVD+1oPN4Pi/WG3Bte1RiZXbTjM9i8XVfMMcdkNiFzHkDLJlzdT0vYxiJZ/Zx/tAWEVmkfu/Go+ur6FlXu2h4PZp95sXkBRzsfsi+g2lsiavz/TwpFyh+rM+OmmfWUzVolFcBVU7dq8/FH9yoJhjV6S8fKLkboBZZAitWAtj7aTY+i+Gze2CdIXAFNs7OH+nKH1jhxysUJW0klDY2rJK2BAxLTdry2fJ/775FNIr5N98KqBgV7mCu3Q30/eKVmSxZypjx8ENMMhSa5oLph/I+tSTmbp/JV0L18KWTEIDc2mXZNiuwhuTXsikvUB5U3PYRiNMxy+jrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from BN9PR11MB5515.namprd11.prod.outlook.com (2603:10b6:408:104::8) by DM6PR11MB4610.namprd11.prod.outlook.com (2603:10b6:5:2ab::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.34; Mon, 6 Feb 2023 07:38:13 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::36ba:13c8:6a29:c7af]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::36ba:13c8:6a29:c7af%8]) with mapi id 15.20.6064.034; Mon, 6 Feb 2023 07:38:13 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" , "onemda@gmail.com" Thread-Topic: [FFmpeg-devel] [PATCH] avfilter: add QSV variants of the stack filters Thread-Index: AQHZNIeuKvIVlhLbrUC8nPQowhnBCa7Bkt2A Date: Mon, 6 Feb 2023 07:38:13 +0000 Message-ID: References: <20230130083929.374071-1-haihao.xiang@intel.com> In-Reply-To: Accept-Language: en-AS, zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Evolution 3.36.5-0ubuntu1 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BN9PR11MB5515:EE_|DM6PR11MB4610:EE_ x-ms-office365-filtering-correlation-id: 9657b9b7-0fb7-4357-67cc-08db08151aa8 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: QRaqhMwksgV4X+7ngSvIAd/vLi06fZO2ixFO+rlIpjJu5J4s6yb2excb4s/w1m4BBSvGsRXXsnEnjNvOVC5KFWUHn90r9PIsaiVz40u5XM789Hh0rnsQGqcNlKrjGA5Lmg9pXAgbbOlIp00Cp3eG8WFPVfjYGvq0dYF2tC8k9P1Pe09nHDVTlqsa7wN1kvVnoz8svoLAZZcBzFqdYYTJopktRSUpZF0gaJzxlhDGgOtdkAGzg/GBaGKuLuJNDMOS40JSGUDHorefEYruC4yLJotJ3wRhXYMXEi0PbSt2xg9ySQ3F2q9DJW1KW3zxvq+jeD0TY8mA29jUR1o4KCUUzIeGzxubWu1BXtsiQl14HICC2iTi2Ff8ifaBb3+E0psPrhppRKw5Vo6oTd0UZclcDSzY3cceP1uahJ+SP6Dq4WZksAX4j6zqfAG1xEgl3+IBwjc71osN6pwtk/NCX+MXtUlOUVtBr0ZpC0lDb/zAGzT4MQxZVbHQ2Tr0EFcr1ghJy14BKb4C1kPhw25Bz2czREcz2WfUfhxWtvUjqYbXV9qR3Ko6GNRZlvyQr3nP0DTIEryFJzR8ip251taNCqAwqKA2vpQGDB2+CqjgcEWd3spl+K2O5M0uiT7hkmJ/o6qFP6kO4LHn0pg4UnxeCCif7HAY/aoL1wHlcfGUwUq1eeGV1hc1dZdhrC/IryIo08XHsehni9lj6qr6suS33mvhuYh9v9UBdutB0Xob/axf/+tIc0j50jvxYrwl8O4Ga7iM x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN9PR11MB5515.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(376002)(39860400002)(346002)(366004)(396003)(136003)(451199018)(66476007)(82960400001)(76116006)(38100700002)(122000001)(91956017)(66946007)(83380400001)(38070700005)(5660300002)(8676002)(8936002)(41300700001)(478600001)(66446008)(66556008)(64756008)(2906002)(30864003)(6506007)(6486002)(2616005)(6512007)(186003)(26005)(86362001)(316002)(110136005)(71200400001)(36756003)(2004002)(559001)(579004); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?S2d5Y0tYWlNBbkxocC9IZ2ZuekZqYm02Mkd0VDZkNkpqRlNKSnVuWVJkc1F2?= =?utf-8?B?YngwMDZMMW90cG5PVTBOSWFtdjNpMUwvRTlMcEJZKzBHVy84YjE4d0dNNlJE?= =?utf-8?B?b2J3SFFLWDJQYk5KMHZ6S1A3RmJPdlE4WmhEUmpmU09LMDY1cm5iNlZBejRT?= =?utf-8?B?eHMrT2dZUGd1UGRDVGkwQXRyNC9ZYllCbllsQmovcHI1M256dk1uWTcrNllT?= =?utf-8?B?c3JDdllSSlVEQmVOVFd0bTNlZWZsSzJ5amUwNGZjY0pWOHozM0tPNlJXRjN2?= =?utf-8?B?U09NRWlDVStHWGJEQ280TnAybmxGb3ExRW43QWI1QVBtMGg1ZkdhaGdSejRK?= =?utf-8?B?RndxNHVPalZKRkJrTzVNR2hOV2hrQXc2b0xFbjNNRE02OERQK29EMG5TNjhG?= =?utf-8?B?b2lVWkJKcklsaFB5dmRuaFlWWmx1bzJkZlBDWUFjUU4rT3drMWNwdktxN1Zz?= =?utf-8?B?NUlvZndma25Wak1xT2I4U0RxWXJyUVA1RkFUOGxMa2ZVVHFHd2UwKzc4RkFl?= =?utf-8?B?ZTEzZ2ZPelBoaXR0ditFZXJOdDZUZUVnS2grTUtTU0R2UWdZbmlFZHMyRWpI?= =?utf-8?B?UjBPQWltTnVLZjEwODNDREpxT1N5RmIzWWg4OTJmbFhGREpmeGdxcVk3NnFv?= =?utf-8?B?LzF2ZGErWnZqb0ovUlM0Uk5vN0dNUWlxZmhMQTJMdDZjTEhxQVg5c2xzSG1k?= =?utf-8?B?dENwY01ydG9wWjdibnZQNXJyRUcvMi82d2xFODNsckJ1ZGZWdkZOWEI2dlBU?= =?utf-8?B?VFZmNmJudUpFUHlQZU5nRDBScE5TS3NVQ21QNzhFWTR1TnVKQnNIUS9ieWg1?= =?utf-8?B?ZnNhenV6bjdkVGZtYkhqdjJEaENuOUljZDluelUxa1FpRVhRQ2hUVHBsZFIv?= =?utf-8?B?bWE1QWUzalBBTFZ0TG5UTTNUSkpXOHVNQXhqaWJyaWdEd3VwT2lIbjNzbFBh?= =?utf-8?B?aTVZZVlJZVh2WUtwVUU5Q0RpQTVBV1Eyb2tQOTN6Ylo5TGNIbUo3MzlMMUhp?= =?utf-8?B?TVhkQW95UVlBQTJ1dXNKSXNpblJ1SERZZU5PMTdTY0Q4eVlBNzhEcVdzb0FO?= =?utf-8?B?NC8xTVdUSzFEbnFyOU5GeldFRmY0Qjd5bkxENndzcmJXeno3a1N5SWEvNDVK?= =?utf-8?B?aGJaYVh5MEdRUGxNTHhYVXNiampvUk5wNzhtM2lmL3lLeFJoRGdVd2xMeHc0?= =?utf-8?B?RklYR0cvSnlhcnEwb3d1VGltVTVMWStFQ2VydWZ0UndTTlkxektRd2F2YWlq?= =?utf-8?B?Z3JhNUlEc0VURU44eU9BVG5FUVpyMHgyd1hENlBJRXNHUCtpVzB0Szk1Vnl2?= =?utf-8?B?V1RUSTlza3Rvb0pVME5kQlN3d0tSVHNSUFNlM0tGdzlhWXRDcTl5bDNlVkIw?= =?utf-8?B?VGprMTJjd0wxaHJpZ24zRDBhekZBTkdESExuV2lvczFCMUhONDZyZWdDandJ?= =?utf-8?B?YSs5K0oyejJSOTY4MnQ4cXV6UGVRZXp0MWs2aFNGKzNlejR0UzNoK1hUTjFp?= =?utf-8?B?UjVuYzVBS1F2RHkwMGZCVURGRDMzYy81d2NPWnVlYXlkL0JiQVd6YURTNFE2?= =?utf-8?B?bTBxSTVaTzAxQ0VlM21hWjI3UTJ2RlZUdkxyUGRscHNOR3E4UnBhS2VDVDBt?= =?utf-8?B?Z25TY2JnWXhrSjhnYjVETy9oTmxoUndiU3ZMejRrSVJZUTBBK1Rodk1JNHlS?= =?utf-8?B?OWdSd3hlemw2cXBieUN0NTFreW5jbVl0RUl0VHVtcmw0cHFpWFFQTjR6cGJk?= =?utf-8?B?cExCMy9CSzdqanh2Y25sdUwwTmhXZ05rNUZvNU9wRHlDUy82YlY5RzlDcHlS?= =?utf-8?B?TWpwaEpVbnRpWE5rdS9xN0xhbUkwd1VBbmRLcjB3UUJESFNRWGNMemNuL21q?= =?utf-8?B?a0NSbHJ1VlA2VUZnMHJPZkpSQjc0Qk1rdzcwZmtxQktIMkhXMUdSK0Z2SmlK?= =?utf-8?B?K2o4cTAram5yc1UwL1VzckhjT0d6WkxqSklUMUxRSDhWUVFYSkFZTThON0pS?= =?utf-8?B?T3RvZENTQVl4dVZ6ZytQWTkrdEppelZpWjJmQ210aWkzTkJnbU5iQVBNK00v?= =?utf-8?B?eFNkN3JZNWdaSGhTS204Ly9xVTBoM05CQVpETFVYNG5RaTRUOGdETE9LN0x6?= =?utf-8?B?emE4SXdOWE9HVEowL1VIcHNlN3JsZStLcVh1cG01dFM5VXNtbW51YjYvbHJz?= =?utf-8?B?MEE9PQ==?= Content-ID: MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN9PR11MB5515.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9657b9b7-0fb7-4357-67cc-08db08151aa8 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Feb 2023 07:38:13.7011 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: HscXunRVZgflLaxMRS6iPLZTZ/WwGRsauVwyb3HTY9G/CBGrceYOBDY4j5uox6fszNz2a49E4qT87Csu4vGTCA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4610 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH] avfilter: add QSV variants of the stack 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Ma, 2023-01-30 at 09:48 +0100, Paul B Mahol wrote: > On 1/30/23, Xiang, Haihao wrote: > > From: Haihao Xiang > > > > Include hstack_qsv, vstack_qsv and xstack_qsv. They may accept input > > streams with different sizes. > > > > Examples: > > $ ffmpeg -hwaccel qsv -hwaccel_output_format qsv -i input.mp4 \ > > -filter_complex "[0:v][0:v]hstack_qsv" -f null - > > > > $ ffmpeg \ > > -hwaccel qsv -hwaccel_output_format qsv -i input.mp4 \ > > -hwaccel qsv -hwaccel_output_format qsv -i input.mp4 \ > > -hwaccel qsv -hwaccel_output_format qsv -i input.mp4 \ > > -hwaccel qsv -hwaccel_output_format qsv -i input.mp4 \ > > -filter_complex > > "[0:v][1:v][2:v][3:v]xstack_qsv=inputs=4:fill=0x000000:layout=0_0_1920x1080| > > w0_0_1920x1080|0_h0_1920x1080|w0_h0_1920x1080" > > \ > > -f null - > > > > Signed-off-by: Haihao Xiang > > --- > > Changelog | 1 + > > configure | 6 + > > doc/filters.texi | 88 ++++++ > > libavfilter/Makefile | 3 + > > libavfilter/allfilters.c | 3 + > > libavfilter/version.h | 2 +- > > libavfilter/vf_stack_qsv.c | 563 +++++++++++++++++++++++++++++++++++++ > > 7 files changed, 665 insertions(+), 1 deletion(-) > > create mode 100644 libavfilter/vf_stack_qsv.c > > > > diff --git a/Changelog b/Changelog > > index a0f1ad7211..0d700320fd 100644 > > --- a/Changelog > > +++ b/Changelog > > @@ -34,6 +34,7 @@ version : > > - ssim360 video filter > > - ffmpeg CLI new options: -enc_stats_pre[_fmt], -enc_stats_post[_fmt] > > - hstack_vaapi, vstack_vaapi and xstack_vaapi filters > > +- hstack_qsv, vstack_qsv and xstack_qsv filters > > > > > > version 5.1: > > diff --git a/configure b/configure > > index 47790d10f5..037a47f2ab 100755 > > --- a/configure > > +++ b/configure > > @@ -3770,6 +3770,12 @@ yadif_videotoolbox_filter_deps="metal corevideo > > videotoolbox" > > hstack_vaapi_filter_deps="vaapi_1" > > vstack_vaapi_filter_deps="vaapi_1" > > xstack_vaapi_filter_deps="vaapi_1" > > +hstack_qsv_filter_deps="libmfx" > > +hstack_qsv_filter_select="qsvvpp" > > +vstack_qsv_filter_deps="libmfx" > > +vstack_qsv_filter_select="qsvvpp" > > +xstack_qsv_filter_deps="libmfx" > > +xstack_qsv_filter_select="qsvvpp" > > > > # examples > > avio_list_dir_deps="avformat avutil" > > diff --git a/doc/filters.texi b/doc/filters.texi > > index 3a54c68f3e..43c77dc041 100644 > > --- a/doc/filters.texi > > +++ b/doc/filters.texi > > @@ -26772,6 +26772,94 @@ See @ref{xstack}. > > > > @c man end VAAPI VIDEO FILTERS > > > > +@chapter QSV Video Filters > > +@c man begin QSV VIDEO FILTERS > > + > > +Below is a description of the currently available QSV video filters. > > + > > +To enable compilation of these filters you need to configure FFmpeg with > > +@code{--enable-libmfx} or @code{--enable-libvpl}. > > + > > +To use QSV filters, you need to setup the QSV device correctly. For more > > information, please read > > @url{https://trac.ffmpeg.org/wiki/Hardware/QuickSync} > > + > > +@section hstack_qsv > > +Stack input videos horizontally. > > + > > +This is the QSV variant of the @ref{hstack} filter, each input stream may > > +have different height, this filter will scale down/up each input stream > > while > > +keeping the orignal aspect. > > + > > +It accepts the following options: > > + > > +@table @option > > +@item inputs > > +See @ref{hstack}. > > + > > +@item shortest > > +See @ref{hstack}. > > + > > +@item height > > +Set height of output. If set to 0, this filter will set height of output > > to > > +height of the first input stream. Default value is 0. > > +@end table > > + > > +@section vstack_qsv > > +Stack input videos vertically. > > + > > +This is the QSV variant of the @ref{vstack} filter, each input stream may > > +have different width, this filter will scale down/up each input stream > > while > > +keeping the orignal aspect. > > + > > +It accepts the following options: > > + > > +@table @option > > +@item inputs > > +See @ref{vstack}. > > + > > +@item shortest > > +See @ref{vstack}. > > + > > +@item width > > +Set width of output. If set to 0, this filter will set width of output to > > +width of the first input stream. Default value is 0. > > +@end table > > + > > +@section xstack_qsv > > +Stack video inputs into custom layout. > > + > > +This is the QSV variant of the @ref{xstack} filter. > > + > > +It accepts the following options: > > + > > +@table @option > > +@item inputs > > +See @ref{xstack}. > > + > > +@item shortest > > +See @ref{xstack}. > > + > > +@item layout > > +See @ref{xstack}. > > +Moreover, this permits the user to supply output size for each input > > stream. > > +@example > > +xstack_qsv=inputs=4:layout=0_0_1920x1080|0_h0_1920x1080|w0_0_1920x1080|w0_h > > 0_1920x1080 > > +@end example > > + > > +@item grid > > +See @ref{xstack}. > > + > > +@item grid_tile_size > > +Set output size for each input stream when @option{grid} is set. If this > > option > > +is not set, this filter will set output size by default to the size of the > > +first input stream. For the syntax of this option, check the > > +@ref{video size syntax,,"Video size" section in the ffmpeg-utils > > manual,ffmpeg-utils}. > > + > > +@item fill > > +See @ref{xstack}. > > +@end table > > + > > +@c man end QSV VIDEO FILTERS > > + > > @chapter Video Sources > > @c man begin VIDEO SOURCES > > > > diff --git a/libavfilter/Makefile b/libavfilter/Makefile > > index b45dcd00fc..23e7b89d09 100644 > > --- a/libavfilter/Makefile > > +++ b/libavfilter/Makefile > > @@ -561,6 +561,9 @@ OBJS-$(CONFIG_ZSCALE_FILTER) += > > vf_zscale.o > > OBJS-$(CONFIG_HSTACK_VAAPI_FILTER) += vf_stack_vaapi.o > > framesync.o vaapi_vpp.o > > OBJS-$(CONFIG_VSTACK_VAAPI_FILTER) += vf_stack_vaapi.o > > framesync.o vaapi_vpp.o > > OBJS-$(CONFIG_XSTACK_VAAPI_FILTER) += vf_stack_vaapi.o > > framesync.o vaapi_vpp.o > > +OBJS-$(CONFIG_HSTACK_QSV_FILTER) += vf_stack_qsv.o framesync.o > > +OBJS-$(CONFIG_VSTACK_QSV_FILTER) += vf_stack_qsv.o framesync.o > > +OBJS-$(CONFIG_XSTACK_QSV_FILTER) += vf_stack_qsv.o framesync.o > > > > OBJS-$(CONFIG_ALLRGB_FILTER) += vsrc_testsrc.o > > OBJS-$(CONFIG_ALLYUV_FILTER) += vsrc_testsrc.o > > diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c > > index 9cdcca4853..d7db46c2af 100644 > > --- a/libavfilter/allfilters.c > > +++ b/libavfilter/allfilters.c > > @@ -526,6 +526,9 @@ extern const AVFilter ff_vf_zscale; > > extern const AVFilter ff_vf_hstack_vaapi; > > extern const AVFilter ff_vf_vstack_vaapi; > > extern const AVFilter ff_vf_xstack_vaapi; > > +extern const AVFilter ff_vf_hstack_qsv; > > +extern const AVFilter ff_vf_vstack_qsv; > > +extern const AVFilter ff_vf_xstack_qsv; > > > > extern const AVFilter ff_vsrc_allrgb; > > extern const AVFilter ff_vsrc_allyuv; > > diff --git a/libavfilter/version.h b/libavfilter/version.h > > index 057ab63415..93036a615d 100644 > > --- a/libavfilter/version.h > > +++ b/libavfilter/version.h > > @@ -31,7 +31,7 @@ > > > > #include "version_major.h" > > > > -#define LIBAVFILTER_VERSION_MINOR 56 > > +#define LIBAVFILTER_VERSION_MINOR 57 > > #define LIBAVFILTER_VERSION_MICRO 100 > > > > > > diff --git a/libavfilter/vf_stack_qsv.c b/libavfilter/vf_stack_qsv.c > > new file mode 100644 > > index 0000000000..f3a623f26c > > --- /dev/null > > +++ b/libavfilter/vf_stack_qsv.c > > @@ -0,0 +1,563 @@ > > +/* > > + * This file is part of FFmpeg. > > + * > > + * FFmpeg is free software; you can redistribute it and/or > > + * modify it under the terms of the GNU Lesser General Public > > + * License as published by the Free Software Foundation; either > > + * version 2.1 of the License, or (at your option) any later version. > > + * > > + * FFmpeg is distributed in the hope that it will be useful, > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > > + * Lesser General Public License for more details. > > + * > > + * You should have received a copy of the GNU Lesser General Public > > + * License along with FFmpeg; if not, write to the Free Software > > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 > > USA > > + */ > > + > > +/** > > + * @file > > + * Hardware accelerated hstack, vstack and xstack filters based on Intel > > Quick Sync Video VPP > > + */ > > + > > +#include "config_components.h" > > + > > +#include "libavutil/opt.h" > > +#include "libavutil/common.h" > > +#include "libavutil/pixdesc.h" > > +#include "libavutil/eval.h" > > +#include "libavutil/hwcontext.h" > > +#include "libavutil/avstring.h" > > +#include "libavutil/avassert.h" > > +#include "libavutil/imgutils.h" > > +#include "libavutil/mathematics.h" > > +#include "libavutil/parseutils.h" > > + > > +#include "internal.h" > > +#include "filters.h" > > +#include "formats.h" > > +#include "video.h" > > + > > +#include "framesync.h" > > +#include "qsvvpp.h" > > + > > +#define OFFSET(x) offsetof(QSVStackContext, x) > > +#define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM) > > + > > +enum { > > + QSV_STACK_H = 0, > > + QSV_STACK_V = 1, > > + QSV_STACK_X = 2 > > +}; > > + > > +typedef struct QSVStackContext { > > + QSVVPPContext qsv; > > + > > + FFFrameSync fs; > > + QSVVPPParam qsv_param; > > + mfxExtVPPComposite comp_conf; > > + int mode; > > + > > + /* Options */ > > + int nb_inputs; > > + int shortest; > > + int tile_width; > > + int tile_height; > > + int nb_grid_columns; > > + int nb_grid_rows; > > + char *layout; > > + uint8_t fillcolor[4]; > > + char *fillcolor_str; > > + int fillcolor_enable; > > +} QSVStackContext; > > + > > +static void rgb2yuv(float r, float g, float b, int *y, int *u, int *v, int > > depth) > > +{ > > + *y = ((0.21260*219.0/255.0) * r + (0.71520*219.0/255.0) * g + > > + (0.07220*219.0/255.0) * b) * ((1 << depth) - 1); > > + *u = (-(0.11457*224.0/255.0) * r - (0.38543*224.0/255.0) * g + > > + (0.50000*224.0/255.0) * b + 0.5) * ((1 << depth) - 1); > > + *v = ((0.50000*224.0/255.0) * r - (0.45415*224.0/255.0) * g - > > + (0.04585*224.0/255.0) * b + 0.5) * ((1 << depth) - 1); > > +} > > + > > +static int process_frame(FFFrameSync *fs) > > +{ > > + AVFilterContext *ctx = fs->parent; > > + QSVVPPContext *qsv = fs->opaque; > > + AVFrame *frame = NULL; > > + int ret = 0; > > + > > + for (int i = 0; i < ctx->nb_inputs; i++) { > > + ret = ff_framesync_get_frame(fs, i, &frame, 0); > > + if (ret == 0) > > + ret = ff_qsvvpp_filter_frame(qsv, ctx->inputs[i], frame); > > + if (ret < 0 && ret != AVERROR(EAGAIN)) > > + break; > > + } > > + > > + if (ret == 0 && qsv->got_frame == 0) { > > + for (int i = 0; i < ctx->nb_inputs; i++) > > + FF_FILTER_FORWARD_WANTED(ctx->outputs[0], ctx->inputs[i]); > > + > > + ret = FFERROR_NOT_READY; > > + } > > + > > + return ret; > > +} > > + > > +static int init_framesync(AVFilterContext *ctx) > > +{ > > + QSVStackContext *sctx = ctx->priv; > > + int ret; > > + > > + ret = ff_framesync_init(&sctx->fs, ctx, ctx->nb_inputs); > > + if (ret < 0) > > + return ret; > > + > > + sctx->fs.on_event = process_frame; > > + sctx->fs.opaque = sctx; > > + > > + for (int i = 0; i < ctx->nb_inputs; i++) { > > + FFFrameSyncIn *in = &sctx->fs.in[i]; > > + in->before = EXT_STOP; > > + in->after = sctx->shortest ? EXT_STOP : EXT_INFINITY; > > + in->sync = 1; > > + in->time_base = ctx->inputs[i]->time_base; > > + } > > + > > + return ff_framesync_configure(&sctx->fs); > > +} > > + > > +#define SET_INPUT_STREAM(is, x, y, w, h) do { \ > > + is->DstX = x; \ > > + is->DstY = y; \ > > + is->DstW = w; \ > > + is->DstH = h; \ > > + is->GlobalAlpha = 255; \ > > + is->GlobalAlphaEnable = 0; \ > > + is->PixelAlphaEnable = 0; \ > > + } while (0) > > + > > +static int config_output(AVFilterLink *outlink) > > +{ > > + AVFilterContext *ctx = outlink->src; > > + QSVStackContext *sctx = ctx->priv; > > + AVFilterLink *inlink0 = ctx->inputs[0]; > > + int width, height, ret; > > + enum AVPixelFormat in_format; > > + int depth = 8; > > + > > + if (inlink0->format == AV_PIX_FMT_QSV) { > > + if (!inlink0->hw_frames_ctx || !inlink0->hw_frames_ctx->data) > > + return AVERROR(EINVAL); > > + > > + in_format = > > ((AVHWFramesContext*)inlink0->hw_frames_ctx->data)->sw_format; > > + } else > > + in_format = inlink0->format; > > + > > + sctx->qsv_param.out_sw_format = in_format; > > + > > + for (int i = 1; i < sctx->nb_inputs; i++) { > > + AVFilterLink *inlink = ctx->inputs[i]; > > + > > + if (inlink0->format == AV_PIX_FMT_QSV) { > > + AVHWFramesContext *hwfc0 = (AVHWFramesContext > > *)inlink0->hw_frames_ctx->data; > > + AVHWFramesContext *hwfc = (AVHWFramesContext > > *)inlink->hw_frames_ctx->data; > > + > > + if (inlink0->format != inlink->format) { > > + av_log(ctx, AV_LOG_ERROR, "Mixing hardware and software > > pixel formats is not supported.\n"); > > + > > + return AVERROR(EINVAL); > > + } else if (hwfc0->device_ctx != hwfc->device_ctx) { > > + av_log(ctx, AV_LOG_ERROR, "Inputs with different underlying > > QSV devices are forbidden.\n"); > > + > > + return AVERROR(EINVAL); > > + } > > + } > > + } > > + > > + if (in_format == AV_PIX_FMT_P010) > > + depth = 10; > > + > > + if (sctx->fillcolor_enable) { > > + int Y, U, V; > > + > > + rgb2yuv(sctx->fillcolor[0] / 255.0, sctx->fillcolor[1] / 255.0, > > + sctx->fillcolor[2] / 255.0, &Y, &U, &V, depth); > > + sctx->comp_conf.Y = Y; > > + sctx->comp_conf.U = U; > > + sctx->comp_conf.V = V; > > + } > > + > > + if (sctx->mode == QSV_STACK_H) { > > + height = sctx->tile_height; > > + width = 0; > > + > > + if (height == 0) > > + height = inlink0->h; > > + > > + for (int i = 0; i < sctx->nb_inputs; i++) { > > + AVFilterLink *inlink = ctx->inputs[i]; > > + mfxVPPCompInputStream *is = &sctx->comp_conf.InputStream[i]; > > + > > + SET_INPUT_STREAM(is, width, 0, av_rescale(height, inlink->w, > > inlink->h), height); > > + width += av_rescale(height, inlink->w, inlink->h); > > + } > > + } else if (sctx->mode == QSV_STACK_V) { > > + height = 0; > > + width = sctx->tile_width; > > + > > + if (width == 0) > > + width = inlink0->w; > > + > > + for (int i = 0; i < sctx->nb_inputs; i++) { > > + AVFilterLink *inlink = ctx->inputs[i]; > > + mfxVPPCompInputStream *is = &sctx->comp_conf.InputStream[i]; > > + > > + SET_INPUT_STREAM(is, 0, height, width, av_rescale(width, > > inlink->h, inlink->w)); > > + height += av_rescale(width, inlink->h, inlink->w); > > + } > > + } else if (sctx->nb_grid_rows && sctx->nb_grid_columns) { > > + int xpos = 0, ypos = 0; > > + int ow, oh, k = 0; > > + > > + ow = sctx->tile_width; > > + oh = sctx->tile_height; > > + > > + if (!ow || !oh) { > > + ow = ctx->inputs[0]->w; > > + oh = ctx->inputs[0]->h; > > + } > > + > > + for (int i = 0; i < sctx->nb_grid_columns; i++) { > > + ypos = 0; > > + > > + for (int j = 0; j < sctx->nb_grid_rows; j++) { > > + mfxVPPCompInputStream *is = > > &sctx->comp_conf.InputStream[k]; > > + > > + SET_INPUT_STREAM(is, xpos, ypos, ow, oh); > > + k++; > > + ypos += oh; > > + } > > + > > + xpos += ow; > > + } > > + > > + width = ow * sctx->nb_grid_columns; > > + height = oh * sctx->nb_grid_rows; > > + } else { > > + char *arg, *p = sctx->layout, *saveptr = NULL; > > + char *arg2, *p2, *saveptr2 = NULL; > > + char *arg3, *p3, *saveptr3 = NULL; > > + int xpos, ypos, size; > > + int ow, oh; > > + > > + width = ctx->inputs[0]->w; > > + height = ctx->inputs[0]->h; > > + > > + for (int i = 0; i < sctx->nb_inputs; i++) { > > + AVFilterLink *inlink = ctx->inputs[i]; > > + mfxVPPCompInputStream *is = &sctx->comp_conf.InputStream[i]; > > + > > + ow = inlink->w; > > + oh = inlink->h; > > + > > + if (!(arg = av_strtok(p, "|", &saveptr))) > > + return AVERROR(EINVAL); > > + > > + p = NULL; > > + p2 = arg; > > + xpos = ypos = 0; > > + > > + for (int j = 0; j < 3; j++) { > > + if (!(arg2 = av_strtok(p2, "_", &saveptr2))) { > > + if (j == 2) > > + break; > > + else > > + return AVERROR(EINVAL); > > + } > > + > > + p2 = NULL; > > + p3 = arg2; > > + > > + if (j == 2) { > > + if ((ret = av_parse_video_size(&ow, &oh, p3)) < 0) { > > + av_log(ctx, AV_LOG_ERROR, "Invalid size '%s'\n", > > p3); > > + return ret; > > + } > > + > > + break; > > + } > > + > > + while ((arg3 = av_strtok(p3, "+", &saveptr3))) { > > + p3 = NULL; > > + if (sscanf(arg3, "w%d", &size) == 1) { > > + if (size == i || size < 0 || size >= > > sctx->nb_inputs) > > + return AVERROR(EINVAL); > > + > > + if (!j) > > + xpos += > > sctx->comp_conf.InputStream[size].DstW; > > + else > > + ypos += > > sctx->comp_conf.InputStream[size].DstW; > > + } else if (sscanf(arg3, "h%d", &size) == 1) { > > + if (size == i || size < 0 || size >= > > sctx->nb_inputs) > > + return AVERROR(EINVAL); > > + > > + if (!j) > > + xpos += > > sctx->comp_conf.InputStream[size].DstH; > > + else > > + ypos += > > sctx->comp_conf.InputStream[size].DstH; > > + } else if (sscanf(arg3, "%d", &size) == 1) { > > + if (size < 0) > > + return AVERROR(EINVAL); > > + > > + if (!j) > > + xpos += size; > > + else > > + ypos += size; > > + } else { > > + return AVERROR(EINVAL); > > + } > > + } > > + } > > + > > + SET_INPUT_STREAM(is, xpos, ypos, ow, oh); > > + width = FFMAX(width, xpos + ow); > > + height = FFMAX(height, ypos + oh); > > + } > > + } > > + > > + outlink->w = width; > > + outlink->h = height; > > + outlink->frame_rate = inlink0->frame_rate; > > + outlink->time_base = av_inv_q(outlink->frame_rate); > > + outlink->sample_aspect_ratio = inlink0->sample_aspect_ratio; > > + > > + ret = init_framesync(ctx); > > + > > + if (ret < 0) > > + return ret; > > + > > + return ff_qsvvpp_init(ctx, &sctx->qsv_param); > > +} > > + > > +/* > > + * Callback for qsvvpp > > + * @Note: qsvvpp composition does not generate PTS for result frame. > > + * so we assign the PTS from framesync to the output frame. > > + */ > > + > > +static int filter_callback(AVFilterLink *outlink, AVFrame *frame) > > +{ > > + QSVStackContext *sctx = outlink->src->priv; > > + > > + frame->pts = av_rescale_q(sctx->fs.pts, > > + sctx->fs.time_base, outlink->time_base); > > + return ff_filter_frame(outlink, frame); > > +} > > + > > + > > +static int stack_qsv_init(AVFilterContext *ctx) > > +{ > > + QSVStackContext *sctx = ctx->priv; > > + int ret; > > + > > + if (!strcmp(ctx->filter->name, "hstack_qsv")) > > + sctx->mode = QSV_STACK_H; > > + else if (!strcmp(ctx->filter->name, "vstack_qsv")) > > + sctx->mode = QSV_STACK_V; > > + else { > > + int is_grid; > > + > > + av_assert0(strcmp(ctx->filter->name, "xstack_qsv") == 0); > > + sctx->mode = QSV_STACK_X; > > + is_grid = sctx->nb_grid_rows && sctx->nb_grid_columns; > > + > > + if (sctx->layout && is_grid) { > > + av_log(ctx, AV_LOG_ERROR, "Both layout and grid were specified. > > Only one is allowed.\n"); > > + return AVERROR(EINVAL); > > + } > > + > > + if (!sctx->layout && !is_grid) { > > + if (sctx->nb_inputs == 2) { > > + sctx->nb_grid_rows = 1; > > + sctx->nb_grid_columns = 2; > > + is_grid = 1; > > + } else { > > + av_log(ctx, AV_LOG_ERROR, "No layout or grid > > specified.\n"); > > + return AVERROR(EINVAL); > > + } > > + } > > + > > + if (is_grid) > > + sctx->nb_inputs = sctx->nb_grid_rows * sctx->nb_grid_columns; > > + > > + if (strcmp(sctx->fillcolor_str, "none") && > > + av_parse_color(sctx->fillcolor, sctx->fillcolor_str, -1, ctx) > > > = 0) { > > + sctx->fillcolor_enable = 1; > > + } else { > > + sctx->fillcolor_enable = 0; > > + } > > + } > > + > > + for (int i = 0; i < sctx->nb_inputs; i++) { > > + AVFilterPad pad = { 0 }; > > + > > + pad.type = AVMEDIA_TYPE_VIDEO; > > + pad.name = av_asprintf("input%d", i); > > + > > + if (!pad.name) > > + return AVERROR(ENOMEM); > > + > > + if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0) > > + return ret; > > + } > > + > > + /* fill composite config */ > > + sctx->comp_conf.Header.BufferId = MFX_EXTBUFF_VPP_COMPOSITE; > > + sctx->comp_conf.Header.BufferSz = sizeof(sctx->comp_conf); > > + sctx->comp_conf.NumInputStream = sctx->nb_inputs; > > + sctx->comp_conf.InputStream = av_calloc(sctx->nb_inputs, > > + > > sizeof(*sctx->comp_conf.InputStream)); > > + if (!sctx->comp_conf.InputStream) > > + return AVERROR(ENOMEM); > > + > > + /* initialize QSVVPP params */ > > + sctx->qsv_param.filter_frame = filter_callback; > > + sctx->qsv_param.ext_buf = > > av_mallocz(sizeof(*sctx->qsv_param.ext_buf)); > > + > > + if (!sctx->qsv_param.ext_buf) > > + return AVERROR(ENOMEM); > > + > > + sctx->qsv_param.ext_buf[0] = (mfxExtBuffer *)&sctx->comp_conf; > > + sctx->qsv_param.num_ext_buf = 1; > > + sctx->qsv_param.num_crop = 0; > > + > > + return 0; > > +} > > + > > +static av_cold void stack_qsv_uninit(AVFilterContext *ctx) > > +{ > > + QSVStackContext *sctx = ctx->priv; > > + > > + ff_qsvvpp_close(ctx); > > + ff_framesync_uninit(&sctx->fs); > > + av_freep(&sctx->comp_conf.InputStream); > > + av_freep(&sctx->qsv_param.ext_buf); > > +} > > + > > +static int stack_qsv_activate(AVFilterContext *ctx) > > +{ > > + QSVStackContext *sctx = ctx->priv; > > + return ff_framesync_activate(&sctx->fs); > > +} > > + > > +static int stack_qsv_query_formats(AVFilterContext *ctx) > > +{ > > + static const enum AVPixelFormat pixel_formats[] = { > > + AV_PIX_FMT_NV12, > > + AV_PIX_FMT_P010, > > + AV_PIX_FMT_QSV, > > + AV_PIX_FMT_NONE, > > + }; > > + > > + return ff_set_common_formats_from_list(ctx, pixel_formats); > > +} > > + > > +static const AVFilterPad stack_qsv_outputs[] = { > > + { > > + .name = "default", > > + .type = AVMEDIA_TYPE_VIDEO, > > + .config_props = config_output, > > + }, > > +}; > > + > > +#define STACK_COMMON_OPTS \ > > + { "inputs", "Set number of inputs", OFFSET(nb_inputs), AV_OPT_TYPE_INT, > > { .i64 = 2 }, 2, UINT16_MAX, .flags = FLAGS }, \ > > + { "shortest", "Force termination when the shortest input terminates", > > OFFSET(shortest), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, > > + > > +#if CONFIG_HSTACK_QSV_FILTER > > + > > +static const AVOption hstack_qsv_options[] = { > > + STACK_COMMON_OPTS > > + > > + { "height", "Set output height (0 to use the height of input 0)", > > OFFSET(tile_height), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, UINT16_MAX, FLAGS }, > > + { NULL } > > +}; > > + > > +AVFILTER_DEFINE_CLASS(hstack_qsv); > > + > > +const AVFilter ff_vf_hstack_qsv = { > > + .name = "hstack_qsv", > > + .description = NULL_IF_CONFIG_SMALL("Quick Sync Video hstack."), > > + .priv_size = sizeof(QSVStackContext), > > + .priv_class = &hstack_qsv_class, > > + FILTER_QUERY_FUNC(stack_qsv_query_formats), > > + FILTER_OUTPUTS(stack_qsv_outputs), > > + .init = stack_qsv_init, > > + .uninit = stack_qsv_uninit, > > + .activate = stack_qsv_activate, > > + .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, > > + .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, > > +}; > > + > > +#endif > > + > > +#if CONFIG_VSTACK_QSV_FILTER > > + > > +static const AVOption vstack_qsv_options[] = { > > + STACK_COMMON_OPTS > > + > > + { "width", "Set output width (0 to use the width of input 0)", > > OFFSET(tile_width), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, UINT16_MAX, FLAGS }, > > + { NULL } > > +}; > > + > > +AVFILTER_DEFINE_CLASS(vstack_qsv); > > + > > +const AVFilter ff_vf_vstack_qsv = { > > + .name = "vstack_qsv", > > + .description = NULL_IF_CONFIG_SMALL("Quick Sync Video vstack."), > > + .priv_size = sizeof(QSVStackContext), > > + .priv_class = &vstack_qsv_class, > > + FILTER_QUERY_FUNC(stack_qsv_query_formats), > > + FILTER_OUTPUTS(stack_qsv_outputs), > > + .init = stack_qsv_init, > > + .uninit = stack_qsv_uninit, > > + .activate = stack_qsv_activate, > > + .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, > > + .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, > > +}; > > + > > +#endif > > + > > +#if CONFIG_XSTACK_QSV_FILTER > > + > > +static const AVOption xstack_qsv_options[] = { > > + STACK_COMMON_OPTS > > + > > + { "layout", "Set custom layout", OFFSET(layout), AV_OPT_TYPE_STRING, > > {.str = NULL}, 0, 0, .flags = FLAGS }, > > + { "grid", "set fixed size grid layout", OFFSET(nb_grid_columns), > > AV_OPT_TYPE_IMAGE_SIZE, {.str=NULL}, 0, 0, .flags = FLAGS }, > > + { "grid_tile_size", "set tile size in grid layout", > > OFFSET(tile_width), AV_OPT_TYPE_IMAGE_SIZE, {.str=NULL}, 0, 0, .flags = > > FLAGS }, > > + { "fill", "Set the color for unused pixels", OFFSET(fillcolor_str), > > AV_OPT_TYPE_STRING, {.str = "none"}, .flags = FLAGS }, > > + { NULL } > > +}; > > + > > +AVFILTER_DEFINE_CLASS(xstack_qsv); > > + > > +const AVFilter ff_vf_xstack_qsv = { > > + .name = "xstack_qsv", > > + .description = NULL_IF_CONFIG_SMALL("Quick Sync Video xstack."), > > + .priv_size = sizeof(QSVStackContext), > > + .priv_class = &xstack_qsv_class, > > + FILTER_QUERY_FUNC(stack_qsv_query_formats), > > + FILTER_OUTPUTS(stack_qsv_outputs), > > + .init = stack_qsv_init, > > + .uninit = stack_qsv_uninit, > > + .activate = stack_qsv_activate, > > + .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, > > + .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, > > +}; > > + > > +#endif > > -- > > 2.25.1 > > > > Please avoid duplicating code. Thanks for the comment, I will factor out the common code for vaapi and qsv based stack filters in the new patchset. Note the qsv / vaapi stack filters don't require input streams have the same width or height, moreover user may specify output width or height for each input stream (HW may do up/down scaling while stacking the input videos), I won't share code between the SW stack filters and qsv/vaapi stack filters. BRs Haihao _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".