From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id F18C642060 for ; Wed, 27 Jul 2022 09:32:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5809A68B8C3; Wed, 27 Jul 2022 12:30:50 +0300 (EEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073045.outbound.protection.outlook.com [40.92.73.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7297568B84C for ; Wed, 27 Jul 2022 12:30:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f+UzrISuQGwdg7WO+psUSmcK+q3V5YnpXEXt2w/U2oyOuiAFtm7AVDFHWPJIyqVo0BFDl6fvVZE66kF1fxN3mqMGfsEcm5w02BJ7NlRndrSz9pvktqNP7fVmtj5ofq5sXDHuIuUbVY/vWbUanAcI5UN6idEG9XowjRkgwL2HiMozugxHfhzJdrwPILde1BMpEQWbUL9n2k5DVFduraA9BhQ8FrV6VKADMvzq8XX9+ubinleNz7Q3IedwYJbnpfZNDkk7T/ArQ6BVlgrqU00RmD7WHfhlldE2FrCL6iJP/gq1Hd08EC596sBPoRLmwve4ZltQEqN2ABNQ+Li00m51fA== 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=SJPnJx61BKew9RnbZKHW4hD0vtlO2KfB45R67UPhFK4=; b=SA+k5nD3WshZFQWnz0SX/t1iCEj8CEhh+i0pPROIzGX1Zi9QAPtPZwr5SUqoaYb+33n3K3CnnCQwzmzwmTS5F/Mq1GzMqbPRpzp9WLm9uHCJzzvItQBgKnqVTEYGR2DXcbfrkwhphN/2lrodQVOLEPf+ZDvouPeQ4xWEevaUod/EqbcMOaL6BFp9tJfepVoKWtLIf1wVQj58F/Jnak/s1hAqvgdJjf7ZxAexdyE/n/J3yyJBeuonZhMGWLxtc69d/AN2sStqquxvUfFYeVxmSIX8AZQfjjXY8UhMJvp2W62fULCtQSF0wbM+rj3UeM7hIldkTsoQxzLm2637b5kYLw== 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=SJPnJx61BKew9RnbZKHW4hD0vtlO2KfB45R67UPhFK4=; b=rRAzWfH28WNmeAQ/86h2ySuN4jWpjCnjONJbstJ0rZuaQxjHYQ1quiXtoZii8XRvJ8sls1yUA5wwLD7bavqpM43ZYPvpfzy5BzEoEelx7ViadSL+V5abyAHAjhBorXLR1Ok/DJm/8rmSey4JIOVQHGrJUoUfJ5wNvwTQBwBeCNMJiGPtipbC0aBSiV3avNiYEbRIiDLyZ3smEDOAACh30biorF0OLsX/IApZZxg3IeyUf9OfnEbpypan5PefafPyaQm3KpGLTfCCOXgLApzFQ7ZsuYZCy6+ZWfToEy5IOyMp6lmyDD9pIozO2uIqBuKUc+xx8RogrR4dj6Efe49AaQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM0PR01MB4626.eurprd01.prod.exchangelabs.com (2603:10a6:208:eb::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.25; Tue, 26 Jul 2022 22:09:04 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5458.025; Tue, 26 Jul 2022 22:09:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Jul 2022 00:07:45 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [LyQrDOcRM8zeTE49zbFzlQZ0sjHlVt6D] X-ClientProxiedBy: FR3P281CA0157.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::13) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220726220814.695563-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1f5b8894-e267-4f02-279e-08da6f5373a6 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQG9fQ4e5wexDZEKzsZPbgBenjWUQXqlkIM3UReIIOs7lGsPTFx1EZtOOQfmZU9GQl27/Sz0M4qZzBWWJG9YReuoh4zYayCtcVL6FGqA1YagZolVyr/uEA/TmlFp1i0GzlxVwmFUAv//Ui2e3mNnoQrZ7lLiyxQ0BD5YpdYjrmDGls2Lf0fxJNuJ4cexol57rpVPJKuhdHNzt+X5V203Pfm9r5juulHjEbKjvW/ySK22IN5rD9b81LTu6mE9oiCoq2MMX218XDbDo7Iarvp8vxaWD0ka0sMyVUmnTzFu11s1qhs4AsWFQijM79iMksqe13Qy3DCGMet89PK2BWCLlP5iHFhROAMQM9jQ6cAWfn+4olv4PMNSOSP6Fb/oPIBtSffPXkI6oPing1joIGer/AF5b7OWZ7TOQaPR8zcmLpi0ibUpoS/IAdsGskLjruDE5nIMxOZ4fmOoEnRTZMBRBgAyrgLF0uV5HRzpSNpJkRQhHhbzBZiiYL+2nSVX2gUVCeTaI4Jpam1mIEp5TfhXeh66tkBBnaJ39/FPDd+cIqcbpD1tzi3KbJLJqu5bmdNpMraHLwvlcVMxQ3zLlxpmCderg3AUO5qem0BXNxyuXYqyK4cJU2izHeD7qeLZp7wcnaacH9/O4Rkm+avOt6MBrHRIrmNHT6QUcV+uJNZ2uOJaOmus0EjCbpA9G/zFQpfPb0cgqy9XjaKaazJyfCvSp9GUNBpRQ/9MBM0eiLiuVGjoP2lilSuzBD1Y7i2rzWGTlQ= X-MS-TrafficTypeDiagnostic: AM0PR01MB4626:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /ujC0LdrjHCbWVPGaApV+QxVGHBu7SHO+RhDCajR+OZmQdT4lslkq6/LjgfWWjPHakzBDGWzqaNAe1YwohrRYFYoLdT3rVQT31TDpYjh7Ls/PwHxv8pUn4hhrc6BDkb2iq7ICHj9b8AoKdMZtIjIUpND2bLbO9oyaf839zohwY66Ueif2NEcbsPj1woSVwwUhfGwvNnU63+Mp5dIsVZBS7fUyVXF4ixAvPTwwkD/Ak4L0icBO6/CKqwQX0uS0riszlEXsc0z5lVRjKyJ8Dfr150tazlyMdcMy6RmcA4XAKF3zshRQVbmDSbOckcgvXc20t9foFGUYVDeKoVbmhU7pqbDoPJuKw0kr1pKmhz+zP+n+H0o7M/8vRsi+Nmt5QhatnXLh4hm2kTg6BR3tYf7mN0/5VCgQhN7LsCwDZK+nSVc8VRh4LOUz3yYEjIQWjF+LkGClIiiSY8Enq3wIUUtMdYelUgj3DKo5CYQkvjA5cEUBEdkq7LyqFcPlF2hvkHVv2sBWJeIThLMuHDfH3mXBQcvObovSjYmUxuKcg/HS7ODkTtVdNmgnwiP8/sINJVzQqu5VbjdLDEkcVbLexg9tBjf0q51FX3LnJ04kusJFZ09SHeDI4+gJshdoof+OYTzPicH0FHmLZ6GLxB9xc5ILw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UBIEAGfZJRLtx9bczJcwnmKlz4iBjK3E3u9aGOMVp6WslsKyjUFZPF22SfyQ?= =?us-ascii?Q?uveutNoriFRVi47M2A88WKfJn7KmnNlIr4WxSakte4mgvwv3VM+q5HqB//th?= =?us-ascii?Q?Q1ftUcs+AzrHCzlqYDMXGDMtCtbxBMcRnQG6/NROrypuW18nu4a2IMKCRwKX?= =?us-ascii?Q?aIKSbQ/O9PPp9wya+pd54ygAC1go8SRMeIYj9ZfRbkdEC8lNUZnN3t/51ju5?= =?us-ascii?Q?TDanVzAPVavgXnBonbj7+RC/h3aPg2VcY2yokR383yy39aLe1Rjd7/0W6DHs?= =?us-ascii?Q?GKO+hl5c5TtxNRie+y3EF42AkXEmiUKMH0GRvjRM6DM7e3XoLtc5nBARLeRe?= =?us-ascii?Q?hJKHqPqC5vcPAVIv5dU3Jy0xMgRgr4yKI5YF0XGveyeFO3aNzX98ut2u+nKY?= =?us-ascii?Q?pl4uIlAVRIGfkdZ3NRvKtn4bM+X3Z/GhpY0wZd1YkL32sPyT9qxAgzKkOeP5?= =?us-ascii?Q?q75pcxTQuFr2TSHjz23QNL1JNeRqNNIWyfcHF0AoU37p4LWrNmT5XAJELZGG?= =?us-ascii?Q?X6KdZpAIMQrH0aEPaJ6FupRYNSzbYWWXXqg96wcbfPZNFG6CZsE2GIgDUX4+?= =?us-ascii?Q?pnvUE6DI0Joa78qKxMY2oJr0HjQYx2D8kG2F17kcZFsVuKhNs5OuotfMXiEz?= =?us-ascii?Q?LTV0CKYSecB1e986z/PwBCJHvKYYYiWSNhVbowVAKxUZ4GJ7iKYVvxvLGYSU?= =?us-ascii?Q?2FvavWNin42F0cE9C1e2GHV5/FlA7OxzBfIiY7MXy+bowuJzImbdfuREYncO?= =?us-ascii?Q?LbgFzkqKajT73/0x1ieFqaHvOv+OOaCkGMDxytm3ph+a+jnhJ3WT4QS92XAR?= =?us-ascii?Q?lc52ZtgDc+0WNeMOHV5sHYAJFnWkEHoxL+VZS7MywBT4KBO1u2odyfYUQjnb?= =?us-ascii?Q?xN/lwrMEmEjIDoTsGo4Rmy7MIY9ZxzJVwODhcAW8Jc+mxFniBDMMISHJ3U+Z?= =?us-ascii?Q?musqAAHg1JjfUqhljGRPzb+Xda6x7DRhdEZWWSXFEkZgCo8q4oRt9vDsLuFY?= =?us-ascii?Q?W1lThB5Vcum/u+Ja85ifYFwjIHBMixdt24QUEiC6EfxSdOwFVxTydTQ4sT0V?= =?us-ascii?Q?XypI2SPRMKcx/piWdw6UQBraiH+JKzCXj4jiuCMS3aGqmrIPeHbxWV2+goDz?= =?us-ascii?Q?7x9zs4aJQ9D7wfb4NUaQ4+tKO/c+ml1Z3c6+a+1Ad8TemO0hTIphgHSeG2yx?= =?us-ascii?Q?2lCdMCLkIzWObyz2Jr6uvv4ZYZaQ5l2ZLAR2ZZM6zSgMWJ27gAYCDtVSfU1y?= =?us-ascii?Q?Mp19IOsXiAtiyIVPuBSuaJjcryoYJJo8sGQ8dh3jKRmyloC1gOxMXYJOk5IN?= =?us-ascii?Q?zPc=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f5b8894-e267-4f02-279e-08da6f5373a6 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 22:09:04.2240 (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: AM0PR01MB4626 Subject: [FFmpeg-devel] [PATCH 10/39] avcodec/jpeg2000dec: Constify slice threads' ptr to main context 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Modifying the main context from a slice thread is (usually) a data race, so it must not happen. So only use a pointer to const to access the main context. Signed-off-by: Andreas Rheinhardt --- libavcodec/jpeg2000dec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 4823127758..503753c4d6 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1679,7 +1679,7 @@ static void decode_refpass(Jpeg2000T1Context *t1, int width, int height, } } -static void decode_clnpass(Jpeg2000DecoderContext *s, Jpeg2000T1Context *t1, +static void decode_clnpass(const Jpeg2000DecoderContext *s, Jpeg2000T1Context *t1, int width, int height, int bpno, int bandno, int seg_symbols, int vert_causal_ctx_csty_symbol) { @@ -1745,7 +1745,7 @@ static void decode_clnpass(Jpeg2000DecoderContext *s, Jpeg2000T1Context *t1, } } -static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, +static int decode_cblk(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, Jpeg2000T1Context *t1, Jpeg2000Cblk *cblk, int width, int height, int bandpos, uint8_t roi_shift) { @@ -1896,7 +1896,7 @@ static void dequantization_int_97(int x, int y, Jpeg2000Cblk *cblk, } } -static inline void mct_decode(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile) +static inline void mct_decode(const Jpeg2000DecoderContext *s, Jpeg2000Tile *tile) { int i, csize = 1; void *src[3]; @@ -1937,7 +1937,7 @@ static inline void roi_scale_cblk(Jpeg2000Cblk *cblk, } } -static inline void tile_codeblocks(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile) +static inline void tile_codeblocks(const Jpeg2000DecoderContext *s, Jpeg2000Tile *tile) { Jpeg2000T1Context t1; @@ -2009,7 +2009,7 @@ static inline void tile_codeblocks(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile } #define WRITE_FRAME(D, PIXEL) \ - static inline void write_frame_ ## D(Jpeg2000DecoderContext * s, Jpeg2000Tile * tile, \ + static inline void write_frame_ ## D(const Jpeg2000DecoderContext * s, Jpeg2000Tile * tile, \ AVFrame * picture, int precision) \ { \ const AVPixFmtDescriptor *pixdesc = av_pix_fmt_desc_get(s->avctx->pix_fmt); \ @@ -2078,7 +2078,7 @@ WRITE_FRAME(16, uint16_t) static int jpeg2000_decode_tile(AVCodecContext *avctx, void *td, int jobnr, int threadnr) { - Jpeg2000DecoderContext *s = avctx->priv_data; + const Jpeg2000DecoderContext *s = avctx->priv_data; AVFrame *picture = td; Jpeg2000Tile *tile = s->tile + jobnr; -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".