From patchwork Thu Mar 24 22:27:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34956 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp1237443uaj; Thu, 24 Mar 2022 15:27:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGBiBi3FuGQcyTrzLmo+GTsXBqQHjsbR1738sluNAfP1BON5BXdkIJwC6kBg5w6Xb6jGyS X-Received: by 2002:a17:906:1ece:b0:6ce:e14:6d92 with SMTP id m14-20020a1709061ece00b006ce0e146d92mr8241431ejj.408.1648160868791; Thu, 24 Mar 2022 15:27:48 -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 e21-20020a1709061e9500b006df76385c2dsi722730ejj.205.2022.03.24.15.27.48; Thu, 24 Mar 2022 15:27:48 -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="ugWpAX/G"; 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 E3FEE68B1AC; Fri, 25 Mar 2022 00:27:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074086.outbound.protection.outlook.com [40.92.74.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B29368A141 for ; Fri, 25 Mar 2022 00:27:37 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OpqUo9K2b3MfbEa3RDnXx/qdgec+TkpDvx3a/SbmUaw3jN8BvbSPQHkVjsfuoWdvzQIVE7IsnCTFaLUcrNHuHJics1eMFsAZVubIRhxYh63bdvVJ9y5oeepEqvHEOf9/L6jm0RDA1WGPNcnRnynm0zKuQiB8KwejMUbnenSz/Vnbr0v29Dp2UBQeX9XNVWDw38/ke+9sw5rpG1QPil/88c+IeM3enF8mYVHk8SHqB/cF7Y9ydVFjM8LUPfnAkShUGFnbl0DgVnDKrrBd3uzGepYWCrNUO/XVQnBoUQ/nMa/VCUhx4RFxrSfgLtOrRhPUf1390vXwRKWPYzNnhUNE5w== 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=5PZTH6Z5RxdbeuIZg2v/Bi46c0a9mNEe5vMm3O3aIhs=; b=S/fZGfa/oVTORgU+wnwMuVfpWd3Z/Gh/wvAJmxkZcjxTl0AhBaIFAG6zGR1fJBsfn9vYUBu7u8HVoTJlx6xkTsq4dxoYE89p1ajdlklQxpvHO2WwgkgHmzcU13kxkbEGoHNgBuHZb1Ud92VECsv9idLVPm9ArY2pk16yoBprv/yJ5jvDewJE/os1BCP6Z1N2SLgxh8M5EJxnoRa3sr/nckAG+rg1hLcjC5Wh+pEoQT+RyjEbfBT8HKIjaMCsQp7IiPQmlLnZ1phKPt9rfSkcaMpQWWkvcWGo7beZ4/r6bfwEQTdlZgoORYOfqZN33K6EmjwKAczy+BNoOIZWAbr7CA== 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=5PZTH6Z5RxdbeuIZg2v/Bi46c0a9mNEe5vMm3O3aIhs=; b=ugWpAX/G2yKChNm9UCFcBleypnAu2z5zUYjdWDJpelQxAgP7QD3XaOBfKnpTDTKs8E7tefmOgdNSaw982IiZncyxg+kTIKPltgQy2sfb82pO2h4hYAzZQOB3pSxtFW9NKcpovSlYRQ3IThyJZ9fdwVIlgOC+XsFj1rHfGaKfysMtDa+XdonAA+Scc7CtrYaT9HKFgUi31dYhz3q2SEpqXS9VCriTyjEbH1EOeFbWwN+GmPmGj2wWbZaeGMvWfpFvP5fPwSq/MjGv5vF69wRf2IlNDAVv/4LU3rUMc2ANJzvu5Sc+gONpDruZY9WtxxzUqpP9zNDkgwHhiiEfhXDnoQ== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by AM0PR0102MB3492.eurprd01.prod.exchangelabs.com (2603:10a6:208:7::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.17; Thu, 24 Mar 2022 22:27:35 +0000 Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8]) by AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8%3]) with mapi id 15.20.5081.022; Thu, 24 Mar 2022 22:27:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Mar 2022 23:27:23 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [nc5Qtti+f8wLlXhY6tzHe0eGPPIZPbwY] X-ClientProxiedBy: AS9PR06CA0119.eurprd06.prod.outlook.com (2603:10a6:20b:465::15) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220324222723.1050544-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 928fdc04-9d27-4f2a-237b-08da0de57e71 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWPFoephI4+OqEfLOP/4j2TwB3IEpEldVke6ViS2197MZXzsom8Z351Ug0XB+C1pnrd/pNFmpyM8Cy14oMvzQf0AqzQzBbsdTE+zZWan2OxiIkwoqf1Gh6Nl5/yj4SEcU0u8+tK1Y09iw4pzz5W8Dp/0KMtcy29rpD2cG5wRDsEWyF8BoW+KZclr8C8Z5+n+9MUg5jAB1ur0slU2bfMU6C1tzW7RtczI0hW6wtrKcOgHimHNWCp/SgHECtXiqAbbnzhsrsZW53jmqf0rYRAFtpB/7NCPhGGiYq8wEZbHBCw48cgzJ8oNNkwA+fXbZsfvsvitUVdHfhBp4/1fyfz/gZ1AA0V5Hptwo4QC62PXqoBR93t12yvrsEL7bcL4JlNv6TvvR6bzlSS80QSlB6O9N7x3Jvtz9AekHZdstoYiBdKLRmUWXEvHQ2DGnsFtOiDYZRNPqajL1R9TqZjFKmT00qOSUJOihsDrCD0ydIldtprt3LbDCpAaEg4hF6gB7hSpUG5dxKZdEv1Z/DmJQ++egMLSmO+6wlEKIFNY9SdHMuTDZ0NfyyHO7AuPeICLsbOFDxge38XQv/pOvLvEf9LNgcxmbWhPsuus6t2fRhSaqKA5X64AuluJ6T/6LXdmOKTregMQH4uNyI9aB7BmJg/Pl/MOVJP4kt613CeQMcm7TXa2U/n7x1PJXZtpYEswGpsvMl99JC91yriqX/NLEcjd/bp+hwJusN1jZo= X-MS-TrafficTypeDiagnostic: AM0PR0102MB3492:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3c0IvSUKdLBKJfc0jBGBGjD/o2L/BOT3dytlsItnaYqwPMyTxSAkkEPWmtwWys9sJTlTlE+ywVk1NJ97G/cJUMEFU9xDAU7Bj7P6r2sdcSl9LiC1yiT1J5R+yBX4WFVoTGgEfGFfAFpga28ToBbBmEy2Gt1RJhwDiGUaMj3sYPWEQL0Y6clLn9stYVbDlX0BuKVwS6DwKXOT0riV6j3viT1IzKczplX7GpNjA1CBKgjpNjYHp1EezlxBvk8U6d0L6w7rYmULX2wjQDH9da0jQWkQND2Y1FCTyzyqFoyZneBc3zeDs/GMChDyFHGYrvhACB36d8pGQ9bcnJKHtS1yiiklkDqdBo2tu4EuELFX7q/g4dL+n9xfrUefus2W9CINMKnvZQMSHMtCJ+Rw2979zzOyUBvXlpYvVEKGciCTC4faziT+PJjrAROCyF/0lh84aPoAI605JI5fSaricsvOGD0a+zNHP65AXcUZi+tJw+WMscgrr3Xfys53wWaWkzpFV5RBLBT4xZX3LVtsbuAXbQLhn8D9TSiWL8jFpzwMnBGvoukiVHGg1pJjWm/mmf6GLezmYGWcEPwnqFjlVJegGQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mDJHemaGMa8ITY/J1mEP7wjbjaR0WlOVPpGyyPnRLad+6uYfoArvj6H6gxk8FKIY6N0SF8Sgh1wb+WJ0VcjsmCECtDgTCFFnUr5wai/F4GWOGcNPH8vWQAPIZkp0AGVz2dVuZalW+twgfxbvjiuYRDzhvBdyCFDdBcWGPiJaBdmXsUjT0Ku0Mz/5eus+UcotNfBReq2qPr+KZ4adusuhPQ5JRZdjeM2ZtXikbq+Xn+bwOBs4maHlA3vP+mPNDKkcU35Y5hmjyH0ELygMQkvu/A/Wkq8UF3wwdtQbzqVsjxruL2/rU+mEIHOpU3pS7F9gCiCqAwTi+GOSb21tiy9uHcDCJcCNrmymsnDyvur5YlqCJRSpYWAcXTXLIbytzBYqhWAzw+Oqnec3oksgKmxLYBCxx+NUQ5rmBDFZLKYYmipWU0RcwQDmg6I/9yBPNHVuS91gtY/k72XhoaKvTeosm8vYG2RnD1Lk6DT1KTbkPPL5a/Ly3pomSvojqoxhIkZtDa50oAJD8TJMaVQtmF0NoynHwt2W5LBl9tNoWQ9irSVLD+U9WB3MUfjTcCNTEckIR7ynJGkLEV4bZr1yzp9Z8MdeaX2KDZtEyAAWjltQ+sRxavnKxMKsyWFyrVFXbi+ZgpG4Zmw8gq1ZBfOWPE68hyDk0gmsRps7ghjr/DTW3w6A+jLI90wW40J7OMAU7nsfWU0gpcMqce2Q7fzV/ORl58dZwLm0TZ7xSB4gIew2d8Mb0vqf4rFGrGfd+Y3g2JoGwr4ag4vJ/icuCd7iZXzABt00FlnJxMRabefYvWzTCGV/bH9tqpv8UblpgkKoTF6tf0mfLhNdsWKBu9v0Rs46yBteaZjeX98S644iwlUp8Drz4T966l20775AVHTKAGmIL/Ha86BLKPF3XO//BeDAVB352v+yotQHwDrcy6oM7QeeCD03X4iuEMq9GakeqZ3uVEuJw5fLHBpitRN0x1D085+DbWEazD2SEUW17Q9UcJJ6+t/tMFrnAzPWJdXiOExTA9WSgBDGvpezfsPOKiie5E+HVhq1vx2mf7px+/nQQe4IPs2txdDklIJMtfQggjZeht+5ukehDfxgEKgZ+pnQJ0wvprWvDKr+uOEh/SOx6QMxePioju0HkPzmt0yOmJ9tjgtcCjY4O4UidbcbjvMnJvHy0e/cGWAr+GYVJikbE7k= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 928fdc04-9d27-4f2a-237b-08da0de57e71 X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2022 22:27:34.9330 (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: AM0PR0102MB3492 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/error_resilience: Remove write only ERContext.ref_count 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: 5lDfWzqSf2od Signed-off-by: Andreas Rheinhardt --- libavcodec/error_resilience.h | 1 - libavcodec/h264dec.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/libavcodec/error_resilience.h b/libavcodec/error_resilience.h index bb770ff674..2187586618 100644 --- a/libavcodec/error_resilience.h +++ b/libavcodec/error_resilience.h @@ -81,7 +81,6 @@ typedef struct ERContext { uint16_t pb_time; int quarter_sample; int partitioned_frame; - int ref_count; void (*decode_mb)(void *opaque, int ref, int mv_dir, int mv_type, int (*mv)[2][4][2], diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index f438376431..9faa35e36d 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -776,8 +776,6 @@ end: if (sl->ref_count[1]) ff_h264_set_erpic(&h->er.next_pic, sl->ref_list[1][0].parent); - h->er.ref_count = sl->ref_count[0]; - ff_er_frame_end(&h->er); if (use_last_pic) memset(&sl->ref_list[0][0], 0, sizeof(sl->ref_list[0][0]));