From patchwork Tue Aug 1 16:27:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43066 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c11f:b0:130:ccc6:6c4b with SMTP id bh31csp94540pzb; Tue, 1 Aug 2023 09:27:02 -0700 (PDT) X-Google-Smtp-Source: APBJJlF4aTfrRuU3kFtXAjPKBvbn6rYR9QyOvG/nYfzxyP6eQp3lXlZIOMv9a5BkrYqBbjS4UFeM X-Received: by 2002:a50:ec92:0:b0:522:2d1b:5a2e with SMTP id e18-20020a50ec92000000b005222d1b5a2emr2806528edr.12.1690907222262; Tue, 01 Aug 2023 09:27:02 -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 p21-20020a05640210d500b0052241ef59b6si9034163edu.317.2023.08.01.09.26.46; Tue, 01 Aug 2023 09:27:02 -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=BEQbQh73; 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 9238568C37C; Tue, 1 Aug 2023 19:26:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2019.outbound.protection.outlook.com [40.92.58.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 64B6368C31B for ; Tue, 1 Aug 2023 19:26:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GUyOAw+DeVCvEntihtPp3zmUPMEJudqZTo5qMAXDuH8gInNb6kNMVtcJMw3mMcwQGd9NhV5C361FlXmA64WIBoi32/aK/Kp2Bn0F27tH9s7BUGIhG7YRxNUNkLHZENV02W3JWmqI4psX5woTVhq2axUAsU0OxPw/osRbDLnZ2pxzRbLqlthZiIgZx+PXUXBTgA1ez6RFE8NVKIVYpjYGHnmOEwPe6sAUndytz15XAN9N2pgnbmSLMwogYccucyqPdHJI59B5kZ8tMlnqzJDGdDBx/UEq3NAZr52HVgfXa7Nbc//5VV58bsyfTYCMe/Tha0pxSeAlEglx0e+CX9sCDw== 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=BrtesCl6dzT4/NPp0OoF4M+460c2rd9ekSuRreJ8U0ZrS5M0Xd6kxrEVjPo/zRCDpr8p960o5KHlWi3PKVrmpZdk5TINFSdp4FDfHruBcLeXukCvMxVbt/3djcjVE0uZUvPtgpqQJzzb00hTC8HWBZmqdxd1Ql2QK56QM1pKCj/ThT21E72nwKFbNTSB/YwiEHtnQulN/VMibchfqLBKB14TOD/l/8LBGa9xU+VgiBsmGKQyurg2IYDg6vu57JS55AaWayf0rn7BToZsjqmvayEwwC1oaT2sNowWI61OBCZmBefHNhxQFAuvSw2IPgWc2DPEiNwRyJe8aLf60+mYCg== 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=BEQbQh73D5W7qLc0CU3zEsgVs01ORK6h34FuU+3+qtZBtqk5+wQXDQrNGcQZxUgvnp2drdcPXPrhl1Iicu1UIi+DPcmSWcfKTZIciv3QVKycBnYZJZ668WT/v7eDWXZR/2NX/WXJgpPQS0TSSecdIdWblvmzTadYuseWmmQDckc9F9PkSE5psaPweLTn7x/ezrZRlBy3GVuTrYKg7dxFbv9Lpm469wF4YIa42uW4CaRpnDsICe+pW04xVM4zDKx0e5dkmDlotMW4dib1e8M7z9hUucBajhuxgjQPWHGy3Je/IJ/uQV38nXHD3s21III7SqNkCTl26PvqvnDk0P6+LA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0128.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:271::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.44; Tue, 1 Aug 2023 16:26:33 +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 16:26:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Aug 2023 18:27:34 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [JrqkQ8TL70lt5qZdznIQpmEAMsp8boE7Vp8nAvp/iFE=] X-ClientProxiedBy: FR2P281CA0110.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9c::20) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230801162734.3923678-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0128:EE_ X-MS-Office365-Filtering-Correlation-Id: 3400ab8d-3ef9-4fec-26d1-08db92ac1175 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpdHtR81+IA7nbDSCnGfE5137YyD6PYLRAIS1zi/q5kp8L2mZQwTOqaqxqyGjGyuaRbHjA0jcVsjF7qliuLBPp6AR6WLopvZRHMm7rfOdiODlBzEmFbAog2nZb4YR8kKqkrkWcNgf4EU2Fjp/kFBArl6G2fsCgGXLA8b1TXBtT3Aqr+C8VbgIO1jq9CygvNyKHUFoCRANLDbNvj3ApbG/kclWq4yV7wzXPBmGLhW+K+GgQfbuppMiNI5/dpyH9yKqMDCRnZ2EwAdEc/zklj0ZodYR6v3j5m4eeToBq1hRqeBX8LhgOH92xp/c9M/yW6CCJCZc1XDzUFBwt2xLITJYKe8i43/aRwNTi2tTmqX75Zf6PAi/U0rp/P7Ij2ntpxIWrYmM6oFyWyyVt+k09q9tbAUOSfFl2imz2UEDODhEoaIYIqLjRHX9vCXSaNLyGnGVxv7Kqszlk1GNgdh1Jh4ywOTlL2HB6W4+xUAqhp7l6Nn60g5G6fbKymmaJiHgufDBV/sVX7DeO9igJr/k5jCmrDgApLOF5ZJD8PwkfKOKfhi+jFk4wkgYqE2/07nhfG+Nv1vSEg8bqSlpI3CO9ucEMg5AIhxyDttBHwFWZoA3r5MpiDkDKq8jg8r+q32VXW/B4K5atA4EWbWXSskAcnBvZ1LkvRKZ+shdqi7EWqB4S56LjFKfvUD/t18y3cp96Ypx1wgaVdw3NnvD8yazBWAqbBqFX9stYkWm3i9c8mQofJekT2vMMcm/AzMVSREd4ihmE= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C4Y1gxL7YsEyxc/FE9+MdnaXUkW/M2VYxbvAwYVd3/W5FUlywv5n+LKxqewUd18YIa/oUtvKYq52PJgj45zhWDB1dnflq4nNogbuYqqnVEmHHfmowUPJWNMg0Z3x784BJJX15LdsNw7z6L6dFWD1OLwdb9sE7DRRP1OMQQkajx/mjN1FzqSaBDVpnPPP0wAlI4uTaZpdbES6lrpqaoG/6vjn80c52dxbYw6cw1F6gAXF86Y6t6Nl6w533fLoNXnvMFcgeWzupVTh8VyoYHcJvC8/LL1ztZTElhQEH5M3J0HWpSVKzY0q+tpdQU+iuq4HGxedzyWYweb4K/iIRjEi+B7v7RZ3XGFAcnvqeIAJqEajELH+CCXHvfFhMwwd6ymfrTXDsXCvD/48zthqR18lAfMxSBlDkGyacYgHwsBQw96sUa5rCMFXikbNqKwSGJKykMSvFDGYI9rE72DU0u1n1jSj2h/+jc7IBXm6nE4JCHyoKtfVhOYM2f7mZQ8GIXxjoVuwnp3ejAsZOK5QRvQuW6fLA1AllVpU0XdpzLJUGcOkaLcrWvz78jPnmlwDWD8Xk7FF5R8IIaWMnQ6vQBaHClqvGi3K0Au5KaSuwkYx3qwOk7MabLPIfNasX7yjg0lF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Z1DXLsW8lSO96J4bUC8pLd+EnERqXHGs2OjyQEyHm6AXmSni5USh0T5R3IiLyjraEe/MV3BPeotdQc7zuWDH5+W9VoIlbYks1HStotrjtwvvwAt0uQyzu4XLz7nGIo/HJQ8Pc6Sx2Xit5W5/9PkGKv5CUcRLuZjixp9QDVSG7tXXGi6mJG5fawgYoMbxqfPWE/Jzm15Nm3nhWwrhcKs/iVlq6X6vhqMQ7dcac2awhnLxnmxBLpYa1n2VoKHYBcv5vzm2Rz83yPF+B+6tv2YQzujApklw+dA+WNQ6iWzGlvWtcsPKxD4K42XRl8FZrv1JwnM5pJRJb9D7VLGMhjNmstWiWA7DBYT2yok5jCdpg8ga07PyQU3hyr/g0wJAkATKGbibQq1BwwQCBKkeYRWf++Q8ia7KZ/EZjfqBl2w2/d4tVtGBZcDq+dOQzfJPLkkC7gC6NVTlqnmbO+k4dYsHn/UGskVKsCtrlQJidrcZ3bngpkbnWOtjSteipR15nVgS3MEqzFgYuZO+o6LoaQ2UnOVL7hzJb8C6yNVgWZ7Fn5jpBj7d88Lw6mg1czvpi2b5H6dsUPaPJaOVyulQX2i1dBAfZRjjuDW+T/Qn0xwi3IkU6JJilYfpLSr3txSMQkD5vr1+luS6iUhfCEpgQ2etAulXxhdu+uleZDk868jH3fdpie52lR1DEIAZAskqId3fTBbFGB0lo67v9V1FRgpeKcibJ+YdGvgU+f/YXoaZaY+V0lY5k1Pj31a7n9oTmunb0iORr9+jZWzecG6rcoeJluLVDw1c5Vx2TVgD/5xqU74ijKMQEJYr8DmlGHKIpl+3HDPCLtX3jOiSvuzZ86xK5GcNUeGkTXtkpzOIpw+SwZYSMeteXlT5rC/veQ4q2J+kJjImcLPCaWFXJ6953pBtQKebsGoY5c+MxMAVdytHx0QY4lnnRTEBDkVO0yV5K61owBqfH6tb/Edp+eOsrF6gd7hlflbWzM33k67ws4KDMbgeatcIiRNbFNluixTcwtOc4PuB4Hvq4GnJucgFN7j+wZE0G4vbuIH1HncebT+dOr+4qprC/GqcGw54ZuYjzEpSMRugjv0Hzsbn4I2Wx6rAJvVBUqcOrrR3Yh48tgUnvqdhCAKbLKevoypsDULb6eFpOmz5cAcmiaVf23B2YOCRANpNnfHVrb6fUug/9wJBHo6m5zleXGg7zwlvEDJCBWqmMyt8Xi2+z+C8zwhGmRwAwSc4r5Sir3hg1PqJd1XcDhYgT2pop+rvKIYhgJjrSIZ2 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3400ab8d-3ef9-4fec-26d1-08db92ac1175 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2023 16:26:33.0994 (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: DU2P250MB0128 Subject: [FFmpeg-devel] [PATCH v2 4/4] 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: 3lBAy5fmuDA4 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);