From patchwork Thu Aug 17 11:39:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ting Hu X-Patchwork-Id: 43240 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4c9d:b0:130:ccc6:6c4b with SMTP id fq29csp1897300pzb; Thu, 17 Aug 2023 04:40:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFKy31XCz7bkMIi++Guy3GCshULXp3weTDngpz5dd602A4ZB83zOfHXafsSfViD+4hbLiBQ X-Received: by 2002:a17:906:1bb1:b0:993:f996:52d5 with SMTP id r17-20020a1709061bb100b00993f99652d5mr3430099ejg.25.1692272415272; Thu, 17 Aug 2023 04:40:15 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i27-20020a170906265b00b0099b41f2c40fsi12569024ejc.924.2023.08.17.04.40.14; Thu, 17 Aug 2023 04:40:15 -0700 (PDT) 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=@hotmail.com header.s=selector1 header.b=eXPv0VNV; arc=fail (body hash mismatch); 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=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 394AF68C75B; Thu, 17 Aug 2023 14:40:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01olkn2068.outbound.protection.outlook.com [40.92.99.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0AC0168C64C for ; Thu, 17 Aug 2023 14:40:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nVmymj/ZuIrdR6WPUFtJvZXV1S2JhTwEeZyxmym3Bah0uwTo9iQmuLIlOLhKMji9xkugp4vi4fnnNPcjuvL4X7pjymNlZ2D5806/stBQ1wcRoMVWWYbuJUc40oZyO4arILPkliD4ZWPreaCrFdVDvMZ3hkH4zmj8zsD0TEbr2BXwdZKpw7S3GjZsIn5tMVyCMWGLZZ6G664nDDXSUhxWYNieYpkEu9MnxqK/r6BX3wkHk/5mdQLbS+J7wHFXqDERsFjUXWKxm6QBzT4lORfEV3FXM5SbauapMKLvgWEgzjOhr2MpmM3oaN1Z3YwFo2BeG81IEMXI7uyEMpLEdfjkcA== 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=up+15uZMNI2bHD1rQv11+/x25HK10NiZNZKjAX6K7dI=; b=ABomdGBkaZ/EP4FNJ2MLh0aJXwWKSEGs/9FU2Lz7wnH+MYrh4h5yAa1PsRYXarRFzQrrcWOWIqN/DRCCmWx2suQrt+QjLq7/+7QWYNTf+a8siJ+wg9KmRDPu6C5EAtSymXSk5sLn102Otq/UPdqi3hMnHrRtt3/VvAnFfnlNCMwa1XjBuhAN7zVGDtJVAfRGyrqyKIHm6NBhhcgyCelCchNK0tg1X/j1qm6y9GHkUxDPLCNbwrLaIJRoMCIqLu7GSjZKr/R5jTeWlCFPNT70I0DS/MF/yah6fve+kMpmnf/cW+cADmgdwZC5l3vFKPidyO+zPRLrheiZmuMjVNch0g== 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=up+15uZMNI2bHD1rQv11+/x25HK10NiZNZKjAX6K7dI=; b=eXPv0VNV9iaSzEaPTu/uHGuGm8A/M8Hvx9YYTJTx85VTQf4BKYzjRuepfLlPW/ezvV+ZA0tZMsUOyivanFyhQSQGUmp1vpbqUBwvL+9V3a2Oby4N/4kdTH/48Tz1ugtw1cHC3elPkgRjUpXnGQK7TBifVDA19Vb9qSZhiDhPY/7XJHRJ7xwTq9ilYskP+nTi/D2ZA98NQCa2KVqt0ZSZe0vsvQTvrOoE9oCnhPOVNt7vil04zCgheHZKpywofZp/mVWzfcIgjwrOYjL/M82VcC05dihHyAlv3U6vprMfvpWj4srfY3OiBUUTlD22DW5/HfjjoQlJn+r1U+r0OcDphQ== Received: from OSZP286MB2142.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:183::10) by OS3P286MB2182.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:197::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.31; Thu, 17 Aug 2023 11:39:58 +0000 Received: from OSZP286MB2142.JPNP286.PROD.OUTLOOK.COM ([fe80::b375:f4c:f02:2aaf]) by OSZP286MB2142.JPNP286.PROD.OUTLOOK.COM ([fe80::b375:f4c:f02:2aaf%7]) with mapi id 15.20.6678.031; Thu, 17 Aug 2023 11:39:58 +0000 From: Ting Hu To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Aug 2023 19:39:42 +0800 Message-ID: X-Mailer: git-send-email 2.38.1 X-TMN: [utldBhMjLqwiktJnrTB1eytIMMNBDs2e] X-ClientProxiedBy: SI1PR02CA0040.apcprd02.prod.outlook.com (2603:1096:4:1f6::7) To OSZP286MB2142.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:183::10) X-Microsoft-Original-Message-ID: <20230817113942.816-1-siriushu@hotmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OSZP286MB2142:EE_|OS3P286MB2182:EE_ X-MS-Office365-Filtering-Correlation-Id: 43a966ff-b5cc-46b1-0fb1-08db9f16af6f X-MS-Exchange-SLBlob-MailProps: znQPCv1HvwXklo9DZU6FptFMfySZb0h6efHobqnA7PVvg3Wwdeu2UAPewra2s3u1gc83cGTcqv95LoLIxwIVNdcu/a2aVPWYCc28RmFAWWuCxAhlxiIfZWFhOWJ44nApT5WiKTi1NmzMHbVgiF9VK0UD6JuPAP0jQVKn6Eh7vLMGKe0rmK3w2AMP5fdRTxwKTUJzdSteE/5UCbA93tPPj1BbeyIWx5olC3peA+a6GKivlYSaDx2eLFRkzrQuSC2TJYQXKO4sVnUQvn7brUEufBv1PvXSt1hFlWa2APvBtxJsNkJXEUU0iDBQuCNlqmm9sltWEB+RZ4oJuNfiyICjP8fSQA9O2QOgPZ4NGAlbT/3MyQ7EWkITpFkQ496385Ajh7YaunNOemtwbl14VLTQeP+AxQl9Gij5Bg/yVxxTHtrcE0uqzqjEKwaxkgJInvjSSFKDH1qub2dS+Mx6Gtz9ESvKwQ5GEVoDr1OTaFAjAt1sHH12yoI1s6rbB071blDYH6zEE7PlXq1Hp01wOGH/HWtN76p2zkV7fmcQvs0lov3MhxUcIC8kttppLbHLxJW1WR7DSF/2HW1dWRV+LCZX/aoPYyKVFUERKMmiyupmBFU9djpaUYTw4jag4VgDLdqdxLqezKfAWzyEdozSxoUlJXZqWOo6PaIaERd0YawhdrliBTa0RFcRdsBb+XjEemwlOdJC3Rrnrrvbt9m/slpW8135MsrySrIu0Zd62ztmfDZPY0oA8n63MI3VrPduFmvsNdI70voFhqo= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wg7ZthWHhrZPgJZzQaAVYejRMWlKgiSFYz4jgLioYZWnCq4q/Lbp3vthq0yHgxcmze3EAQwcRJg9prEfZnkBj2tiyoR1dcu2mSJ6pLne5HfdRZWXx8Nz7JWggo3t+WCWNoJpYJLXa027H/FmbxgVZfXLsTRAELkbMhYN5tXhxyQq1Y63UUHvYwLeGZgGCtroG4ZaUiuqFFfGjbTIcCLoN6UjzRZwFjBUe84CnQrJYb/LgdLPCJmKJPvY/d/OrXcwNgkiY2WKSOfKPLb75OJbk/GgnreL3DLzwwd0gY2Ubxd+3GXivSLicynKgOqoqTGjydCoPVqT70UhVpKWo4nSewK6NXAlPQYe03ohFYIqSkwI1ny2ZLDH3BgAklsN5rVp52NpYj1ggQmZ6aFK9Mm2QdGbPRZGvZLtxB4Csi6ft28HeOgUdR+WMtoMv/xfD68Jh02TpfijkrgLIlSMoQpoYuzDSlX686VredS30J4MprBoBNQFtPFajo38OIZii1jKVEbRgD3yqu7/iI+0/5fBdHRjpfhOj7g6PUu6kvkS0eeaiKOq6SEWrnrgSTIZ2RIjjStP1nt9P23fOvig8m4I1yX8hwvdU6wDPB5em0Fn9AYxcqM2nWQtOghYuV2vb7zu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: laYZrEIGMeX76De3ejvldRad8B6svYprFVvb+BvQpt/bhJi7+bX/ZHaxFJgMlP1QZXWsfpTopwQL8u91OZK23HRBMsukLspBFQkSg/CZoVHtfvkvn3JZNpAMLhoHquWlgQeL8p8jYRP+s0+ufnoUH8P/Y9pVmktr0OfRGmoqYcjLy8cjYtLxiY1uSBTCUlcXdHkwCSZiRE5iMCr/14bhr3aGFxbimSKq3ljGvlTSNUbNA+F8fMKOp6lilsTTnKZoo04VE4v8Fi1xqqg1uy2Bj+f9/EBEhnTR/Aq1Uk1LqFDoh2PSoSxpQ1RlPgW81eYRWKcEPau7MWwhJLPhZd+39OcEbGBCd1tvRrL2YbFOfilCIz0JNlOraoqA+CWmjGz+h/lnVwORerS9MeTJHwoSVLd3GjFiGnK7SsOaH6xoMoqJ11i4rNaK6qJtMVRlBs1mxrfwcOy5hvqXSr7YJo7ehQVKPIagt4KLHuqn3ebANudCdxJVEwgdF7XXXJNF38Zc4fEQDSadaYm+LDmSa5YH2xUNBf/X7rJut94ThBRPSLXjI+jnGCRXTMRaSgppgkyn1IBspO13WuAW8Cal6YHDdxU3lTOJTV2ySWxqICO3KgifQU9XpeNgurfTqFHW+6quR2poUPxUSsANQQNChcqGFK4RAbnUGqOz12NxwxkVJ58ZDEGnTCoLNI+0yzXV+BmGv4kofW3gYEzjTveBo/lkuii/zBxxU8v3QDcaAZ2nd56UJywHSNRo+rzRgCcznM0/KEluN6uv44y71AnGPSdiMh0SW1J2le9KXedSsYydGmuGBmpm2wSyX/a9uMu3d8QH9b+6/Uw/9ByxRLi4P+sRgCf0dH3HUM9c5ZHIwnmDNX08hDVM23zGbteVhopIf5IsWZI7lYFOJEU3ZjH8nGCyqtf0AX+XnuXKaGdWg4eAQ16vWu+XwY8IteYIJrsZiv/h+qy1Rsqiu9G1M9dpdKeutMUW0ecRPqYsqBmem2yfmB0AWLPlgWUrE9OKCCLZRfrTCZ1kb0bMY4H0EWX4WDaAK801EZh1IWy9pm6KuxAcKQA6bYqTOyq1Jr2tjnGgnX+RUFAWU+U59NeHlfFA2dGOZGn1lY5hZF5yumoRh4b2EIS5+hIhtM2WeFfXHPr1VIaChsnOi2FRa9VQQPwemXrANe1dqMD+HH5GCQ0WlztCJN96wZjGi8mdA0dKdX9VMl9mqAy/mrBG27lkHndO2VkxpA== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-05f45.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 43a966ff-b5cc-46b1-0fb1-08db9f16af6f X-MS-Exchange-CrossTenant-AuthSource: OSZP286MB2142.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Aug 2023 11:39:58.7866 (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: OS3P286MB2182 Subject: [FFmpeg-devel] [PATCH v1 1/1] lavc/qsvdec: fix dead loop of qsv decoding 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: tinghu3 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8FFg9/dvIekX From: tinghu3 MFXVideoDECODE_DecodeFrameAsync always return MFX_WRN_DEVICE_BUSY in special scenario. Signed-off-by: tinghu3 --- libavcodec/qsvdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index da700f25e9..35102fb476 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -703,6 +703,7 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q, mfxSyncPoint *sync; mfxBitstream bs = { { { 0 } } }; int ret; + int max_count = 0; if (avpkt->size) { bs.Data = avpkt->data; @@ -730,7 +731,9 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q, insurf, &outsurf, sync); if (ret == MFX_WRN_DEVICE_BUSY) av_usleep(500); - + /* Check the max wait time 500ms to avoid dead loop */ + if (++max_count == 1000) + return ret; } while (ret == MFX_WRN_DEVICE_BUSY || ret == MFX_ERR_MORE_SURFACE); if (ret == MFX_ERR_INCOMPATIBLE_VIDEO_PARAM) {