From patchwork Thu Jun 30 22:29:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36560 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp620368pzh; Thu, 30 Jun 2022 15:30:35 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uq54S0eQdBF0E5gviOX3nxSPfW5XVwvA0rGyB20T1wPxC0oeJfPmYdluB7FI3VpmalziA4 X-Received: by 2002:a05:6402:2312:b0:437:69ec:adef with SMTP id l18-20020a056402231200b0043769ecadefmr14479212eda.366.1656628235397; Thu, 30 Jun 2022 15:30:35 -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 gz1-20020a170906f2c100b0070397358bcbsi12613268ejb.33.2022.06.30.15.30.35; Thu, 30 Jun 2022 15:30:35 -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=kmnE5JUv; 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 DB39668B74E; Fri, 1 Jul 2022 01:30:32 +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-am6eur05olkn2096.outbound.protection.outlook.com [40.92.91.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4428B68B737 for ; Fri, 1 Jul 2022 01:30:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nIhIxvjGHTGfCBAPz7THvU1nmNpkaWbpgtTNunMJWzJc8adnpnOe3FVV+qKs6VsFbwhYDjUgX8hvX1eJ41+GDBN++ej+EqydEN14BqvIWdfZyi99cafmf8zmsx6mlje6g5ErPn7awTzt1B6G0/3g6mhLa4JOfwMNqLEoMyB7/IbTUADp8JJ7h2vdL1bGs/mozheHqzntM6NBYRY+9vtrEU/W3q0IA3Ca63oXhR/zuHOct2cmo/DzAdHswIEZVlr5mu0ZgDhk2iMVYJIA1ENcTumzcUfrTCyILX/VAJiwtDSlQO/zJgH576bcxu1AZ1gFRCkGtGBhadIA+vswdFnIUQ== 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=aE37ogozsoHwp+yoYMXeKTxtDi5aLsrmfpzkT+o98J8=; b=L9ydD/Ij6HLiXggIVZcwr+o4LfGFuIetAswkaD7+P4W+WmccsUtzdNdA81gvlC1koYtWbYo2Tf8yR+5HLCoaeew2nVpkc82hGhs6C2BLRvUt3pJHXzGYxyhcAkNbXNfFT1o4wVZfib5e2r3H8QfokrN8JCr1NcGUaKDPAm4G3v7AuDVu4Qx10FmS9DjOfYdjj3TURNWPLQ13Vg3PNuxlphCvzfAAK4nZWpwp/ffhEXMyvBCJUSO0yJOIxSJvBBamJ+V3ZQ8VEVZF6h00ne50jq8tyWsjFdpByCWdSfzzoc62a28KJ9OPywbpDtRcLo7gk7V33kd3htHuqwb9j9HkdQ== 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=aE37ogozsoHwp+yoYMXeKTxtDi5aLsrmfpzkT+o98J8=; b=kmnE5JUv5M0ao/wuC16znenwILIxm34Mfhgx//Vc4wyf540hTIEYX5w7G+vZj9d9SSa7GlIR+f8U/7hQroMfq3N797yzpOyxgDWjulvOj4rww8AADbf9lDodJN9aSdjminxfrrBCubK70sc+1La8JaWpNfQCg4lGvV6z/dZhP70jECMDmeLYmim9qOVWi/rVQyGEEptuQ6uwi9vqSZHajj1MKtfqH9DppdPz8Ro1Fn7Mte6Ak+JrFBYiQGqLQy5tVx6QGa9cozqTjT5iKEwg78dqVdh19ZagU/XXukjGEwGuuB03JRLQNhSkg+eUQIgXm9/sgi++jxrJap8DpLBYNg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB3PR0102MB3546.eurprd01.prod.exchangelabs.com (2603:10a6:8:d::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.15; Thu, 30 Jun 2022 22:30:24 +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 22:30:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jul 2022 00:29:34 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [iOI3Qq6pRJqNFFC2KC0bgjCR/etbDIS1] X-ClientProxiedBy: FR0P281CA0099.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a9::17) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220630222949.1758625-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2048fe46-5799-4136-d0e3-08da5ae81fce X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSAA+E0K/sYrHNnfsWcYQJjY1Ii+FwxC5z9Brwicuvnj+H1xsaEFWyolATPOdlCBaHRZ9r1NyFCezYFyjFUBSd9eAYtcNQAaOuZbQZiqjysCzb5bNqTMtp7/3jFTkuNO6KWhpz3u2yav5VbLwb0UKpaZSiaZogOrir19JLVtwnP6H4Q2DWwcF9zNQCgg2z8S+YCqFLGKGwyZX4DlE7gLHTWknmNIBLSGUbiMfrkxG3rGw1Rpk06ZQXdYBkuujv+s0clKL472yeA+90nRbsXjwmuKnhkZBOa4MYGM3nHJMRM1GpF51H8v6N7ZO0BcbVDcz8KMHEYNf1UlUqLmgRfRwnJ1R6RvBr6USe/r5stDH8jrwHjwGwyyu/zYj1/mjN1XQ5MSPTWRs0ZpeXNIju1EgBKedNy83P87GAdBdsK0Pvfy+7d6PuWX9u0s51unEYa+DPTzToqafEPIb5pP/4C6EFA+/OX21j2JxLVcV+4ScDbRA/ku+2q0VJERdWPSIEzzszBem9AcvclewgmR3ateJwmAVJRtt3A6TO/J0nGOiARuqZh2gZN2pnoBiR7uDT5ZhJAn2YkDsPfYcmvCCOQ6dVyL8J1kgJF8QssPIY4pRYTdqNVfZjzuNrnNVANsyy4H1dkjIEEzFhJm5lli4iL+hZrJ3697ESpDvz2vbEo5RF7PBKU3MWi8Jbd5L5a6/QO64TPNBg3MRv7b+nDKckYdIqWkseX+hEypA107kzDXYyO7b/zYiBsZiKqK7aMxIWRE4I= X-MS-TrafficTypeDiagnostic: DB3PR0102MB3546:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bNtTdPX4MJWBNlBWd9MiPXo3WDR0B38Ujcy27rvP4XD5AGXRTjDVI9U9xHJhFEbhUBvKrCDKmtMtgd/ehcNT2d8jYdOw4ypk6msEGg78ZB1ZuNDR9p0YJXb2bJ2NXxUlm+kVgY1+F/LSCs95jYFb/KCy4xn9mx/kQlNoptuI0lI5o5CkpvS9pncKgapRd4uk2POmaa3rl0WbqjT+CsESM8h5Q4qZlWPFEAL4jvdVi/X/+I7+kelCK+1tcFv1PWyvhcBbid+PzOgF7C8lzcAcP/pPQwHGgx0e5Ep+3U/Y/TbO9LPCFxioTTSdJgjZ4m6Ze+aJOuGUfu8b32gVHBReHVjmmvxk3r4bE/ayFjBrFlQmp0YAqeL5NiCa5OlgqrRiZe6Qh1JfYnj4mBIo4S0KhuZbPJpoW3pKyYqZti1tiTBhLs+0+YAs02RwE+qfNUoLuIHYvsC4/MpY21WnA+CDcGrdXpR4t58CetN1JUgejgbZ1VCa77ghLfWVMtOxLGpos/kDpXZ6emNYeSFrsqSe1xCqLWOtShOP2KQlf3fBJjG8NQHWv71xG/hIiKMBa++1uqHYhodrRrZBvcdofHlGwiIcLQc3O0KSKWciUGuZAusKic3MVnTIx9uSazqo9WYfTbs9vRk+zJMayknD8Mjlh6gkmgVdYKma/p8CjxRXuSZPqEldt8dkwZDOKSpi/C4p53JjlWWbsHS2DsNpdEzN4A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: A5517k19PTntZMQHUs/cGHDS9mf6IMwq5Ksg///KcxLbP0nyY01Y6Zrp6q0f5eMBxnlRJvhKylT2G8ziGwjXMSuOfT/2vGe6MVOoxijwZbG+4n1DAEbb0458xI8wc/gHm/vjjC4Grpi3mMfCyDR0Exu2Q0NXhLWM3wtAME+iQwRtAtUKL8RimC+8TSIBF6iTqXCkQn9mibCHD6kFD7FPVGqMJBKBLi9FyA2U3nTxcopzwHuOixoWomK5eOP14ODEMS65HRQBwbJj9/o6ntgKrydfAAz5UAkCKB1aHo71STkgqArrMLC/0c/1snQFBW4yNn1CLQec6mNZoJPk+yVtz35dHuu3IfMfVgzUTVplaJ27VuC5HODi7+ZbayHCkoMOxMG2TXMt4uz17laqC2f/T4ZR9O3JLBvgb81e2qV4Rcfvi95QR5tCCJRv/j0M8+i3rjfGAkEyDYyEOgsWfIfhU/Tq59v3Qv1lKPe2I3yIqRKXYrfxCCG9BDen4S7gFv5ctxpVn2RfeRqdHmLOezOy8YPM/GdNrqqIpk8pCVvjFnaGw7/0hwmm2ghYnME/r9jfGC3t/PZnmn5N4pSv+FSxfXXabpi5aPceburujWngsY+B3T5BjLDhTj6UzWiSKmMIHIz1ApbVzzm98yOWQIARLhfpUODfBKQbr/BOTjsJDVXAfzndXMBtYLqAsgTOt6nSy4IKlSacm/U8DuYOgTYteJxWoiMhn9WcbMutamLUO4D2nmS1lTo85vtaE5hYoAp6U4PQQK1y57He2bIm+KNsjuHmP+u/+h4DuqpEcS1WpJyMpOXcHn9eHKzARlnrEK/4MhFAyDdAEjE8BB75p85TDKA/VU1McoNeDDJ/t0fk+Nm181RG3fapmy7KnS3XYrWUp3byLG+JlRwy+LTagefHD2EB7hysZjpkn3OQcC/ICYhaI2cHYsfloQ665KGYlcKT/fsFehhJDHrBQzykWRqQN1+8fgXJRl+X8ORv9HpZK2l+SgY2fTETb2I+ezWt1dXY+h5bi8B90MTSpUOSfU073sOxonhFgq2XOuj8SCTBdwDZkTXgYwhE1vslctVNnLpPBe/+i0PjUJqk3eHQUTftBs8tnUs+MneiAC8xbvmFDumLbgZE1Lv035hPyjijKVbVzJYIpVqldiVKx9xsVuOkq+xMOzCCkLfBQHYG+BnXe+yv+OrJWpNUCvjQD5Vbr//jIRBoE8jVBKmovoLJ9ooKAdXKIg5HUovlZFpvJyCfhXoAtHr0VuBtKsrcfd67stHXK9VzQUg49kLk+xWrqnm4cK2CnjIaY5V7xGVVmmoKExo= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2048fe46-5799-4136-d0e3-08da5ae81fce X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 22:30:24.1250 (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: DB3PR0102MB3546 Subject: [FFmpeg-devel] [PATCH 03/18] avcodec/hevcdec: Don't initialize HEVCContexts twice 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: +2LYGPOUebF9 The slicethread contexts need to be initialized for every frame, not only the first one, so one can remove the initialization when allocating these contexts, because the ordinary per-frame initialization will initialize them again just a few lines below. Signed-off-by: Andreas Rheinhardt --- libavcodec/hevcdec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index f222f20706..5ad02742ba 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2661,8 +2661,6 @@ static int hls_slice_data_wpp(HEVCContext *s, const H2645NAL *nal) res = AVERROR(ENOMEM); goto error; } - memcpy(s->sList[i], s, sizeof(HEVCContext)); - s->sList[i]->HEVClc = s->HEVClcList[i]; } offset = (lc->gb.index >> 3); @@ -2701,10 +2699,10 @@ static int hls_slice_data_wpp(HEVCContext *s, const H2645NAL *nal) s->data = data; for (i = 1; i < s->threads_number; i++) { - s->sList[i]->HEVClc->first_qp_group = 1; - s->sList[i]->HEVClc->qp_y = s->sList[0]->HEVClc->qp_y; memcpy(s->sList[i], s, sizeof(HEVCContext)); s->sList[i]->HEVClc = s->HEVClcList[i]; + s->sList[i]->HEVClc->first_qp_group = 1; + s->sList[i]->HEVClc->qp_y = s->sList[0]->HEVClc->qp_y; } atomic_store(&s->wpp_err, 0);