From patchwork Thu Jan 27 15:10:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33885 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp2527446iov; Thu, 27 Jan 2022 07:11:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJyZuxKmlKJDilmPktFyOlBHMTq5op0YeJuphZU0YNqq4fLioyembuZNYdX6hk/91CqCmRXf X-Received: by 2002:a17:907:9710:: with SMTP id jg16mr3397560ejc.446.1643296272693; Thu, 27 Jan 2022 07:11: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 v27si1421299edl.555.2022.01.27.07.11.11; Thu, 27 Jan 2022 07:11: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=cSCJfKPz; 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 2EEED68B1C0; Thu, 27 Jan 2022 17:11:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2026.outbound.protection.outlook.com [40.92.91.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C4D6568B178 for ; Thu, 27 Jan 2022 17:11:02 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GVezZ/qAVrwXxMtgP8u8QDcAEZKQTNW9dbCKgde2gaGJyCuJf/l5L065YRWa8JdHZGF1tGtevgFl/fusENMBOqaqwPY2F9voQkfyESRAykquAyDiNs7KWbSsiHivywhFXrllux7ReTPZI5TBCbs1c0ey43lbNsQqcuA/G9QrGbONLvEsk+d7qa7y70UM7LGGc2k6kZm+WogV0OJvRqWOeZfBh4NDHbUokZj+9kFt2eBtDpA+bhlUUGCY5q2OhoEMHBqQbU7yGv83nTSUeRDURXh7hKgSWdyQvGRG0JjoSef/4YDu95VCT8o2DGfZVnef3YzkkJA2OprviXh9RZiY0A== 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=rQENORZ/WHiI0rvNZSi4QP8BwZ4Dd6zIReKB2Q69tYk=; b=kj37Cz2poSD6EkttUrdvtBMiRcHJ8EbjY5wqJssTJ44w16tyKq2eGjQTT0vA2IAdCNBjmEAO/IvxgrXl6wfndMkFuDNDnYL/vhNlL9IEYJ6g0aLCws1tIyWq/1R6PHk2HzCyX+2gbsmDGwHHl8nHMFvAFJQXlRUt2UtlGnMlIJJTIvPVubdSTT00nyxKSCUBLMDOg+sDGWmlcgmye/MPluCNriED1JEODo3POZm40yAaq/ongNmFbEYIpFp6zGXcHk4TR3quGODC7XE+FsK+3LT0yZfz19er6lcPMHPJ3ylfSRwUy3LDSL5Yc44ItADJn3kSVjG6nbaNEfppdY8DVQ== 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=rQENORZ/WHiI0rvNZSi4QP8BwZ4Dd6zIReKB2Q69tYk=; b=cSCJfKPz3b8gpR5Jq+abKnc/3v6LOvRfb+DBcBuJ7NptmKrIyJwZ6mGQaFOyyI3Tl6KSsymkxprBQsMnWZYwOlVcAAzF44NqoINtT4o7yf7nttatw/MzxOfSiiNu/92xOaC414fRecFOaQmcGFxnjNEV4SqSYr3rZ5N9omb4nsX6T25bbDXczLKggYFfk5UpG6byqZIpLj2Rce8EkP6IgcySdL5c6nMib0Mi5cxzFYxxxn3SrtSA/Im1axeIQc0QhEI9KBwV3JFjYKc9B1kOd/z49eZhZn7xi3rH7XPakrGg0/Sv41bSifsowjt6xpObOgEwuZCmklKpJZsyb+7zsA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM4PR0302MB2818.eurprd03.prod.outlook.com (2603:10a6:200:91::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17; Thu, 27 Jan 2022 15:11:01 +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.4930.017; Thu, 27 Jan 2022 15:11:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Jan 2022 16:10:54 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [4hAeJcs8BWvuyVWVa9sIlutDg/dGZRWN] X-ClientProxiedBy: AS8PR04CA0083.eurprd04.prod.outlook.com (2603:10a6:20b:313::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220127151054.2031171-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 503b4b09-2f32-4b9b-9953-08d9e1a73acb X-MS-TrafficTypeDiagnostic: AM4PR0302MB2818:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q9sS2dIHr5pFDLojkllW/J2BncEHp/gHRPihp2e39GghU7LN2DcGS/0vEvu5qH84Ju3i5cJRbFmppl1fA94B4ju1wMIG85amvlOWUfW9yBcT5ygsi3X/6j68GxSLP2xOrOCu6dEyOutD1pwRYJ7ZF8CkTOfsE4Q3bIPPhD2mJSVnKztfimsTgaxmRj2x2lsic7xvi4MxNM3aXb31VTM3DDyEYegEBjifUTui5ClseqxjEO6sO9c6E1b506K4C+ETvK6dKYPTt//uv2pUES9KicxkrL/vpN+u0XtwBYPsNdOgJjJ3MOgDrGCcJ8rHvrPFbJKktoUFA2d8djmGH9krdKryvQimj2eBlwzzENHQK6MYJjQKnoZWIHVeeqaT6nBQfNeusFkCmlfS2XWa5tQd7SN6HvqOsxJ/29SrzW5WGIsY07GXEls0X0B/Ak1cH8KumXZpfJZzjP+GlNQuzbD+Ucq83qPrRPBtYLGmN/TsZn3ElybLr8qEpyZNdMfKKlJArKSQuFqtmdkiiy2ZodV5vOjnm42BQ5kpdw9QZjGo1ZhFgBMp8BvgNcMSjNOV6D0S X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ipMUOojh1bsv6aDhDQjpYiTHpnGcMP8gVsvyS9hb+Rq2+vL+/ATt9PfXaBJ9fsix3qPmM1Jl/S5rB6ba3xFdFpj5DJXFuF01acounY6wmux+GEEb9tF/bRjrvhUmkZA7k2Z/BFuy1wjcrbbH7g5VFGIUFltF0FANx5O9ajhA5JY49V+NNASXAIZlpClB6d0BNrBFa7ztNUDc7oL51Lbj7Be2/9Mo/KqWsVVln7Rk0+czxcN2u2lbkGAMy7bHiZhL1MWbiuIIPQP7uucRnKnJ0cY5qGQYYPPH2cePtwf5FHfKOIh9WnpvZ1uTVlfsRSUVS/htU1eVy2BrZwekxYqaONbW6pmKPCII3SqMKkmelN6CYOIOjX2HK2Qz6wmV9BKzzuO4gpPSkEdQYN3ypcJOLOjhV3OBwwH3SP8u1A1CJX4ELKtU2vuupxBrit7cbZmf24aILr6e3ee3D2Seo4IyMY4dp+h3bb+FKhhNvpjr9isL2HpNY3BMoufp2Vui4hEDokpcniz72o5uZ7TUDcQpaVmfh4SEFgvF6SxXGgXiKYN+AAVQGnyv0HcJhEcu3mnQTNZcVeyiy5iqlfEfQvVyhoA7/fxkzuoz8rv49fbggOmDZkC+RYtRxf9Ed2w2xK4QTxGXcvQ+el8i2Hwz7ZDgNgyBen8Iz/xingub8nLnD5feH2PY5Hqu4ZL5NdIrP5gfU5ZOdhF6pUpnsoEi5RIlklXAO0bOWhF1bOUEILqHeuL9sWCUoOUJkso3hRzH9/6aBk1s1Jvg7El5j8xDoD9zNjDBzBKTitgqjDa3jyumMIaPxyWeU1y2xsOG/x9cJj0WYPRMSKW/G5NdTDLoKy/e8KYZt+noqtxvCim5Lfu6XV1BnPqMTOM1ZVZQrk7/Op6P1mzKoMIiQGhiy/Cr63VrJNtBmLiSP+txkmna2mt2qSd6gojRSFUK+QMi/N6PrVvH1zIa3lM+HDGMqhOI2va4uQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 503b4b09-2f32-4b9b-9953-08d9e1a73acb X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2022 15:11:01.3251 (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: AM4PR0302MB2818 Subject: [FFmpeg-devel] [PATCH] avcodec/jpeg2000dec: Move preparations to main thread, fix race 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: p+7j/Z30GE7T jpeg2000_decode_tile() (which is run concurrently by several threads when using slice threading) currently modifies some joint values before doing its actual work. This is a data race that happens to work because all threads set the same values; but it is nevertheless undefined behaviour. Fix this by performing said preparatory work in the main thread instead. This fixes the vsynth(1|2|_lena)-jpeg2000(-97)? FATE-tests when using TSAN and slice threading. Signed-off-by: Andreas Rheinhardt --- libavcodec/jpeg2000dec.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 80b2e2d627..a7eb809f30 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2080,7 +2080,6 @@ static int jpeg2000_decode_tile(AVCodecContext *avctx, void *td, Jpeg2000DecoderContext *s = avctx->priv_data; AVFrame *picture = td; Jpeg2000Tile *tile = s->tile + jobnr; - int x; tile_codeblocks(s, tile); @@ -2088,17 +2087,6 @@ static int jpeg2000_decode_tile(AVCodecContext *avctx, void *td, if (tile->codsty[0].mct) mct_decode(s, tile); - for (x = 0; x < s->ncomponents; x++) { - if (s->cdef[x] < 0) { - for (x = 0; x < s->ncomponents; x++) { - s->cdef[x] = x + 1; - } - if ((s->ncomponents & 1) == 0) - s->cdef[s->ncomponents-1] = 0; - break; - } - } - if (s->precision <= 8) { write_frame_8(s, tile, picture, 8); } else { @@ -2537,6 +2525,17 @@ static int jpeg2000_decode_frame(AVCodecContext *avctx, void *data, if (ret = jpeg2000_read_bitstream_packets(s)) goto end; + for (int x = 0; x < s->ncomponents; x++) { + if (s->cdef[x] < 0) { + for (x = 0; x < s->ncomponents; x++) { + s->cdef[x] = x + 1; + } + if ((s->ncomponents & 1) == 0) + s->cdef[s->ncomponents-1] = 0; + break; + } + } + avctx->execute2(avctx, jpeg2000_decode_tile, picture, NULL, s->numXtiles * s->numYtiles); jpeg2000_dec_cleanup(s);