From patchwork Thu Jun 30 08:51:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36548 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp163815pzh; Thu, 30 Jun 2022 01:52:16 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t75hLaw9kHvA7wyb93DY8DA3mcs0ziAs2Lxb9TMiUHt0ZDUW1aphYjmM8T1XrEHnYgk5B8 X-Received: by 2002:a17:906:8315:b0:726:38da:f0f with SMTP id j21-20020a170906831500b0072638da0f0fmr7754295ejx.462.1656579136068; Thu, 30 Jun 2022 01:52:16 -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 rh17-20020a17090720f100b0070b7e20472esi5918357ejb.583.2022.06.30.01.52.13; Thu, 30 Jun 2022 01:52:16 -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=X7NYcOeb; 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 9BDFE68B722; Thu, 30 Jun 2022 11:52:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2051.outbound.protection.outlook.com [40.92.91.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE46668B201 for ; Thu, 30 Jun 2022 11:52:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LPFpNsN0yDzTanU8TPtNuEdHUMse6tKXwH1TeWUwDqAm1oriRcAf9dHwr7u0fEwfovIosm5bjsrAxAEPUGRF8v3ut8lsy8nIScF+Uz441MaVceUtkA/6JxKzHnRe9Yz8MnxbicSFn30bPXCiMSA/FoHdRzlURAzPOYemlutFL2jugTAS5cm6JdDaaPeJSbzIrHFPFSK8BO2p/bhTTaZcVWErXptd7vOpMEV/oD1xX7wodpKV+9frkALxxt/XZ3y5izqlUDKlQAcSBBwibhin+qKSDZLYJGk1Z1PZ2/a9vvlDWKmDdIFIm2d71FOgLOW4NOe0VXoA5HCDPClCLJIO7w== 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=rOaZjegBHR31kAvvc93iq17Zk6RBKchUMh61daBZuSA=; b=PseubjTJfSHs75o9mBytIJJGL4Et4VtKENVlLY/j2TvL2pgUAMlvz6ECgs8sv90yDl2AMhf7giIokpw1ntn3pJHiL1VdWwT3zMI6P6zVCgYwC1CMmxjx4l2sC9QzgAvpzD9FI489+NPRaMcgrHhrIUjLHJLX8Uh0r82zFEAPrK0hDGqLUqM5yySEpgNWxtDSlUtpzUQdKu4JcBl9LPo2U5OHluWNBdV6L4bXcILllFPBJU+PW7yimqawzWLBxR/i7TCWCXU+9Kx3PJ3qzjNHqjNLtzhXF0C0VkRS4/j4nQPIKXXaYwos3HYhbbAokFumSS3i0yvHkQ+2x/e9aezkwg== 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=rOaZjegBHR31kAvvc93iq17Zk6RBKchUMh61daBZuSA=; b=X7NYcOebJGN1uhxaij4T49CFKTZbje5ATjnSJO+wwA4WP3vHT82oNwWCnGYHdQ3Ur5XX6WWVSNPo3i3oAeeyDO47PKCHm6jDPzOECEFU+8hj7HEp9a8+VelJP3ajgENtYh4NkCo3uH/23ASGcwODUNLoLBO6Bd+/yq103l3s/eYuMfY1yafJbFzVDQWZ+ePMGhJND5uE5ct43yD9YlZJDlgMOqP37M04bqX2f8DpE87RBgz8vKhSP8HacvukVchQnFauLzYDzktKYx5e31FTkp7wTowsxjMd2Rp4e808tImvIUJxSRYTmwxX4gPoahwhdsvHepgEHWZ+Ypj+ARLl8Q== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by HE1PR0102MB3260.eurprd01.prod.exchangelabs.com (2603:10a6:7:88::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.18; Thu, 30 Jun 2022 08:52:03 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5373.018; Thu, 30 Jun 2022 08:52:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jun 2022 10:51:55 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [bKXFCKSuFzPRJP1fSOTem0x0whjK0o5J] X-ClientProxiedBy: AM6PR04CA0021.eurprd04.prod.outlook.com (2603:10a6:20b:92::34) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220630085156.2427738-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a6d96130-c915-48b4-7352-08da5a75cd6d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSAA+E0K/sYrB22ar4Hiv8kVk7JBgLzcJcK59uNksicJxiG/W0faJuqg4Jr3pCQtw5xHPj59EpQ6AQzZUfQ/jGGuN2FFqZef9J2G9//m0dfbLBMixggwkytKQWnm7JlBrHqrnqe/DcA2doBTi3iynUL4wK6il2OsNZTh9HJ6RmIok0bbH8IeKJPqmVdlEyQ2ukj0cc3jWu1zaX9K0u0Xundm2B5y7Y/bhkmtBV2BxMZJBes/YRinKRuoeUI0mrAjZv4Tro+C3euRS/eL0ZcRg1VpSY9WDwJ+FFM4PGSjEhSALpaF1GrIJ0I8hYV3IHDddtuDl8ElPUrWXDWv3zDe4PpXwYTYL2bTczhc9buc4NdtWv0o7UajZGoaMqimr0SG1tCYKbRJyj+Oh+jbJXnIqGeNflja/ZGizBtqXXyEL0wsnqbpFDjMzzaIRmflUxMv9irDE7P1b95CO1FCCoaGfMUWDBFUjFFSL5PIBD4xDL4IuJCktabkwp1J4SWSUizW+BmeyBK2qWteS0PFsAIPdDqT0Ah4Jr1PiEx2SJoWcNMlyyVxJK7zNCVxVyO9v51AkSLZkUMeF82u3VEwi+tMJmSuZSelMircK7+W6J7j3ulqrwZOpCNIIB1e+iGGTiOwgkEhWORPvCB9C5UxQegoiBTeEMODQefWbDsXL4GUTlSIM2MFzI+WPD993QiNoe6wllQKH7RreYyp7B6vIE41cnioCktIY0lJxaexlzjF+G1FkHCa3YtJha4gZdTe+gjwz0= X-MS-TrafficTypeDiagnostic: HE1PR0102MB3260:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9saEzPxsetjT5jmNlwqEFYDSHUgGHFLSaLSwx+OGG+6BI/dBv6rnkr2c9UGPedpJz0dAnUiWdUjVFEb8MhsyueZ5WCl2NVCYha5wnb1/YTrtXff3LkAu1ZvZP0JXouew74lxcFVlzKTLWPXBOHjWLS4s/wmt/OxzuVVZJYiYXd5Qy9BM3jNZHp32cIyYHf2Iiy3s3ic6motApt+DhdxvZU4DWzIhv+GvIoWeyEHRwsaL6NjbO+UjZem8ipKJU9MGzQuzG+0OyCJpnN7qgKAN1UwtElbUU5BFgqMHsgMOhR/FQsFHAsXXqYg7PWMsZkgRCLmwoIivKa8dDrR4Pf4ZsALmn3xuQNJMZsWhvasdGeuJQ8CFehI6Dm3NQem1oNKy8OBOSU2BoTHB+7HgA4/Dnuuu7yBArSeZqsLEdBn11qgE9sUs50aI65T/ULWagDX+nJCY4RVvlxWKshbglgEkOTO1hzQB6Dvh/XWizsrnjDnhqzJsNJvBbE+2vm+y5/H9NQUhT8YG7fHCfubr1c0bEIsC2Z36TyWtcOSJwpRyJKnsgcCwe6opKz22Sxd2YRSZx+F0dPgY0bfhfhj//oTNRVKBzA2w+MPayaXQz7EpqUMMzt4lh3P+/X3mHkqsTmAECC388yA+do79DjPGoh+kkQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qD8TfC6AihBmz63g5pF3mlqJnDsz4IcsXOucBlBsWSo2E8WWHA6tx6+5p+zTrffVxRwg7QTM2u8nF5En1JVdLIO8t1Y8h8lbdS/XQtA3a0i7MKsMISM8sM0wH/NgcPvmT0al112uI4sb5JfYVk9qIfxduP6CwucqAmYjDbxHx49C7vdIzUthH1lFcqw4enRouxQlNSoTw3zBRiH9S97zq8p2mCWukkLjwxVJz2GIIx1Nd8B9qBIPguXHywtO3tOKylgVmn5iWnc8XYi+CdoT0XNLkvS2USP2AofJ7iP4+8oFi06rai0gawftz0zeC0LD0lopfdZArnQBLqsjnLBy5KT27LmAwjhzvWUvMs8EKGoJ9tbqhMR+zdk1tsreOePZeO8OF4c/mfkwZj7QwuocEMDDpKgxERZ07C3XOxEH5ViAajheN4kIGAIPkVM1i2K3GWEAVlxw5Nsp5ZYXps8wyKfxU6Y29Bf59KLmzIt03u0OOxP+5RmxvnbYR6SmTQMrlkYZQzenOo/8578ZDMILMVIujh8fuGTrqor22PE7l5zS4hkIe53AuK3X+ZSYWPfW28AML/tpdkRfGD/Ra19FBSyaNk5PeTmtPLkGNkkun8xMEG8BTsJTPnuAg4U4f87hTAIFggYmpLh/Gr5hy3A13ZOp6HxWmUIF2sDv8vQZ47Kr08BxRDVeBw4lRArLMGrq3/WT4mgIScJfFb0q262wTlVF6h7CAjYMHylxggNLfGupSrB6bM/4iPMgScQcsP867pKEMPJFf0X12W7n0BfDv4LUdSiIRB309tKBH8qKeJb7t9uav3bUVrv3mlCSnYdL5OWYDi3TMP42p2bYPPQxcftnp6Xwq3IwWPUgS07K9l5Lzsl2XuI2Uq/qG3amkb9GQKef8sxt+t83mlKE89RNe4gFm9MeDyvJsbAnuKXNyi6d+71JR7fhYUNdwjHba2V3NPBGscvZDxUTgiaEit2AU9YiMP9gbK2DwPhmjXws7B3S7fz5sHlJU1ByApaOKR8KzyEjRvExdtcpyiu6fCn06zxMarN19IiOzvW9HMB8nJlpO6KTPtbHW+X5KHj6Jih3/OlVDUJVQuMNfAB5xChbwMtEOK2LRnR7sRIq+842amfmv706ZDYjKEKdoES0c1nu6xRT9tUow8PaQMRw6gK1o2KK34fagJQDfeH+TmroeOOpca7ZbH2bltGxbBcdxVAVqZSgoc3PJb8yx0XDL0UshtZdlHvRkuVlitiapxm+GPl+9QdmrfX55YPMHbLu/8cKU7Pw25NNQ8/1yILddtlT2E1Q5UUR7Lj+ewkZiP5jXRE= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6d96130-c915-48b4-7352-08da5a75cd6d X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 08:52:03.3646 (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: HE1PR0102MB3260 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/hevcdec: Remove redundant context_initialized 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: kvm0pA5JtCOh All contexts are always initialized during init, regardless of whether frame threading is in use or not. Signed-off-by: Andreas Rheinhardt --- libavcodec/hevcdec.c | 7 ------- libavcodec/hevcdec.h | 1 - 2 files changed, 8 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index e84c30dd13..7ab012d68f 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3679,7 +3679,6 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) ff_bswapdsp_init(&s->bdsp); s->dovi_ctx.logctx = avctx; - s->context_initialized = 1; s->eos = 0; ff_hevc_reset_sei(&s->sei); @@ -3699,12 +3698,6 @@ static int hevc_update_thread_context(AVCodecContext *dst, HEVCContext *s0 = src->priv_data; int i, ret; - if (!s->context_initialized) { - ret = hevc_init_context(dst); - if (ret < 0) - return ret; - } - for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { ff_hevc_unref_frame(s, &s->DPB[i], ~0); if (s0->DPB[i].frame->buf[0]) { diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index de861b88b3..ff2199aa5a 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -563,7 +563,6 @@ typedef struct HEVCContext { // type of the first VCL NAL of the current frame enum HEVCNALUnitType first_nal_type; - uint8_t context_initialized; int is_nalff; ///< this flag is != 0 if bitstream is encapsulated ///< as a format defined in 14496-15 int apply_defdispwin;