From patchwork Sat Dec 5 20:33:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24360 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 4C016448E0A for ; Sat, 5 Dec 2020 22:34:27 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2309B68A84F; Sat, 5 Dec 2020 22:34:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6BE886882DE for ; Sat, 5 Dec 2020 22:34:20 +0200 (EET) Received: by mail-wm1-f46.google.com with SMTP id e25so10095273wme.0 for ; Sat, 05 Dec 2020 12:34:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tGX9CBAK8mZaumso8MaC/MaI/8omLoeO3NkgJQQNcRc=; b=mG7jMnW66dE9Ez3VAmloeGkJvTOYIL+rBBBycjWc0lcjUbQjOwXVV9plx1Tw2WiVJF uUKtkKhKvW7DLnv6tG5LvF25JAJio/ZbWKTT4hPbQLe9mLUZuKR9ui2y1S0OpduLtnlQ Dsux4SWeIiCHNcaXSnb80+0tVZbp4f9tIbXeS40NI0kQenoB0n2Wop2zV3PxwmCJKxFu uCRWhE1FddXpuWfR4PttZHB04R5SRYK97UtVJDggm4v8qDFFVIgDUegf/XRtkel/+3im Yh22Njhbj0f59+AhqIVfyL1Nih/orJB99QLk/rVOyPXC6aDgtroDayvcGiHbTTDJTd7I O7Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tGX9CBAK8mZaumso8MaC/MaI/8omLoeO3NkgJQQNcRc=; b=L40d4piAf/4/I+qn1SKx9R9ideRALtKyuv77CuVyo5FQc6BkBtIPi5h1My6wdvzqBA Wj7lmkAWvtG2Yw1RcQVRHNqtLMJv2evssVXyFZw9JhIa7RxVPSi/TD2F56Ilo0X8JkMp SbuZfqQVLIxnMXf/ktkNPT2DeXziHxP6s58G6/yIp066vVV65g/3punCicC1dxZsmZ79 7PcAJBOWLGsT+So8lPnQOXhzTmTl10musopRF5xyhTLkDrynejrMZdA4ZV9FsB9InXes xch8PQeLLeB9wUZy1JHWYaQlVtel92MJt1Pvnr/qzyB+hdhdqJk38Jma85F1IHTYHhtN 5efw== X-Gm-Message-State: AOAM5324mvEcDBT+h909s3N8wMu45e0CI8/2LyGrW1aO7FFv2gT3+ZFm jlRyACzNrh6RvSO1FZnf6S2QURPzXk5oRw== X-Google-Smtp-Source: ABdhPJzEMFLtUh3wn3T6umW7Sy0i+xNMim3rV6CH8CLPuIWIsiTMDxP3CcJMhRLFBnRC4Lmyan2dYg== X-Received: by 2002:a1c:3dd6:: with SMTP id k205mr10568136wma.128.1607200459681; Sat, 05 Dec 2020 12:34:19 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id e4sm8747079wrr.32.2020.12.05.12.34.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Dec 2020 12:34:19 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Dec 2020 21:33:39 +0100 Message-Id: <20201205203340.19357-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201205203340.19357-1-andreas.rheinhardt@gmail.com> References: <20201205203340.19357-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/ac3dec: Make decoders init-threadsafe X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3dec.c | 5 ++++- libavcodec/ac3dec_fixed.c | 2 +- libavcodec/ac3dec_float.c | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 3e4bec56b1..c7deb56e1c 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -33,6 +33,7 @@ #include "libavutil/crc.h" #include "libavutil/downmix_info.h" #include "libavutil/opt.h" +#include "libavutil/thread.h" #include "bswapdsp.h" #include "internal.h" #include "aac_ac3_parser.h" @@ -183,12 +184,12 @@ static av_cold void ac3_tables_init(void) */ static av_cold int ac3_decode_init(AVCodecContext *avctx) { + static AVOnce init_static_once = AV_ONCE_INIT; AC3DecodeContext *s = avctx->priv_data; int i, ret; s->avctx = avctx; - ac3_tables_init(); if ((ret = ff_mdct_init(&s->imdct_256, 8, 1, 1.0)) < 0 || (ret = ff_mdct_init(&s->imdct_512, 9, 1, 1.0)) < 0) return ret; @@ -226,6 +227,8 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx) s->dlyptr[i] = s->delay[i]; } + ff_thread_once(&init_static_once, ac3_tables_init); + return 0; } diff --git a/libavcodec/ac3dec_fixed.c b/libavcodec/ac3dec_fixed.c index 662cb8169e..daab433295 100644 --- a/libavcodec/ac3dec_fixed.c +++ b/libavcodec/ac3dec_fixed.c @@ -182,5 +182,5 @@ AVCodec ff_ac3_fixed_decoder = { .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, .priv_class = &ac3_decoder_class, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/ac3dec_float.c b/libavcodec/ac3dec_float.c index 5010ee0ca5..b18317f8b3 100644 --- a/libavcodec/ac3dec_float.c +++ b/libavcodec/ac3dec_float.c @@ -67,7 +67,7 @@ AVCodec ff_ac3_decoder = { .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .priv_class = &ac3_decoder_class, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; #if CONFIG_EAC3_DECODER @@ -92,6 +92,6 @@ AVCodec ff_eac3_decoder = { .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .priv_class = &eac3_decoder_class, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; #endif