From patchwork Mon May 6 12:14:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48577 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:e68f:b0:1af:836d:81b3 with SMTP id mz15csp1334511pzb; Mon, 6 May 2024 05:14:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVHJwvR72O7sks/Prlhd0ak+25wqO4K2FgQg91D4qUgNyCPw7xIk4UhlLZ891u2WTpx6MD9aFtidiW5WN1fP4H1WTSZueGIYtNOWg== X-Google-Smtp-Source: AGHT+IFhshOop4uafagVoZrF8qtNwGnDvQVdJnzZO0EKF2SaEGW3S/wExnSRBaFVHB7wkoGmQ+5I X-Received: by 2002:a19:6405:0:b0:516:c241:a912 with SMTP id y5-20020a196405000000b00516c241a912mr5728414lfb.1.1714997694909; Mon, 06 May 2024 05:14:54 -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 d7-20020a05640208c700b00571bdba1dc6si4803854edz.450.2024.05.06.05.14.54; Mon, 06 May 2024 05:14:54 -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=S8pgcyWi; 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 ECC5B68D4DE; Mon, 6 May 2024 15:14:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2090.outbound.protection.outlook.com [40.92.89.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 168F568D4DE for ; Mon, 6 May 2024 15:14:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h43Y5XX/yr3xuvkozSqUA9ZH0z8dJJpln+YK28Yw42b0w/rhL4Sa5mzdtPymY06f75RuyNHrgq+jg5sHGdDuXlkbQ+VW94Ul2tAIJPofkIPEK/V7KpqzneHsT1ZWIIjLpr4T1sS8BIUDzCCYwhnAShCm4rgEmT7TVrUtHvql3HtKSaoy7P7kQgEVH4LwbnRXnFfAMuP6AO1+/tIiGUeO5jibJss3ijiRAMIPvSYWcfAacYOpK9BW18CPO9phbitT/1zWyMOTDMszt33V6nBxLGJZzdNHF+1x3XWmVdXl6wRN7OHkhcZE5BKhNo5TOR0+bzyoK9QTfwfdQs883uuc5A== 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=S0Ss5q6IWaMAttRw37B3HHJdDnYcchBvLawkba8Gn9s=; b=EQgid6aNxamqMUKKIuUInQ1QiwvYbJrFghWeYpEiTOJ2Lvi2QKtk+A85yoVYToMTJzop+aGdYeMSEjw8XtHx7j10kdG44vH0Lbl0s7fKKeJ6i/FthjEBYc24hWVstKaIbjXgGOkH8vw4OPM0rgrVZKRXtQSBh8KmL83I+UoePU6ZtNvTQ9KTKK08g9y+hjhSpWAJDgQdDiLmjx+PN5NOAoRGiOqJMMSHd6YzeFCZFziDHXHy/FJ6/dkMajSjn9PFppfT/fJICD0yGorHKla8wu0xcoVwMBGVZWvEat0kaqIxZfj+6rH4SyvPzJuibsADQ5gRLUUg8MhkNPvDd4Q1Pg== 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=S0Ss5q6IWaMAttRw37B3HHJdDnYcchBvLawkba8Gn9s=; b=S8pgcyWi8OkPn0w3Kr3CJFNRNszaIhgDKgZ0wferPt2Z5zuik+n85uemPTOl0yR9C/Cb5/ivW3+6EuuNxOSZ6mihjTcePP9u/UmCVYAko2kmUgUj2GxMAbYSTsNtO6Qy8uQByAd/1dIhwScqxdrU91JpfHmlvlO6QkcEnj6hJ39zaXt1LgwsRJSfCS4OM9aNkZQSlB60siNB1nG2r/dzRBRH+OWmMAemILh1b6G3WQaflS/81eEXv+NApx7ND9QZBBK84N7xQvsajEwk6zBuuZkS1E/fofWuavTIzjN2IZV0ac0/S8j9E0mt0hth/X3FRFRsxg+fYOCXejgZyYmF8Q== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB9P250MB0497.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:33d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.39; Mon, 6 May 2024 12:14:42 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.029; Mon, 6 May 2024 12:14:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 May 2024 14:14:26 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [Xp01tDkKk5UOUxkwX0Tu+9cr9XxmZ/72oCqc1ljd2Ic=] X-ClientProxiedBy: ZR2P278CA0069.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::15) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240506121434.225228-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB9P250MB0497:EE_ X-MS-Office365-Filtering-Correlation-Id: d3ccff7b-1e70-4fa0-32cf-08dc6dc61bdf X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: hKWlNjc4FhwCXKtLRrgRTFTtQrYTEb1Dhtd4aOOB4gKt7CZIKuBWyE7t74xQuPPBSYUznu9XFRZuzRqGAmaeom/0HOwrT6VsH+KxQx63xlwz0jE2I3TQXOYHxwEaOIzXFYokUhzsWmEEytAckCbLoj6ic+jmve/y019H9dw0Prs+LPg2pNdJ4RLlUZuppHvUWgmSg78JydNY429ZjTPkoeaa1xwCLW9iIhz8HZpXeoMvWAKeeAHmyZsjtLnZOtKpMJliAX7tx1wKJNeWcVrV1JFBTximPDJgZ9IqU87sN1HJxpcF5Rce/R8my+zrApazzKeHq7BsFhx4Pyw1OpslruCJMAB5tDcGnleBsJH3qc/hjzsAkBT3YbqylTUqSb0Gm7mzDjdHgLFIH1D3yYsGEY8AsrQYsTAuevgigjG1tQVZPCyirH8Sc5RtL7s6CH5kf+CEtzhtD72jcMsrdSFpE3V9nAfNSYWwZvdBL7EV1COKF2WABCodx0kWbjX+WtV+F+9XEmPCnCxZhfLzMs+9Y93EVH7KRuRlPrmuADUe844bguvPrVOnYeKdd4Z57V4KDri8teJoc1eyX6KsY1bk3jPMvuOYKWxKHbVZ1AKBlNgT2+kR0Bv7/L74sM3dHhkU X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +HbxFi6dOHGRQgL/RkmghrJlGH52UPfXKJorb+uBfOu7jkrkIbH0bzmCfMGs+kjzxK3lvtWttqf3w+sYLvDnRslBzfW7HAMfn79glCiadD+oZ4NzDct7YH4kmno1+jfwbs9B6cemkkfXHDEjaHkMguqG4IyPkR172iUELtgilw9XKK9BlgnSi/2r/DhEAvemiHwXdoKaKgKu3Kc+InSuQ8Pvo5AOSoXSVYfpBKejQ+tFx29NJn8Wad1q3dNCPd/qY/ZUe/3qjuOV07IZOUvQZfch7yqmGOVydUOVaN/F4TAiMdF43fed79QNfi0hIC+ybp01P8WNLdtJxBEBBaXtHpj3EnOST4nsj65AdN5/2GHY8HtDMczuXkQxTrtD/NPy9oaypRsT1ChbjHdMexsHvRXdQiAGrNlGnPex/s62Mc9/ZcHC9KfOu7dETqUWL2wQmpd98x1/2eVuM5DkgoUJMCulgovVtE7RE9ALBL+DDcuNK2OBLoyrg4+Tgm5WL6jf6i2daNjrd5g0R7MgN82vAyoHpQoUjT/0cW3AkS88VxcxQiyMhc6bBK9JUJpNNDpy7GoQzZKY/lXAw0lMRq9ffIbF1gcDjFfc2BGT2Uzc5f+Nly4665rWsdyw9v0gIGRr/kCJ/TNkBXuwYwsJC4qmI5mvqO+LnU37owb6IPmgwTpbtYDjvsEkAMy+LJznRsHF5MuFmU6CzelQvl3x1G5RBNlwFM/FCP2PWU23emXw33jBL5ZTrVyXGlciQusdriGwm48tZGBvtCnNc5J4y7t9HE2BA1KHYYQBvTHmhHeSw3X29mOlMEThLVDuqd9I9R9auOHQmCAqYz5VNKlYKGQVM1R+d+lhcl5imtgf7Go3KIm9xoJtHX2ex2LTVPM8w4MOKozvRiL4Gyund6Hqy3QEcl9BQO+RGcA+AqGzvppq+YwkjxKxQzk+DFrkc5EyjmSY7ByVIwefBTIaqT7mYlfaAJIvRvm2LbMD7em1Ukh3ciZtYCerz8wyedbrnfQCl3xKXwFxSeVXDPsp8UiLraxhj0DVWW/b06G6DMJmM5rCP8tC6R2x1VxgLDdztYTrYzyMZiLp2OG+aq+UYe7UuonZVlU9sgZQDja9DkkUMa0n+4ZJN86scJTjsCaxmIyZHyUmI9CpN6AJqYXY0nv9HF9LmhuQ2ncWPFTpTfMX55njIKL5vPgcCpscT6tyatZkMsw0nG/IOC4y7nqHk+ggW81eTAGI7gGpYx/uUEhQzVe3ApE+zgZTeH4+fLeDJ6Mp+oYqqsJ3tsrTbUqbp0hcXBszOg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3ccff7b-1e70-4fa0-32cf-08dc6dc61bdf X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2024 12:14:42.0474 (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: DB9P250MB0497 Subject: [FFmpeg-devel] [PATCH 04/12] avcodec/aac/aacdec: Remove unnecessary ff_thread_once() 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: CntKaTPz/hSZ ff_aacdec_common_init_once() already uses its own AVOnce. Signed-off-by: Andreas Rheinhardt --- libavcodec/aac/aacdec.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c index 6a74b05168..f6a7266123 100644 --- a/libavcodec/aac/aacdec.c +++ b/libavcodec/aac/aacdec.c @@ -61,7 +61,6 @@ #include "libavutil/opt.h" #include "libavutil/tx.h" #include "libavutil/version.h" -#include "libavutil/thread.h" #if CONFIG_AAC_DECODER && CONFIG_AAC_FIXED_DECODER #define IS_FIXED(is_fixed) (is_fixed) @@ -1120,12 +1119,6 @@ static int sample_rate_idx (int rate) else return 11; } -static av_cold void aac_static_table_init(void) -{ - ff_aacdec_common_init_once(); -} -static AVOnce aac_table_init = AV_ONCE_INIT; - static av_cold int decode_close(AVCodecContext *avctx) { AACDecContext *ac = avctx->priv_data; @@ -1209,9 +1202,7 @@ static av_cold int aac_decode_init_internal(AVCodecContext *avctx) if (avctx->sample_rate > 96000) return AVERROR_INVALIDDATA; - ret = ff_thread_once(&aac_table_init, &aac_static_table_init); - if (ret != 0) - return AVERROR_UNKNOWN; + ff_aacdec_common_init_once(); ac->avctx = avctx; ac->oc[1].m4ac.sample_rate = avctx->sample_rate;