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 2D3B842922 for ; Mon, 10 Jan 2022 07:03:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B859F68AE5D; Mon, 10 Jan 2022 09:02:59 +0200 (EET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 05CFF6805AE for ; Mon, 10 Jan 2022 09:02:47 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641798178; x=1673334178; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=5oMWJ33kN1d5WCd0dauO1qS1DGRYA5bHrFFGIsy2SW8=; b=oK9HOrImrBt0LQG6yzc5hPn/zS0EhwkciydGRV5ttXPKrpmNouxcBmrh ajnp9XObq0A0paT4hKmxpJJzH5JsxFRb3A8Kxe8XoAID6BYipnGRdNVlK 6JptfjF+TbLTaGS6llUWaE8F1ZlS4Zx4301Z2tVj8t+INof2/trEtdAHu 3kelobqGJ6T71o4X2Bv48QsiajHxCMuG9NsIGbq2j+TA0nvg7FMj2kcR4 uTWhTKiJ5QLk4mZ6IxH2jJENJ4Hr9yOJ/Z59Ylk0LADyIcn5VbxpTmYcx NI310nHAvl3Nmn4bFIcykEoLnflAOmDYmAkmV+XdsNHK8WyJlYxhO39ZY g==; X-IronPort-AV: E=McAfee;i="6200,9189,10222"; a="241980319" X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="241980319" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 23:02:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="514571783" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga007.jf.intel.com with ESMTP; 09 Jan 2022 23:02:44 -0800 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Sun, 9 Jan 2022 23:02:44 -0800 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20 via Frontend Transport; Sun, 9 Jan 2022 23:02:44 -0800 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (104.47.51.48) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.20; Sun, 9 Jan 2022 23:02:43 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fn9niDSL0f72xuKxvg0sI56LB2p9V/m4hUCZIQ6KUTtnokDUjlPD6HyFTvd+5To27AtO7miMWOn7vK5ahHq+MqAlRaVBWDYMUdHMA4UZny6JaV9hlxNnlOhG5fPoM6iSrSKXvkYwfpR3yG2QSktwCHno3qzxcfRiqO9NLOcg/EY1POtei2eq2bdnB4w4symNFd0Osa3MtcuCQkKi5EvdUyl07oa7vIty9MwcDBIPpVGaNVoTfs/J36GuLBw9dsinP0arReK+34JS0FT7+RUMyrWpQLeOGlKw+hwkSVhCSjtSv0OsVn5KKXqYX4sm8h7XVMfAUPZudUMWEp4w7OgG8g== 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=5oMWJ33kN1d5WCd0dauO1qS1DGRYA5bHrFFGIsy2SW8=; b=aKW0TWb7dCjmT3qi/l21kgKb6Qzh4KWY1r7JH1FN+tJeFlP4R0R7Z/n+Ii6EULzOd6KwRbKFO7vXmw3SPSNBjwlK1ecdnU0ECYf/LZcep2UxxUYEftaK9D91EcxB9GXVr+i7ycHR04BlBkM99vs7to6/D21L3cllcuavHqNu0V1HMcg+8JAcCnzuTeGTEHMLdxmdUxrb2+kmQJoWPstRq8m52P/ZE+6FsprWUKNOT/2ZdmnCMflFwf+KE2itOGeGQM6NMBGDlUtwHZa5pMK15GtAH087TpOyE64R6Yygumqn2NhITN/N6lltBrrOlEL8uoGjDWfI+vGxTsWhQp/tgA== 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 BN8PR11MB3731.namprd11.prod.outlook.com (2603:10b6:408:8b::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Mon, 10 Jan 2022 07:02:42 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::d436:c6ab:6e71:8843]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::d436:c6ab:6e71:8843%6]) with mapi id 15.20.4867.011; Mon, 10 Jan 2022 07:02:42 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH v4] avfilter/vpp_qsv: fix regression on older api versions (e.g. 1.11) Thread-Index: AQHYA5R5u2NB2vJ7kUG92s+gKQhBiKxb2NIA Date: Mon, 10 Jan 2022 07:02:41 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-AS, zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Evolution 3.28.5-0ubuntu0.18.04.2 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7fe43546-1e2c-41a0-509e-08d9d407321a x-ms-traffictypediagnostic: BN8PR11MB3731:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1775; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 3SM5F9R2ydZ8Cl8TGGoZhoEMfGExbbgI5FNP4DoI8AceBUPxd2zYGWf0r1fGWoMavUiCGOibP6GcMPiUxjhcMmc7auN9V0YwT66SjFNkHYspe8/s8qW1veE5F43s7gOFmA/Nn4zn2ZV0fZw0l+cygtvLvXJ9aKGEHTYcTWdgSxbrC3oK8MroOmXVufG3XbuvE+FT7lmqlfhQ00y+P6eu2nRVp+l2PXla30KPRdSJhp5QDAiNGaFm2NezgjEhUhSdw7FeNML7+t4mGuRVsd38kmH6ocetL4m/6OzU4gdLBV7KOVbtP6ChTNjUfVY5XobFKgQfPxOMHdG3EIDGeQqzUzo0XTPcHWDfp0Zok6me1S826q0NMbWok2u4dgFk5gkYhozatMO8Jb7lErpMW0kzh50C75cFQFcLXi4GCw/ywRht6kV4NgbKgpwUeieJCN2jSXop8MmLDYSylLE2sZ1DDIJqcEVtcjpgM28TCMXYxPhbZKe5x2zzpxU3v6VPLfsXL/fpPyYUb6XNsFDev3szBSkcKuSMaTb1BEKpJotDXw6zVbgRxU2mtyJbWmA5/lZ39muoSZSWOpxMvbcDFIfCT6Ig2F6kQxOwcgWIzXnA+8i2S4m86JI5QRXijr8XKuQ1tryl3crFN3pHu/S5bgYWCDiMyJ/IM8VhP3oXECPIX2B/EvIRJNR8TW4Hy3ke8q2SajtF7JbgJAAHWz5z8nZwpaGHgmCnXMZiJwEd2JstgGP84D7dRKB4NC93FG81YCQqJGH1xi8/E8j/3ijIkzSOkLomig3slLab9jmN+6nir4EUUoaIXYj3kmaAcIRkeHEsrsYvxVqjTJ3WM5WB7jo/KRlgd3JFpfaf635GHa6Eruw= 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:(366004)(966005)(508600001)(2906002)(71200400001)(4326008)(86362001)(54906003)(83380400001)(6486002)(186003)(8676002)(5660300002)(66946007)(76116006)(6512007)(91956017)(2616005)(66556008)(64756008)(66446008)(66476007)(6916009)(316002)(8936002)(6506007)(26005)(36756003)(38100700002)(122000001)(38070700005)(82960400001)(99106002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?Y1g5RkorZ21zWTVKNGphaU5kMGM0S2ZQNkI5MDNpM2VCb24zVkM4dDYyUURN?= =?utf-8?B?YXpta2pscUdiblcrWVVpcGZVUVFEMjhtREVqK1hrbk4rMG9CRGNqUDBEOHNP?= =?utf-8?B?LzZvek5aVHo5T2xmR3pzYU43N2lIMXVUcjZYZ1pJOE4vOG56M1QydWZvSHdQ?= =?utf-8?B?OFhoV0FDWjRkZ3FyRDdVZVNadTBPY0Erd2dCcXZTMTgwbEZvdU9hWkk1NVlC?= =?utf-8?B?QTNiWi9RY0FFZUNaT1hkbGdaNno3d04xWStHWituSzR2MmozcjlqSFkwVHVS?= =?utf-8?B?Tjd3dXgzMSt1cXlJTktBKzVKSlQ1R3QwT0lPalhaT1hPWVFnOW8zUjA0TE9X?= =?utf-8?B?dDR6THZMcHUyU0FhbjBDYTV5OFg3ZVVNcDZHbjdhOTZkaEtGbGhOQ044L1gz?= =?utf-8?B?UXFZZ0drelBBZDRmbERpY1E4bFNLajR6THRNSjI4NkZvU2ZkeU9MTEVmOVNF?= =?utf-8?B?enhHVmtQZzRyT2lZNFdSUzJqZGVYV08wcnZ3L2NvbTVJZXN6TlM2RWJpNjVv?= =?utf-8?B?bE1HM255N0Z2SEM5VUxGV1ZaZlM5UHQvdTZ2Q24xQkw1dWdRTE0xZitLU2p2?= =?utf-8?B?NnRmZzR4cGZHcVo5QWY1MVZadEg1aGt1L2EvT3dJdnloUVYrMmhGZG83NFJM?= =?utf-8?B?NEp3dk5mWDV0WWRqRDh4dWJlNDhpTWlqeUExdTIzRVI3N3VJcEVXMklZTkRo?= =?utf-8?B?T1NkdkZWUStyekVPRTdpTUJMdTZLc2h0bVBoQzJhcWJBckF1RmFDNUJqS2xm?= =?utf-8?B?VmlwaXgxVDBWK1loWlpGNlZmMyt6VGQyeGNhSFNKTmU1a21MS2VzSWFLOUkx?= =?utf-8?B?OVhaWG9jdFlVNWU5aE5KSG83UzVvR2JWT215NnBTK2pOdWxwNEdMYnZwalYr?= =?utf-8?B?eXJQRno2RXJhekxTTXM0SWRXTWg4TFVWZ1BWdGpyRzd0L1I5NW5aWmZFc2lN?= =?utf-8?B?Z3lXcXl3U2VpM1lJYkJIb0xCbVNaVmY4YXEwcFhOVW44RG10STAxRktRMGpr?= =?utf-8?B?MXpMWlVOR0pEcmt2YzZ6LzB5dkphUzI2ZElDSlBJNTh5MTlSYzAwRWxQUXpV?= =?utf-8?B?em5UcytvZjU3ZWk3V01ic2ZXOURnY1ZuWGRQaVVpb294MGpyc1o4VzAxc3F0?= =?utf-8?B?VWl0RHdvK3MwOU1sQ1ptUFF6MkV2QXRjUjI3YVRzbldVLytURjhocjhRQUxp?= =?utf-8?B?dTlWRXZvWSt1RS9CYmZJbGc2elFyeTJoTUt4aDQ1R1QwYll5dkRJU0JwT092?= =?utf-8?B?S0NhL2Y1dmVkeW5lUFN1TzhnZFR3TFlIaWZ0NS9vTkx2TitjSWJWeWx6RDVr?= =?utf-8?B?akl4Y3J0SjVjeUpaeWQ5ZW1mamUxM05reEhKN2RCU0k4cEIzZldSVzdnUzM0?= =?utf-8?B?RjVQTjBWbEFIQzRwbnBEbmhmUFYwR0dPUVVJMm16bnpQWmlpdkIrM2hrY2Zt?= =?utf-8?B?TjNwdjFGY0RvbFJRRDVpb3lxYTl1bUluTUNiRmdnanIzVW9qeTgwY093QkRE?= =?utf-8?B?Zk5jeUxuQmRSSXgvY09vdzZBNnRJSEdDR0tEYWpScWJsS3ZKVjBNZW83Q3NH?= =?utf-8?B?SUxPdDcyenhSbzcyMlErNnhVOVZNVzNaeFVsNS9LSi9sb0RMc1ZMKzc3dmFS?= =?utf-8?B?U0prSGxJckg1Q0p2LzcyWkRCSlRKTy9hSUg5SitJSGpPVGpwdE80c3NOVU9L?= =?utf-8?B?NnczMTU3V0FZQU9zQ1NOYUowR05uV2NoZjhuUEVHN3d6NGFWN09KbXRWNW9h?= =?utf-8?B?dm9mdzV2UFBhTG9MVEdwNFNDalZFT1RwUnlqV1NVOE8xeHVuRkRkZTkzTFFt?= =?utf-8?B?M25pdW1jV1dubWhXcGN0SUV0VDFJOGlDTVRHN0s5Q1ptZjJxUTJrQ0R0ejdy?= =?utf-8?B?MDA2a2tkS3ZCUCtFMHlGZGxsblptOXg2ZVJYQzBUSzN6Y3Nxd3ZtcnBpNTlm?= =?utf-8?B?T1RNWWpCeVlyZnQvTWphYnlkQjZ6VEZCVE42Z1JkRWl2Y1Fnd1Nab2RtWnBQ?= =?utf-8?B?TkVDMmJXeFVVcllVZ2tJdWpFb1lQcDBuQzZILzZSQ05VYmR1M1RMTTZxUTZt?= =?utf-8?B?ek1ldGNQY2tZaHZBTGZCbk1lWUE5eGZBcTNLcnVTelppSlphenVjOU9KVXpH?= =?utf-8?B?RUh1d0Vjell1Y2c0OURjMGU4NGF6Vng5OTBITGhQTmtuMWptaHJvZHdIeDJV?= =?utf-8?Q?tLjtI62CJoZq8AMHTelOX1A=3D?= 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: 7fe43546-1e2c-41a0-509e-08d9d407321a X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Jan 2022 07:02:41.9768 (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: ofGmtKB2xpT8H/VvufkdXPhuul3iflDQ6WtYMRjVKOArGe54RmPjFhpQ31Hpp3Bglj1q26Hc9l3ih++eoVy8wA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR11MB3731 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH v4] avfilter/vpp_qsv: fix regression on older api versions (e.g. 1.11) 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: "softworkz@hotmail.com" , "haihao.xiang-at-intel.com@ffmpeg.org" 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 Fri, 2022-01-07 at 07:01 +0000, ffmpegagent wrote: > From: softworkz > > Commit 8b83dad82512a6948b63408f964463b063ad24c9 introduced a > regression in a way that scaling via vpp_qsv doesn't work any longer > for devices with an MSDK runtime version lower than 1.19. This is true > for older CPUs which are stuck at 1.11. > The commit added checks for the compile-sdk version but it didn't test > for the runtime version. > > Signed-off-by: softworkz > --- > avfilter/vpp_qsv: fix regression on older api versions (e.g. 1.11) > > Fix a recently introduced regression when using QSV VPP. > > v2: Fixed commit message wrapping > > v3: Use different way to acquire runtime version > > v4: Use mfxStatus as return type for get_mfx_version() > > Published-As: > https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-15%2Fsoftworkz%2Fqsv_vpp_regression-v4 > Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging- > 15/softworkz/qsv_vpp_regression-v4 > Pull-Request: https://github.com/ffstaging/FFmpeg/pull/15 > > Range-diff vs v3: > > 1: cbf53d8ef4 ! 1: bf53154420 avfilter/vpp_qsv: fix regression on older api > versions (e.g. 1.11) > @@ libavfilter/vf_vpp_qsv.c: static int config_input(AVFilterLink > *inlink) > return 0; > } > > -+static int get_mfx_version(const AVFilterContext *ctx, mfxVersion > *mfx_version) > ++static mfxStatus get_mfx_version(const AVFilterContext *ctx, mfxVersion > *mfx_version) > +{ > + const AVFilterLink *inlink = ctx->inputs[0]; > + AVBufferRef *device_ref; > @@ libavfilter/vf_vpp_qsv.c: static int config_input(AVFilterLink > *inlink) > + // so don't error here but let runtime version checks fail by > setting to 0.0 > + mfx_version->Major = 0; > + mfx_version->Minor = 0; > -+ return 0; > ++ return MFX_ERR_NONE; > + } > + > + device_ctx = (AVHWDeviceContext *)device_ref->data; > @@ libavfilter/vf_vpp_qsv.c: static int config_output(AVFilterLink > *outlink) > param.ext_buf = ext_buf; > param.async_depth = vpp->async_depth; > > -+ if (get_mfx_version(ctx, &mfx_version) < 0) { > ++ if (get_mfx_version(ctx, &mfx_version) != MFX_ERR_NONE) { > + av_log(ctx, AV_LOG_ERROR, "Failed to query mfx version.\n"); > + return AVERROR(EINVAL); > + } > > > libavfilter/vf_vpp_qsv.c | 59 ++++++++++++++++++++++++++++++++-------- > 1 file changed, 47 insertions(+), 12 deletions(-) > > diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c > index ab58a5777e..5c96703fd3 100644 > --- a/libavfilter/vf_vpp_qsv.c > +++ b/libavfilter/vf_vpp_qsv.c > @@ -26,6 +26,7 @@ > #include "libavutil/opt.h" > #include "libavutil/eval.h" > #include "libavutil/hwcontext.h" > +#include "libavutil/hwcontext_qsv.h" > #include "libavutil/pixdesc.h" > #include "libavutil/mathematics.h" > > @@ -139,8 +140,9 @@ static const AVOption options[] = { > { "height", "Output video height", OFFSET(oh), AV_OPT_TYPE_STRING, { > .str="w*ch/cw" }, 0, 255, .flags = FLAGS }, > { "format", "Output pixel format", OFFSET(output_format_str), > AV_OPT_TYPE_STRING, { .str = "same" }, .flags = FLAGS }, > { "async_depth", "Internal parallelization depth, the higher the value > the higher the latency.", OFFSET(async_depth), AV_OPT_TYPE_INT, { .i64 = 0 }, > 0, INT_MAX, .flags = FLAGS }, > +#ifdef QSV_HAVE_SCALING_CONFIG > { "scale_mode", "scale mode: 0=auto, 1=low power, 2=high quality", > OFFSET(scale_mode), AV_OPT_TYPE_INT, { .i64 = MFX_SCALING_MODE_DEFAULT }, > MFX_SCALING_MODE_DEFAULT, MFX_SCALING_MODE_QUALITY, .flags = FLAGS, "scale > mode" }, > - > +#endif > { NULL } > }; > > @@ -297,6 +299,32 @@ static int config_input(AVFilterLink *inlink) > return 0; > } > > +static mfxStatus get_mfx_version(const AVFilterContext *ctx, mfxVersion > *mfx_version) > +{ > + const AVFilterLink *inlink = ctx->inputs[0]; > + AVBufferRef *device_ref; > + AVHWDeviceContext *device_ctx; > + AVQSVDeviceContext *device_hwctx; > + > + if (inlink->hw_frames_ctx) { > + AVHWFramesContext *frames_ctx = (AVHWFramesContext *)inlink- > >hw_frames_ctx->data; > + device_ref = frames_ctx->device_ref; > + } else if (ctx->hw_device_ctx) { > + device_ref = ctx->hw_device_ctx; > + } else { > + // Unavailable hw context doesn't matter in pass-through mode, > + // so don't error here but let runtime version checks fail by setting > to 0.0 > + mfx_version->Major = 0; > + mfx_version->Minor = 0; > + return MFX_ERR_NONE; > + } > + > + device_ctx = (AVHWDeviceContext *)device_ref->data; > + device_hwctx = device_ctx->hwctx; > + > + return MFXQueryVersion(device_hwctx->session, mfx_version); > +} > + > static int config_output(AVFilterLink *outlink) > { > AVFilterContext *ctx = outlink->src; > @@ -304,6 +332,7 @@ static int config_output(AVFilterLink *outlink) > QSVVPPParam param = { NULL }; > QSVVPPCrop crop = { 0 }; > mfxExtBuffer *ext_buf[ENH_FILTERS_COUNT]; > + mfxVersion mfx_version; > AVFilterLink *inlink = ctx->inputs[0]; > enum AVPixelFormat in_format; > > @@ -317,6 +346,11 @@ static int config_output(AVFilterLink *outlink) > param.ext_buf = ext_buf; > param.async_depth = vpp->async_depth; > > + if (get_mfx_version(ctx, &mfx_version) != MFX_ERR_NONE) { > + av_log(ctx, AV_LOG_ERROR, "Failed to query mfx version.\n"); > + return AVERROR(EINVAL); > + } > + > if (inlink->format == AV_PIX_FMT_QSV) { > if (!inlink->hw_frames_ctx || !inlink->hw_frames_ctx->data) > return AVERROR(EINVAL); > @@ -467,19 +501,20 @@ static int config_output(AVFilterLink *outlink) > #endif > } > > - if (inlink->w != outlink->w || inlink->h != outlink->h) { > #ifdef QSV_HAVE_SCALING_CONFIG > - memset(&vpp->scale_conf, 0, sizeof(mfxExtVPPScaling)); > - vpp->scale_conf.Header.BufferId = MFX_EXTBUFF_VPP_SCALING; > - vpp->scale_conf.Header.BufferSz = sizeof(mfxExtVPPScaling); > - vpp->scale_conf.ScalingMode = vpp->scale_mode; > - > - param.ext_buf[param.num_ext_buf++] = (mfxExtBuffer*)&vpp->scale_conf; > -#else > - av_log(ctx, AV_LOG_WARNING, "The QSV VPP Scale option is " > - "not supported with this MSDK version.\n"); > -#endif > + if (inlink->w != outlink->w || inlink->h != outlink->h) { > + if (QSV_RUNTIME_VERSION_ATLEAST(mfx_version, 1, 19)) { > + memset(&vpp->scale_conf, 0, sizeof(mfxExtVPPScaling)); > + vpp->scale_conf.Header.BufferId = MFX_EXTBUFF_VPP_SCALING; > + vpp->scale_conf.Header.BufferSz = sizeof(mfxExtVPPScaling); > + vpp->scale_conf.ScalingMode = vpp->scale_mode; > + > + param.ext_buf[param.num_ext_buf++] = (mfxExtBuffer*)&vpp- > >scale_conf; > + } else > + av_log(ctx, AV_LOG_WARNING, "The QSV VPP Scale option is " > + "not supported with this MSDK version.\n"); > } > +#endif > > if (vpp->use_frc || vpp->use_crop || vpp->deinterlace || vpp->denoise || > vpp->detail || vpp->procamp || vpp->rotate || vpp->hflip || > > base-commit: 242ed971cb005157488b9a21942d9fb4be4d0347 LGTM and applied, thx! -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".