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 AFFE141199 for ; Tue, 4 Jan 2022 02:26:11 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6E65168B20C; Tue, 4 Jan 2022 04:26:09 +0200 (EET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (unknown [40.92.41.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E878268B1E7 for ; Tue, 4 Jan 2022 04:26:02 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gd2WpTCj8J73tqgzitN3grpNciBGcwMxvhPCwEWJ0QvY5SlyWXiHE+9IJdmjL97biBo0pYcDFuIpFUDMhUpJm44/nsLpwB9Kr+d9e1RnalGgp3vylL4nDN4PhYEF3xNzHLfqmGMDbxJ0U7qV0wgzVarWaT3J9vrCNop28juG93QI67LFfHhU5RrzkXPTGWFJ7dkeOQ0kS7SgErI7ChMsBPZ5AhzKOsk1IC8+km4x+YwbJF2D5XOnnY6nGXGDwbPBfaX3PQ/UcAA1NifHL7SmLyyQETydPDptXoLFLnyiA0xg3ul+2gUm1tzp/VfNmDSOwdbYA7k7INOW9GeZJ+Nqwg== 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=UfBBKI4IPm010A0HRLtZonShFCUzypOr7HGv8ASoSno=; b=HtKZiSU9iO/CXpxrPlsqw1VRE3lrirpBBOTDf6JZBTA35ZS/Gya6BuskKIOM39IItUEmsfZ5KLWQ3/tkPoXauzGlBEOUNP3NPvNz/FVmgho3DNR/xqVAJod+ixoODPc3LlbUATl8woaq/OTVayjaEbalkgaDficFdyTnQ70RH6CQZDYtf6YDbi2VUNbJ/E/pCSNzhzkBf9g1zmvwnspqVENPe97b856U7ZJrh8H+XOi81nHMPTpM3B70RMjjedxYjL8vgaUGp5JOaiap8PBz56Z58Ss/AGATuyBMngfv3DziiZOT3Y/tqZRnI+Ji2bi0Xq2ONYrT+EXNnP8+cslvJQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UfBBKI4IPm010A0HRLtZonShFCUzypOr7HGv8ASoSno=; b=L/zcvK+KDVBD5Bsqc/G5tgBwh7z04IBJA8klFeQKPxkYLVJccXBFni3wKYCB42hQ8AY3cw6yATfiMfLp3y7+UqlffdacZGq9IkiylnrGoAN1xKpwf5bTSZCOr0fHKqxuRR25q0qWIJ6sC1YcTM8QLAVs+xI4x9xZBOTjzz9HURMZycvD4yM+fK/r+E92g0eZ9n7PmkfrgDoD3zHd5NvirjWpE4c7ykTiWviUNcWkvF8FtFcRzqbHkExqgFZpgEVYw75/yQSzm7lYcroS5nh6xAnutjnWn71mtOtpCsghMcUai6C6hs79i5U3xanUYKLZrNYRvIE6chQbGf3DkHmMcw== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0256.NAMP223.PROD.OUTLOOK.COM (2603:10b6:5:316::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.14; Tue, 4 Jan 2022 02:25:50 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::54ae:66eb:e304:96d6]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::54ae:66eb:e304:96d6%5]) with mapi id 15.20.4844.016; Tue, 4 Jan 2022 02:25:50 +0000 From: Soft Works To: "Xiang, Haihao" , "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH v2] avfilter/vpp_qsv: fix regression on older api versions (e.g. 1.11) Thread-Index: AQHX/4quk+HYoqrLg0uqNzgLvyKpAaxSIvcAgAAA3QA= Date: Tue, 4 Jan 2022 02:25:50 +0000 Message-ID: References: <56d6ca16679da102a94bd5d330777324cc0a200a.camel@intel.com> In-Reply-To: <56d6ca16679da102a94bd5d330777324cc0a200a.camel@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-tmn: [GAfIqA3BnyIsnocqQtV0conSjWdSJ8dz] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 82368ba1-5bc0-449b-c857-08d9cf29867f x-ms-traffictypediagnostic: DM8P223MB0256:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9tFIBbTrlO/8Q7hzOB0Au6r5+rMMrN8S2KuJWqta9U90xY2XxPdwrHNSxThaqwwEPj+vxLHjEbkAT8ZiCjv5ai5cjDcZ7FIVOGbA0E1hEYXktUlhKEE6HXsy5lcDVXgM60A6aMbQtYOd20KCKhz+Cdk2sVsmcByUIdCyQQgUvUwSFqQkvw07rTZy9IuaR8X38+zDrjtHVMofkoPomtr5qAbiW7jyyxwgKfyUzZ6Z1rmrdwiaZ2RFBX2OigV3iffKzrv5bRiXlgD/UvxlcLcgszu7A3lQ01lWl4q+ABoSdhn33299AEyAH3v8FtpcE7e+iPlKVUxfp1a9QjlHreS2L9fNUs+0OppCOUoFbC9mqLZCilBNab2eN/gIk/KptGdquxAiahfGOqC5Q+hHWvVoAb36DuVy/TVDDO0oK1tpbv9kG0hwP/4i5NMKYnIXQfVoohYOpBonS8E3ioxoCYyJFzSs2YSBA0hZeTBQgoR97M0I6Cu9yEVgnnIc/nJ3S3vIVQNWXePkT89E8Q0lAcv3g7PdpxLSwcZSDl3CC73h+4eUieUmAhEFaxU9uLabOJ4CXWpUqYD3rf6Eg9seiu3ZLA== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: N0htGf8h6Fm5E0ZhpQhZfDcImRxwjfQu8ViW25AyrO6a/bjSw7o0kYrZ6fVoLv0R5LM5iHJ4Mwoxh4inR0/YVuwkWWWshDYiz1frnG4gwpz4+bNJXYTcOxFNEc+xO5dxzr5bY7ixixwmhx3vBEkxT4HxD3EgxDZauBXad28m8fFZ81lg6+YuDCmazi+dTIX0/e5Kl3Trd8I67lI5lSoA2SByiOGKYCAYLts1sYA+Y3OweSof1ew+eEaaKbBb8GO5peW1vQeJGI6Wj4f1xiaG0SstplIq5JQKb2eZZxwSVrPSjqZ/vaB4Ktnjpw6L2wXgGDhF1t41B1ugMVIC5YZtyY22vRrOJihiJm/I+gaNYgfGzrTv6cameyApfQONzpgkMknNpEH5V4VPeBlbwfBa0Z+chmle8m+LLsE+NYFrAji/MNrSOAtnfGHnLIiyDmlymnRgfXsfyr7sXF/1Bg4MORTPXgwqz9rHKvflIrGlr96Hgq+rk15jlhk5ulYmC5njEpnUlymjshrnezYx2vqDamXBlYwd3UPDyIG3KaOI3iT/7JfIq5hFsO3YN/u8eW9BavbIWSdb85O6ftftNeYj1uT0mNwcqJF+Ge05tBHJBIH0myu1QEUJNgI40LS6s3+nJEPH4u3RuoMCXM2LOfCK9mfP2DG9UxurG7q2wGzO/w5lstG1xnBp31CFMTFB44dIQ8vxVeAiwzk0x6/4DlW2apMLo3rhXxsUVGEecMllOB7qVkrcKOlYq4iW/puIA3ZJOv+DyuChIuA/cxf5/wMoiMrYOlY+x6sDjcb/DX0foyimKz5eRzh/sp65XgI/XVmutHtk6g7Sr2AOzgu2OkMxrNCPF1UO7DRoIpPD0HSpjEiH/auNDgH2bYL87Kb9sub2b6HHk2wN5YKSqpKxClAxjEfnP6xZQtYwyc+owJ0lHgvYLdBWifcPdgoJIKkaG57G MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-1ff67.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 82368ba1-5bc0-449b-c857-08d9cf29867f X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Jan 2022 02:25:50.6141 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8P223MB0256 Subject: Re: [FFmpeg-devel] [PATCH v2] 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 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: > -----Original Message----- > From: Xiang, Haihao > Sent: Tuesday, January 4, 2022 3:16 AM > To: ffmpeg-devel@ffmpeg.org > Cc: softworkz@hotmail.com > Subject: Re: [FFmpeg-devel] [PATCH v2] avfilter/vpp_qsv: fix regression on > older api versions (e.g. 1.11) > > On Sun, 2022-01-02 at 03:41 +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 > > > > Published-As: > > https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging- > 15%2Fsoftworkz%2Fqsv_vpp_regression-v2 > > Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging- > > 15/softworkz/qsv_vpp_regression-v2 > > Pull-Request: https://github.com/ffstaging/FFmpeg/pull/15 > > > > Range-diff vs v1: > > > > 1: eea966f702 ! 1: ccede9d840 avfilter/vpp_qsv: fix regression on older > api > > versions (e.g. 1.11) > > @@ Metadata > > ## Commit message ## > > avfilter/vpp_qsv: fix regression on older api versions (e.g. > 1.11) > > > > - Commit 8b83dad82512a6948b63408f964463b063ad24c9 introduced a > > regression in a way > > - that scaling via vpp_qsv didn'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. > > + 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 > > > > > > > > libavfilter/vf_vpp_qsv.c | 32 ++++++++++++++++++++------------ > > 1 file changed, 20 insertions(+), 12 deletions(-) > > > > diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c > > index ab58a5777e..09590157e3 100644 > > --- a/libavfilter/vf_vpp_qsv.c > > +++ b/libavfilter/vf_vpp_qsv.c > > @@ -139,8 +139,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 } > > }; > > > > @@ -304,6 +305,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 +319,11 @@ static int config_output(AVFilterLink *outlink) > > param.ext_buf = ext_buf; > > param.async_depth = vpp->async_depth; > > > > + if (MFXQueryVersion(vpp->qsv->session, &mfx_version) < 0) { > > + 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 +474,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 || > > LGTM. I wonder whether you installed libmfx and msdk runtime from > different packages, so the mfx version is higher than the runtime version? It's about a user with a Broadwell CPU on Windows. The latest drivers' MSDK version is 1.11 and our ffmpeg is compiled against MSDK 1.35. (a setup that is basically working fine, just the runtime checks are missing at several places) Thanks, softworkz _______________________________________________ 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".