From patchwork Wed Aug 2 06:43:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43072 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c11f:b0:130:ccc6:6c4b with SMTP id bh31csp455396pzb; Tue, 1 Aug 2023 23:42:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlEEaVsGnOK1q7iJ9gUWdq3XVFQ7KEcDEWqZQCvI522toqucnD2HSDs0ZwXctdTXCo0aHbEG X-Received: by 2002:a17:907:60c7:b0:994:542c:8718 with SMTP id hv7-20020a17090760c700b00994542c8718mr3943313ejc.76.1690958561971; Tue, 01 Aug 2023 23:42:41 -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 fi1-20020a170906da0100b009932528281asi10166322ejb.579.2023.08.01.23.42.41; Tue, 01 Aug 2023 23:42:41 -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=nlvOEsQo; 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 935FE68C59B; Wed, 2 Aug 2023 09:42:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2068.outbound.protection.outlook.com [40.92.89.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2EF6E68C116 for ; Wed, 2 Aug 2023 09:42:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mlmwwbq9i06W7XYMURmVYus9ex03O7o05bJQq1yQEamv/k5phDsDGyEWlc9HHsWw/GECf64AIcx66N8uYkDwB9+4qfoDVXm60yDIdghDIxPK4mZtuFwc+Cv5is3toGBiJvEmVXsn4c1LkEsHlH8E9e2MfK1vrcFeyLn2tv6n3D0EBClOuo/oiHJ2ua3Jj7MNshIFOjzfp2hVo9pc52t3K8O368TRzk7j8hVd4x/Tv3ArZ+DVTAXm4F4X/PKcGSuwmVMpM1XRGmcS4j/TGtxiXtWfAJEK4Pfp02ZJ/wU4nPDKWaRkk49nlLhXET3PtUz4IBh0T846HGP3YFVXEJqlEw== 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=h/J9dzxUTOzH5vXm8UFgT0ZXiwennc5nubQGW+jEQCk=; b=dNf9DjKElaNMHCcTo2ULPcvFFUSCJLqDMX9zyWOtQJ1MU7gya3K/hvcdaQEnOis3fZVzZ+u4utOLHDUIiTuhPhsDXnb7kx0XPQ0/b0BlEITlUp1fl7qB98vvtxNVNBlQgYh5oA4ncYcIOpA3prbahoFyMc3W8KqudeOruUy3uMUCQvKUFAGuxVkc4EmqJ74pbDIFoSvafhwIlUVdtw2g4besZAXaWPL/kfr11y4PUoBkxLGPSS8GrqChv2x5+E1WiGsul9z1r4PqiOfBcpXDnkiWljFaWUD/VqtTEz964ysIUdlkcN7d3Z+ZBwn495LsmQzUlh4yLIlxkIGsmhZmIg== 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=h/J9dzxUTOzH5vXm8UFgT0ZXiwennc5nubQGW+jEQCk=; b=nlvOEsQoo0RiRR5fdxHhcY74Z2f+SoZD4PBMUPxXuA78RYDn8HlN0eMlqBkEKebMx7SNGltm0KkxYqqFfPqdtf9JYLgj51wiu+HG8F9JQu61ec6bzrEFMiw718pcsSjGh8lw/X5GgNhi/jprp6W8hD9MxHYeJYw3yY8cvOfLIZDMg7msj9FteSsSPIWO4dKdtvBok/osKINutuvF8FTB8SJmX4ZoUKLxsowX34HbyOtrUTL+Qihq3zVdcVofa59BOwv7lKHLdoXdSHH/ygIg55IiYCbxT31iQcset1OzloPSLtAMFa4SV2KfPeuXfst1lpqPeZwzohcIexWBE75ZYg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0048.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:23b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 06:42:29 +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.045; Wed, 2 Aug 2023 06:42:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Aug 2023 08:43:29 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ibuof5+zchRsUqe5vqUjGfc04858f5bfqBLIrHX1CN4=] X-ClientProxiedBy: FR0P281CA0148.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:96::9) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230802064332.39795-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0048:EE_ X-MS-Office365-Filtering-Correlation-Id: c55d2ee0-e79a-47c8-a517-08db9323a433 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrpbvZQFz99JeucukBOVYaZQjBLAiHbfQ2gN9W/JUhXccNT1czoED2QCRlmnT6K9GcXw6K5buELzyk+SAKAtNw/jrO2T0JeWLUwyOXPPSZn3XskWtFY0rh/y3HyPdQw0H35yUVDGqPvMWi8L7ahzMO/PzJCKDU+pMY0MePqy2q0GIRIdzoViE4Kw4RtB5Mlt2KkuzyheazgX/yYSh4X7QY3fupeJeiTUFkuaanq+0Z9RVIOYgoi+14/p5Fo2idzItokPrfNaLiX+gdNRMpcoipgMXGSRFRq7jUjqInNsxc54UvlPuLCNHiBKc5S1WyGSCjr+HdnKHGPQMv4JFdwiTbi+5OSrZqi/kBjXHRcwC2G3gtv9OL4cWrS6F6srrcVlrT01eUbgw9RJCpO6nt7k4DvYfBBX791o3UI/xWepLBQGviHxkztB//MQ8a6M7Uq6skiwpqgeqBOZdYjHzCdcazMnO8iMgzvdHtqYh9CsVKW2EXrhhQC0jz5DF4tyn7truBZ2HprYnt9adYVhNIqZRsYr3OrYGotz+WUBufcfEUHchdnOv2GJCMZxM0REw5xHUoUyuik9wCSjsHV/ny1R9gtE5ZaWmqIxmeEYiBstaTyzlVI1S5n1AKs8bERuxN9nARh451reQ0oCWRe65yZ//LFHcPOumAOZaXWUDLqBAPcp3rDrCDx/J/wYkDfRnxy5BJV4AbCTPQlc0SCSQL/YYULWExnKRX/PafZQJNuA77LTIm5w1egAMLxQ7BAlm6QDis= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wrse+HiluPCGb5Ls+lMyKDpYGzGYY9zMS8WhIJACyfI8OEJtEpTc0UZnKziaw0kIQ/wleTZvjTjwoE+p1ESIEcQ1IK6yK1sj7XBfF58xZSF1rb1nL8UwZ4UWEp+2JgZZ+g+DTJBYI/ibinkYwHFX25MC8PLLRfwQnCDjRIUMH8N9uOzm3gTQrOO1KX1IGIjGUUbjGCnpYKlNjX1oOYYDEIZ97kHRnXbNm6iG2k1uZzWpMH3Sfapp74nuFYKO4QovYHfODIzUQ9nffNeyTOzW0sIkNHbmQs+XQC7V73QPnBMNqknRIiw2/JRuZcSqTmyh3FwhyEgMXUZTPZC8j7P8fsjW+rNwGQ3hEPJw8Elt9LGONllOOBXoYdgjzorK7y4v4jg5G5VCyHmA4sf8U9rFCOlY+sKmMVAwqWxSwhNbKLdBcATXEMnqSKRt0mobsFXx7s0n2hbo8rs5KUimxyAjQVUbGtng3KvAR/nXoFT/8jm9KmDGttvCyROdw4iG2pOIXSlxrW/fDgZYKD5ceW8xo6ykHpjLptLtvP0k+xCzofDDoYBjchLYZZsNbMwieAdNUxaB/yenV0OvdxCv4/84rBPu4O7l3ZBPrYHsigBQhM4CBLF3MWkyOo5MfFnyFWQ0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qcFY2yISkv+rxReAkP+Litzk0ce5sSujqFU7ve6gJj6Ym4fXwL4U4ODyQ9xSNcYpNwhRdnhA3B8vSDjuFAhB+9NbsBYnDpYOyaJDXmSBW5QIyEIgrgfFpR13d4u/VEayQ6ktZ84+ithH4rFnFyzJ1cisVP0t/+T6sU0sJHkYiyxsR49hoyJn4Wvm+N+AYvyIjd/Q+0/elHE/PDHik17IvgNI9nfnXLBDYbDURYqaHR0ibJhNl3rwUfALYtZmXZsI3QVqykdikpMmLiBV0XQ4jO2wv5N9bK+I6MB26oEqfXEYoaTZGNuMtlasoKpYCv7GfflgZZSWK2ovE/rOoDe2PzS+Y/UWboFcPvlNFBxFTDPSlF/sycUu59rRqUvRWBWN/niBIziPxb6/zYrjAX7ZuEl2NmUBh/3xyPsKQtO8MRbYp00ro2GxooSIfO+d1nmr8sWOq/K27YQYJLNgXhnj5VF/XRBPjH2G8BaIG2yY9T+YMWHRDGIavH2IbWFaF+g53G8xZwoSj/38/zl/9Arj8v+Q20H32QLc4CY0SrfeMvC2rue2im4aEZdamNzWPkwjMgt/Vc73Y7wDNQzQKzLJBnSBsVVTPNNs0B89CsjsN9QEwfzYW9AIsgSDKGgcbwyIFzIMFc6pFeh1AsUFEt3h94BQD/HXU90RS8t8siIzvd31QJe8mz151AgRLjbKKniRKZHPRMA4Gl97scki0JIojElltAjnEK9p6+sgggC2LJ/FuRau1NEzFZQN0ApXnt5bWT7wluo6OvwKbYmUds9b2zRpwvi2+AMofBbUfV7ZIa81acTc75ZcrJ2TzHBj1al1Qkgyn4zIzsNFQQydMV91/guweXdxdAUO7/CVrQ4cG2E3U6WrnCFnCgWOIjzFU3wectUZ1jG1MXPEaAz7FSFC8AhENwZl38PDWKCiSyvYmAT96NojfwsUEYtI0BDDEC1ZQdTZGpMulI/0jfzjJSY6WnjL0Ghyt0nEQnyoaXygk1/EiFsOBpIQ66b5zgevgYk/MYoV7DJFkqOy2os0EJt6Kc+RyXCIM1VlmI+f6EmHzZSLm6FmX13/resfufP4n3tdtg/l3T9wUQNyCU8SJgMEUuGbbwgL4HkVfzdztl/fbZCVntEuCZ97crmS9Exxqx6yqG0R7LggO4kiE/WCSZCrcDCZ+IU5S7hoMqj9L8GcoS+UXZ3kzJejSWw9VWG+V8KMjISPwReqxu1RPIqovPJSjuWvubUbp09+9PZD8/xamUxmt5sJ3x3LtxuEMWP5vFKm X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c55d2ee0-e79a-47c8-a517-08db9323a433 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 06:42:29.3976 (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: DU2P250MB0048 Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/error_resilience, mpeg12dec: 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: PgCAgSHdXx0i 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 ++-- libavcodec/mpeg12dec.c | 2 +- 2 files changed, 3 insertions(+), 3 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) { diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 27b45c6fc4..3737d77eca 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1750,7 +1750,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, return AVERROR_INVALIDDATA; } - if (avctx->hwaccel && avctx->hwaccel->decode_slice) { + if (avctx->hwaccel) { const uint8_t *buf_end, *buf_start = *buf - 4; /* include start_code */ int start_code = -1; buf_end = avpriv_find_start_code(buf_start + 2, *buf + buf_size, &start_code);