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 5B47C4279B for ; Fri, 7 Jan 2022 07:01:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F091D68AB64; Fri, 7 Jan 2022 09:01:11 +0200 (EET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07olkn2064.outbound.protection.outlook.com [40.92.15.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9523068818E for ; Fri, 7 Jan 2022 09:01:05 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ieuLmwsVQ9Zk0Zkecr5D1MhCpsXxH+sn83wOKTFuYncuaKqJYgFjKwuouxLgFXgm296G8TR589P5YdcGXV3WcR1LiALNQzx9XsFmvpi8C1Ut5UMxmFeqZMIjLul0sk+QlL9Ndn8d8XjCTZFkopWtjO8VEUWljDZl6GMhCMSmCX/4g6E96L+F5KIEGP060BNe5l5yDAVqN+wssxQ0RK5oi0NsSkU8CGyuTiixmUaBArJQo+DVTNMMNl9ZhJ2e2QmVoXgFFTUHqt92Ghr6UTgIaNoypKtsV146vOTe673TI9vPgt1pnKlKxfEuk2TzQIMC2d8sJpuGKetUIOwuafxJsA== 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=/j99gqew8ZQnl3yfk94naQ1wBFYr8bOtcfOqb1V28A8=; b=hGYsbUIPcvA1FarkgpZsAbnRB5gn8XaCIMK8M+moKko9mGUeaZesjItaiAPQ6LpB+oMwAk2HNRPoAGwZ1pEpc/gSjiYsQUIQpv5s5ksb1LWiaUpht8h7HqsmiqE3D47cTYe07gNjeSaUo6cE5ZazoxJKOddtCjm/QXRlVPSNcLAycNOQa06sI8+9OOxDslY7vPH0+rXeoSxqKevZh9ziTfXFt7k4x2cyaIY+glpN1BhJHlgI0UUrLclmTGpqYK1db3Kl2+Qaq4pjmZHwm7fNsPSVyUxN7gC+2KZeSKAh3zLwQKMXF0yj9FLWp8jxg9ne8G2X2MrmKqMWqwqCQszfUg== 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=/j99gqew8ZQnl3yfk94naQ1wBFYr8bOtcfOqb1V28A8=; b=k8CuRU7rplpoXZUTY8kci5Dx4Ch8srKWX9y41Tlha1t87V+vIqSD89AOF78huqcoyHijsorsaBUgBWOOC6q9ultSge8/gnQPM561zjecUuKyj0zqwRqsYH/aP6N0CAVo+oqwGQzIs8GTvwc0TAhfAK55QA3AED89iuaO5gseGWFgncxwQEltB/uJUpujSPHX+pKlkUzoUVHs3cBtxtNpr0V7hYub45kL9+KPFQQbSdK8LK/yKGSMbyqIXUNo8RdgxfM2z0tkWDkWJJv4p1F+n2+jQ7UVujwDgkHFICF2XiGj/sz0qydB+ndlOMc96PKJqrzoSHIAxvmSHAu+6fer+A== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0077.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:2::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Fri, 7 Jan 2022 07:01:02 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::54ae:66eb:e304:96d6]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::54ae:66eb:e304:96d6%8]) with mapi id 15.20.4867.011; Fri, 7 Jan 2022 07:01:02 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH v3] avfilter/vpp_qsv: fix regression on older api versions (e.g. 1.11) Thread-Index: AQHYA3rbD3NlWYXkjk6ge584ze9dyKxXHiiAgAADUDA= Date: Fri, 7 Jan 2022 07:01:02 +0000 Message-ID: References: <82f72b147e752c537011219088aeb313a7f2086a.camel@intel.com> In-Reply-To: <82f72b147e752c537011219088aeb313a7f2086a.camel@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-tmn: [P+h4g8IfrND6vJqh2WHHpw5y0byrrkqu] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1cecb60b-965a-494c-9cde-08d9d1ab7759 x-ms-traffictypediagnostic: DM8P223MB0077:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: YGKIMUAI2j/2nr2t42UAvfJlFF1pa7gHjEdjv8wXUxLYrUWJbBCYM8HXP/T4KbKAOPw+K2sGZIXdHdpicsMnjPucapQm3LnYypBp+14NzJff7W4nnSil6hyGhNOuHtF6L7ZHZbbgTc7CP66ytPaYKeK5sLG3UIh87rQz2RWpO0NIKppPgz0NFJQ+FiUsyjL7hveCNOlf1cVNJdpWnv4Dtd7ENV4jEcZCluKIF5juiF7Fp/pJtpeuZvgOf18H5X2uzwetB5s6akJQn8mkk4Lbs5DMub5pxSKPWq1o9iMR1+98t/YyNveRYuZx08QkgPAnVVGcExvc2y094dFpx3ETRxIA/QN2k52kH/15c1rp4CbFUR+XyX+NWpPyWMrOMDKwIB+VhPDzdyBk/8kTk6+KHnjV9q33rxsheFsPSVwiZFh8jebdHNpdy2SxFDK/OuQlhHIFRhn6U7G8vRWH4qIXgHruoDhaioDe+ctD8q+HImNyn8YSbq93AwyJVEq9QeepfnGvhleExTZU589QLyBzZHXTEeq09Y+hRHtUjKfAJOAeYcvDe+kk92OzMMFNYPXe9feCgDnYdLXrfmPMdmLZuS+2PCux3gwao5E0+9mva1BqFDkvyuKgwjOVUf1c5H1sGg2HodzI6guITWp7AmE0D3W4sbfKAFcG+FYJWKJJILQ= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: IHFbB3J43gzGk+PDVOD0OerK4a6AOnQATnm9KtJbb9izWZXfMZqwaJ6RqiZg3rdapzaPLCOYMPKpAUVY39jBiXJvbDwGjtQFy7WodCYkKfNA1EKSsxsBN47KMSzmjaj5aNyuAZJ4bOgHaLdCeQoOG+xrXR9uGRu7yHIZE0BnE7iNjTFxAgEIoCj5ucS1EBggiyS9AQZKRdz6AmTFlAlsF7bpaFkz3DLlHYoxy7iI3sGBVOVqY7LMXjptUshPgPRqeBCtwJLX6y4hBEG2jSFdEFz7yim5SuxgiDFfbXjDo387OBPMqpbSt3tu5IEv1l27G3xFyFMBV/ljAyq+5UYyE+4t51nX1oZIoLMPSM+Yotb3x7ua+ZmyjP7wTnYEHgGAmsEXgvoRbY0eiqbvluzAyk5Z3wUVjZl/+oYrCmb0B/mksa7Dwy9fzIzQyOLlmLXzSDhWpiyuSRVB31ObgYNd/9GWFaq5BCytAS4xLRxb7OxUoR8JE6mCtQ/shXB7wl8LgGwszza6NN/G1BpUAvLDAZCFQI75i8+QfdV5FW19LdbSukM70AItlfm/bqf0U7OjzcelWR32k/2DHxWV8dkj6TaCKOa8D48lE+3Q//obkuzrFWL7E1EBORh0lktWPy2sNBZ76OkrMG+A2lN1FWKNXnThmtCgkDOyhd7AECIGP2RnqusNxvkEX5kxGHhEkpWubO1FUHzx0346PS5KLM+vd0NKYb4/0CLTavnWu22n2o7Ux1pBXIHt0b7mQL2/4VxC3ji33lCehgzbeo+Fjvxk28Xgbr0OOqmmrcXQvDtLGbXxbn06PVzXhg0qNnf8Alcux91AabH7qMsJ67NWt1EIizbKenmc34SSl88FaM182fSHL3NOLd+8NqyH2nKxDKe3Qz5Qp0WvYS9RqiNJAMkoTeuyQz2mOPY1g4qVZ8FixvO4JhJPqcmlW5CpLOP/eUfL 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: 1cecb60b-965a-494c-9cde-08d9d1ab7759 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Jan 2022 07:01:02.0984 (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: DM8P223MB0077 Subject: Re: [FFmpeg-devel] [PATCH v3] 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: Friday, January 7, 2022 7:48 AM > To: ffmpeg-devel@ffmpeg.org > Cc: haihao.xiang-at-intel.com@ffmpeg.org; softworkz@hotmail.com > Subject: Re: [FFmpeg-devel] [PATCH v3] avfilter/vpp_qsv: fix regression on > older api versions (e.g. 1.11) > > On Fri, 2022-01-07 at 03:58 +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 > > > > Published-As: > > https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging- > 15%2Fsoftworkz%2Fqsv_vpp_regression-v3 > > Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging- > > 15/softworkz/qsv_vpp_regression-v3 > > Pull-Request: https://github.com/ffstaging/FFmpeg/pull/15 > > > > Range-diff vs v2: > > > > 1: ccede9d840 ! 1: cbf53d8ef4 avfilter/vpp_qsv: fix regression on older > api > > versions (e.g. 1.11) > > @@ Commit message > > Signed-off-by: softworkz > > > > ## libavfilter/vf_vpp_qsv.c ## > > +@@ > > + #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" > > + > > @@ libavfilter/vf_vpp_qsv.c: 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 }, > > @@ libavfilter/vf_vpp_qsv.c: static const AVOption options[] = { > > { NULL } > > }; > > > > +@@ libavfilter/vf_vpp_qsv.c: static int config_input(AVFilterLink > > *inlink) > > + return 0; > > + } > > + > > ++static int 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 0; > > ++ } > > ++ > > ++ device_ctx = (AVHWDeviceContext *)device_ref->data; > > ++ device_hwctx = device_ctx->hwctx; > > ++ > > ++ return MFXQueryVersion(device_hwctx->session, mfx_version); > > Thanks for the new patch version, it works well for me. > > It would be better to change the return type of get_mfx_version from int to > mfxStatus if returning MFXQueryVersion(device_hwctx->session, mfx_version) > here. > Otherwise map the returned mfx status to ffmpeg status, then return ffmpeg > status. Yes, makes sense. Update on the way.. sw _______________________________________________ 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".