From patchwork Mon Jan 24 20:09:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33817 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp14993iov; Mon, 24 Jan 2022 12:10:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJx3hl3/3MZQavi2b1AOtVeLKwLyQZ2iAb5NUxcPM78Jn1cdkiC1nX5IFRGWpTaqpAbD9bpy X-Received: by 2002:a17:906:c2da:: with SMTP id ch26mr13825686ejb.372.1643055012343; Mon, 24 Jan 2022 12:10:12 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gt20si2372824ejc.694.2022.01.24.12.10.11; Mon, 24 Jan 2022 12:10:12 -0800 (PST) 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=Ocm7cQvO; 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 6E01368B170; Mon, 24 Jan 2022 22:10:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065018.outbound.protection.outlook.com [40.92.65.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 326BE68B149 for ; Mon, 24 Jan 2022 22:09:54 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fiVm4Aucs7S+ZgjTg00R+lNn8ZhIz9lTZvkZ8F5IJtI7AYldycmkPsm2LbjGuA2YDbwvGqUrQKIgBp7FD0EYIrjgLMoQqR3qhLnPeg0+MCUCnjigNIJrn+hhF0RlK6P8rnr90D3qwEz5XA7pbipPVcQgSbe7+bAcT7w6+siRt30/lNIAmdvvXZI+XliwlCr8rWYpPl9HuUD0/kVJdIYoU+/Atc/aPshDpGd7Jd5xM4Z8wIa0EWBvy5f35kYieKCMRwANxTn7xkDxcy7ZQaqJfrXobarFeP1yhj7a3NNE49kTkwfcWUMHJl0DtfG7D5ImKJb0yjiWDUyHp2lYWwYGAA== 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=MKg8Np42bfX6Uwdm1bhV+rZE7f9hpYo+dtBgmEK+oOQ=; b=gnTvSiiNr9BTSIwC7R5LaiqzISN7e5sYsi4LkqIt3HDXH1r1yKTApWR9YTh0kclE1QgKFvYcaaMe/tP1fy/D7PV1e1408xeigtzASXy2nd99ZQd14ZMSeXEJZ3egATi9soz8bvAMt/Pt6v9m5ASbWguuJ6abQFa6XWTKT91EuJygcCb6Zc/5K83zI+kOE7862GewbXzffWQdNaMe4fhWx/y7oreN21EOx/SH8DHlGdMaOJuWf3iECHOgtLXpH+X6IC112u0P4H+54c9GBMglH99KAaeovqbYL1nInaiNNt9z730QBiBn3HY3+p0nm+Z2em5L/wXvrZGTIlL6dglWbA== 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=MKg8Np42bfX6Uwdm1bhV+rZE7f9hpYo+dtBgmEK+oOQ=; b=Ocm7cQvOKW7FqC0uOBpVm9AOG9HFeT/xx7jMlgwgpQr8n0xIUsGPU0MG5fXbF0+GbkMnXPhfslJ5mG1aTtuGTEH51W6M8nXpISVxMdNodCiD1km3kZZVxGE0b4de/lmqB9ro6DOKneg2/Nbe5sSLkVFVIqz0XVvUOg5q1lQp49fxnALB71hpHkbnki4eib1ihOzUZTEYxDttikwizihie4c4F3EBO2e1S/DWBYdDd/0M42jUnAsNbX3D7lVj93sqZlY4HLAScDbTQAhdLHFfIFmUo/mMV8lFbMCttKbzQn2AevUcG419L0PKpYYPMhTw1sMHxwKgAy1Ami+cog5WKQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR0301MB2557.eurprd03.prod.outlook.com (2603:10a6:800:64::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Mon, 24 Jan 2022 20:09:45 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4909.017; Mon, 24 Jan 2022 20:09:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:18 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [RpthcL6A/T8nCP/vtmQwsticvJfaTIQn] X-ClientProxiedBy: AS8PR04CA0012.eurprd04.prod.outlook.com (2603:10a6:20b:310::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220124200931.593079-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6c03cbb3-17d1-4412-1ed9-08d9df75771b X-MS-TrafficTypeDiagnostic: VI1PR0301MB2557:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YluAyDVndQCCP2HvuAbDezY4m3pN96s+hnOQmyEMmNuxJEO+2Uc8NqK7IoFpG0YYPip9TXjggf+Ae9G6hT8bHORTZvE4b/mRFVTNqR4yPDhTvqfmjNqtOV9EQm0/L7W8XJ16P4vqs9XKd+TW0nKtOt7t4kIknAlcgvS5mZtVuoOVXrGl2BQWFI1msGyS6OAREBijayQFW7r6ApLXUWq/z0j4M5BjOozg3LLSepPTi78ArO9aMzz1T2f1Vu66TtGI+Qh3j5WLwiDwUuZOjP3ndZ4hEohMjMznVMv72GKm1NC1SYnawsnkORyT7asRRLDRdk8btZhtMRmF2vCgkP/nkK4heY7u5vwRw1ddR39D6IWYON3iGmIkCq/boisDOKzk7ievDny4yfoV4Lc6EScOkrZCrmb1BF6ILPb5DsrsSPQrMP3YYHW36z2foyk1ml9MGP/h8eJaLvOhMM5utmNu0CXOf2ri/WfdaaMqMzuFf13wB5DPHnJ7g3dSa+nW1x8GgdsfFa9fQlk0vKcM7a9WIpE257nJ5wYE2mfJPE7PD92a3jnKKHau4LMaSHFKHWmD0/kPLqfnFTaX2olGrPS3Mw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WzQfKTKfc/qNrZPiZzIRFJLhLcrcOd/wnGl5pbQFH/A5+XxvLS6lQnoTHRxWleiWPFN2rB1oM4NunMFk6kQolHmLZnq6nYwuGb3rVhgyGuTLGNPQJO850MURM8iAz86kTHLghF509tO9uz6CvCaGYVR2lv85o3c8ywjXUu4qfSyHhvuFw5pPQQrgF5STA/ZYl51gDyYwiSQrElV78P6n3Y5nlMHyNU5YMrHQTdSY2w42qIeLmpoL4HxVG+5p+rAYtlyIbxV2lz1L55xyI+JDnkjEUGcn5xUClQ13dXk8qH+1kspZ4Lot3n4USAOu8WMl9ddPKmfX1wo1iPZTKymmb7pEYOHFnC11yuQTP/TWLE2A+kvELPBBLEsdarjOIusZ4l9Vz1iCTsPvkKAzsWpJYoyzop/qcjxbmXzBn8TklmTcAI6uRb/ezDHLXhPq1VcP06f7+fvfmZfsF3+JvsU7n9j+7VA48x+I4gsEbQxzl3W99f5C26d9l3sAZQLizEYqEARFCeW7u4LXFE/S9fpGrZTdTZqjArxWYXzaZZ4k2WA0ZRdFQwXvYZJUeJHW7QUe+JaI40iKtNE1jWiqa7z7R65MXdy7+PZZ3bU6uiCMM/fUoGZMiCrUWx6c5/ULBqSQg7R85KcbsdIlfFMc/QZREmr/mM1dCnLZhDnimvGf7A8rridE3Zl7nti+ERs6zk6hStzszNbg5lytyWH36Qki+bl4jVGIK/lD5O7Igvt+B1B1DLLfqg6aFxbgql6sEfL5mDGO4+z0YP71xGe3dTPnlk918I1TIviPyiX21IoJAN62q2lqli2PtvLxMiNloxEiVqT9ZyxLYPw5V5F4o6Atwsc4uSTkUub5GpFshwryzTKPkj2ms480gQrwS0OXq9u2hn3lmiHeV/UsNdjSasLPI5YMRKnutBDNsQ/VDU8cMXJeMGFU4NbcbLHPWZk9hK4/F1vU2NKTbBNuO5PS9D/C8g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c03cbb3-17d1-4412-1ed9-08d9df75771b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 20:09:45.3788 (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: VI1PR0301MB2557 Subject: [FFmpeg-devel] [PATCH v2 05/18] lavc/h264: replace MAX_DELAYED_PIC_COUNT with FF_ARRAY_ELEMS where appropriate 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gj15wEtXobjU From: Anton Khirnov --- libavcodec/h264_refs.c | 2 +- libavcodec/h264_slice.c | 2 +- libavcodec/h264dec.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 93526b11e2..94b473257f 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -729,7 +729,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h) h->poc.frame_num = h->cur_pic_ptr->frame_num = 0; h->mmco_reset = 1; h->cur_pic_ptr->mmco_reset = 1; - for (j = 0; j < MAX_DELAYED_PIC_COUNT; j++) + for (j = 0; j < FF_ARRAY_ELEMS(h->last_pocs); j++) h->last_pocs[j] = INT_MIN; break; default: av_assert0(0); diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 4833282191..d6d4497fc9 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -428,7 +428,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst, copy_picture_range(h->short_ref, h1->short_ref, 32, h, h1); copy_picture_range(h->long_ref, h1->long_ref, 32, h, h1); copy_picture_range(h->delayed_pic, h1->delayed_pic, - MAX_DELAYED_PIC_COUNT + 2, h, h1); + FF_ARRAY_ELEMS(h->delayed_pic), h, h1); h->frame_recovered = h1->frame_recovered; diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 7f10026340..3706ae0e31 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -308,7 +308,7 @@ static int h264_init_context(AVCodecContext *avctx, H264Context *h) h->sei.unregistered.x264_build = -1; h->next_outputed_poc = INT_MIN; - for (i = 0; i < MAX_DELAYED_PIC_COUNT; i++) + for (i = 0; i < FF_ARRAY_ELEMS(h->last_pocs); i++) h->last_pocs[i] = INT_MIN; ff_h264_sei_uninit(&h->sei); @@ -445,7 +445,7 @@ static void idr(H264Context *h) h->poc.prev_frame_num_offset = 0; h->poc.prev_poc_msb = 1<<16; h->poc.prev_poc_lsb = -1; - for (i = 0; i < MAX_DELAYED_PIC_COUNT; i++) + for (i = 0; i < FF_ARRAY_ELEMS(h->last_pocs); i++) h->last_pocs[i] = INT_MIN; }