From patchwork Tue Aug 1 15:40:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43065 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c11f:b0:130:ccc6:6c4b with SMTP id bh31csp63569pzb; Tue, 1 Aug 2023 08:40:12 -0700 (PDT) X-Google-Smtp-Source: APBJJlGaUF/c9tHizKbNOlBiZMW4VMi6LKhJMmALISmGWLt62L8K7dCTFhn1nqX7HKuEz/kxbR5r X-Received: by 2002:a05:6512:370b:b0:4fe:279b:8a02 with SMTP id z11-20020a056512370b00b004fe279b8a02mr2006537lfr.67.1690904411918; Tue, 01 Aug 2023 08:40:11 -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 b12-20020a170906038c00b00992abdccff6si6181270eja.576.2023.08.01.08.40.10; Tue, 01 Aug 2023 08:40:11 -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=@outlook.com header.s=selector1 header.b=HErYjPWe; 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6215468C551; Tue, 1 Aug 2023 18:40:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2017.outbound.protection.outlook.com [40.92.73.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16AC668C16B for ; Tue, 1 Aug 2023 18:40:01 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=joby9nPdA8XndVuNfnzzGn74veBb+8pHwhWcbbceuvbLOOrn+aBMOROg8r59blA3BXe7k1Hz69UFqXPFncxcspiyoOjcMqASim5iCczb4i3fMvTW6bsSYFL68uCixWDvgoAhW7lZDfMW6O8so6dBB/XOVUQyQ5cz+l2jJff7IUgkM3u6bTCzU7Q4JNBPzxbcJXXZaO/360OqTmp1B6DmipifZY7qwUmu8Hg4uM+9j97FNyKstgdD25e3SoEkbW1urgh0iHvhDDyk1CDg62lMLcZ3ikSyS4seWOgAtBwWtCuQTzUD84uMqcWT2QqBdzLaWiC3bj8m6+0+mCbkiuzedQ== 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=rfcHZ7IqL3qOIZC1cj02J0fDvfpW59lCGjSsRx1IVHI=; b=cRgU17Vt1IrC17ESajTjYCyRSQgJG91oLmgPaw+ZOXt8aB+Zt7CdVaBc63Hv0Q045jdQvVIh8ZeRggdEhhr9vA/tFGRLRRKVi2woaO/0gIwAp0FyNAD2DN3a0+ihA4w5/6nQjRrl70W/Zv43fvbAydjD97q5vYVOR6+Q890YP+KjkNfoptCbOztPczt9MngntEI1dkmvD2rspFa46J263u1FRjbnOJ57n1snlXsZHsNj1YAM8xvsjkmmDUpjGIVi18jnYQ8DBfRZ5YngTIpRAnXPJypi20emuurMcOlpwAXwqBANdQNd7fof5Z4IZCucAX0uKtyhuhE94GJcL0udUA== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rfcHZ7IqL3qOIZC1cj02J0fDvfpW59lCGjSsRx1IVHI=; b=HErYjPWefFO95F2qgWHvZkZsGwtLi5KP3/3CRPXyA2cGtj2G8gMz0Fz3sm9uIWZe2P2zAFVJB9iepnEN65xgL2H76CXkqGWIP7U2+L5kBYbG2JUx2zG6J67vYoWUDinaRBjxLumrhuJBIq8uY0V3AhBbQTWggFjC7Hu0jauV0NnBRa4vbkLIG+mHhTxVYKD3Dv/BGNWdZ9Kn+jc2f8WjPJCzcKMIqk0BwqJZwjrVV/LlGoWqP+lY0xpwOTHYXYJEkh/e+TPre0W83rpfyQgX1EWVM0T4wL5Nxkb1GN+dlUpQW4LoEiapdSCpJtlTAzpgcn62rmwSeDYPlCeklJ9OpA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0299.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.42; Tue, 1 Aug 2023 15:39:56 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c%7]) with mapi id 15.20.6631.043; Tue, 1 Aug 2023 15:39:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Aug 2023 17:40:57 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [gEmpF/D637xvDCfztiVlHy5kHTZsVUW/7XwdWieOwyE=] X-ClientProxiedBy: ZR0P278CA0041.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::10) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230801154057.3914628-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0299:EE_ X-MS-Office365-Filtering-Correlation-Id: c2ff9124-e4b7-4f35-dbfd-08db92a58ec0 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpdHtR81+IA7nbDSCnGfE51Jb7FvxmbP9kZQpmEnqwAk699NuPaXRidgWukNB/kJ7M+CbprzesuDPzJ+NTAsx8/c7Zh9ILSKQHHO25IFBCM5ZB/rF7S5o/tCZq+/58zkF7qXVYjwIrEvTgCPFKE9AZ+hbr9yBt4MvwMDM8npzTvyg7rT8cPBL2+kYvBUPYjxFnkAEjl/xwkUaNTIdHtpf8zmNl9CPq6phLZC4SLOb/9ZsqGO2K+yo7Y+A7FnD6pY9TYDfIMugL9PlcBwAFJo5+TiwIlTwYCrXjoSVY1tz3QushmycgQprPGqgUG8ttbHphAQlAcCcYM1QvE0AQKqjGTjeBZOZOsP8T9UDTPLi1I36gsmYqfH4QXjtm2oXcvyzuGx6KWijF2sfu7CSTXPN9GWJvMcJRkBUh7G0urxMqpZDo1yZ4qu+zuwC7aZeUOMxCFLa1p/QmQvWHOORYefUXq/dUEas5C4fch55APMtDf44MSq/d32GvT/hSjk0yjHC+98lhLdoBu6MFtntNAHgBprRCq70KPqMePLJGEWbf9V8o+A4BfYnIQJkbSQJc+IebwNCPTJxOsMPjIXHi7lUERgVjz+yLoOsG+uTuFYb52zIUK6EYrExHPwebotHVFlEJHMHv45x2RoejmiH6QlHMY0Qb/s3ZTxZm9GDWhoMUOCRBmTgM3i1X/xoKIS4vMnmqOURXqB0qZTabGKXx6zb/9p1Rb8YOH3/qeWj7USzijCv2pAFts0G0biVQvy0isod0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8ZM7haHhES/WEefagAkT4/Cky5+iGsAtE9uGRUGAx48NtucdJveHrmTKhemRV1Gu6XWWH3xmK/JJxtNz2p85GvrBU6e6KCqQ6lC0oYygf3Yn1H9hXM7r5hryRl4O9CMqkIQEQlhsJTgmmDGCu9jn84nFEbdKFxQWnNn8R8pa8rizKbwtTKpuvav+pcfc/KSHoLmrfP6XNgyY7Dv26EOneDPw7eBMt8BPm35grOxCkPFRiY5j7bMgktHPlHh/zyd4UteGrrBcJBLZx/04d7OAHlV6rBlJq/Oib8tMK+JAb2azc+oxEL4McOKfHGuslvusl2A6yY02aMLA/GGCBg46PpmVoMm3dWV5W53hopbtKTpc3iGqM9uYMYrbyk0mLyySbflTorNxpaMEpkMw5FpmRTo8VLfkzhnL7VN6enr/Eo8pOKN9BHm6f3BGHOGVIwBfdPUx5rckoEi1Vzei5ypl2TdlzNCvPnAlY9fgTMsidVL/3iOJUxfLC0RWqur0jt2rom6yvr2hRrIahZ16QF00bVfvBiB+M92jLFSyq6Jsm3Tk68oSfjGNeTM3dTK2jB93d1vaiWWnzQoEeISsy9B7WXRFhBfNn4ZVOCENurW1GPi/lijf+Kw3ZPmt72MoSsEE X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: b4nci93jEi7/Wxo0gQYp0IzqbgmSvVAFM2hNO5QErQFThX7bYwFiPUqiqJUPduz3bxhBbdAmD2gBvxuqnHDLYyuaeTnkj7ticgaGl9ocbt4V3E+bSi8v60zIb736vsTj0HoVNBMd1a+PZcXdLNt2/0WcTwj8OjIpVBXYxyoV3kM1AZSKdofkYkSaX8wDSIcortj6FlG7uvZROdIqF3sdwLTKvzIud7wUCu8RpLZci/0Te8xdoAwhw+vBc9hmpk3oPvs+QDpE1Mw5APRrf7qBfbd/0Q95kSekwY4aEPEEWGtG0o2W+Wm+tOlhVv9VMibk9C3xKbZKTJuUbRSJ9p2xlE4QYJbICrs3If7S7bH3Ue7wKwAhK8tCHKb68LkF0TW0/E9wfaF1/dKuamuKJ9ebP2+w9ZUHXmf+jzkcoGtPts1LIw2Wla9Yaf2XgU3RrInQzDvY+AkO2pD9yPSr1EXxTBIe5WxWlHOKAOHC/wSuMRUaBtfzm++inNsjC3MigqMGBJmE+qp1nVLf/rJ3HL/RleNvoVJfEsQnt+7k700Xf+EwCGLAJT2gi31J6qxEMDL1JMCNCjkCgh/uW2P8BezksO/D6XA9kiQTNd39Mi3HEfnpY+ytaYHN/P29QScbzz9SVXnfZZrtcsIQJ8xUBJlRfA30WbWUzaeNKSjgt4oXsktWL2GyA1K/HaF1U10WAEhuUoDrCrfphWyuTRg4aOrua8DJQ9qhRTkQ78luKkA77eFeetcgEoz/RACgPsZhZ1NC914AbgWTMQpblZXWZhBSnVdOgjtPGfsl2efFyqaRAQV+OtDN8fm6zmxBJ5PmpviQWycXhDK3YSSkoyDS6oa0iBksk7crXok7VsB1MWk4fjSOufZuJqkJk5HXRDF4o4WMnohqHz6wCH6XZ7QTrKqtz3lp8ZiWPJXgEKUb9V2kXqmpn1qkl8aNbjD8l4eNoEYnp5H3HhXSRGufhF+d8g4BszsxeZYIg7ZiZ32Hv6TiWe+GZlRMxdCcluzNCfePdNRil2FxQ4J1+ITUg6kltW5CO8SICj819z0Gbxegbb+WKurmC142gLP1fPWHQMnnib5scyshaY4Dj0fKxoDskmxCcBXPk5K6t/+g0IqjSDaghT2LbE9Q3CJxmjcZ/Ys0So9SuX0D8iKDbdTbQVZqtzHrilwMb/85woiBdc9iQnpiiY59xU9UgAo839bHAlxI9PsQZAE3nMxgnWjoaK2iRlBuvFl/ftctvqQB1SGEab8ZjLjEXF4Fh02Kxp4B44IDphHh X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c2ff9124-e4b7-4f35-dbfd-08db92a58ec0 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2023 15:39:56.8567 (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: AS8P250MB0299 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/error_resilience: Remove always-true checks 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: l3vUWYYX68vC Having a decode_slice callback is mandatory for HWAccels; the only exception to this (and the reason why these checks were added) was XvMC, but it is no more since commit be95df12bb06b183c8d2aea3b0831fdf05466cf3. Signed-off-by: Andreas Rheinhardt --- libavcodec/error_resilience.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 2aa6f1d864..68e20925e0 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -804,7 +804,7 @@ void ff_er_frame_start(ERContext *s) static int er_supported(ERContext *s) { - if(s->avctx->hwaccel && s->avctx->hwaccel->decode_slice || + if (s->avctx->hwaccel || !s->cur_pic.f || s->cur_pic.field_picture ) @@ -828,7 +828,7 @@ void ff_er_add_slice(ERContext *s, int startx, int starty, const int end_xy = s->mb_index2xy[end_i]; int mask = -1; - if (s->avctx->hwaccel && s->avctx->hwaccel->decode_slice) + if (s->avctx->hwaccel) return; if (start_i > end_i || start_xy > end_xy) {