From patchwork Fri Nov 20 07:18:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23774 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 86368449F1B for ; Fri, 20 Nov 2020 09:28:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0DDDB68BA3C; Fri, 20 Nov 2020 09:24:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD7B168BA04 for ; Fri, 20 Nov 2020 09:24:35 +0200 (EET) Received: by mail-ej1-f67.google.com with SMTP id f23so11520008ejk.2 for ; Thu, 19 Nov 2020 23:24:35 -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:reply-to :mime-version:content-transfer-encoding; bh=siPJDSm4OoIE+xXL8C/6KqQZhqDHgBUW/oCAucP5LPo=; b=kYZ/4VfG5ydiNqhCFzEN6jtJPs8nZ7zaKUZ7F+hNv+EfNR0H6txkeJZymbmyGBv7ui BzE76si42OPPGHSwXlPoWieOAtTuI9LGbUlPKJbhjmisMmUBGpt1oEG1cZjdbYzGfsFA ywLnHiWqlWo0DjJq+36FDA/pjvzjPHF013sVL45UakPWNQqB2mOdscH7QsbGiezP+jtZ L6LN+3HcBVzaKMAGZ6owVLr9XMVA5cJmVArxH3/1Oam9sCJQfvd+xINSWlqcs6N0OiX5 SATXEW0Z/66UgH0y05o3c6VVii2HGGxXNQbM/IhhZyYaVg3iDJd/bKmkQh9QeYYRe4Ll FCEA== 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:reply-to:mime-version:content-transfer-encoding; bh=siPJDSm4OoIE+xXL8C/6KqQZhqDHgBUW/oCAucP5LPo=; b=opjZtmpfLPchCx7MM/AsoI+H/XrCU3790/S1q5snD62B3At2CPNBIUNGSItKUjudYW eMbr/PbDKRvLqU3VrkK6N6R0xyMhUYRfABeCrB0YahH6+28aTWhi3Q7r9AkZyecZRyXx +DGHJcX4E0W63weTuDKNHNWlyGoJJ5GQWlbv1TSnYJeVQ9C40I7wrzhACypsOmnRT8O2 KFWQoPfsU+QLJg6LpMtvSe+EgscIksobAvVsQQd24SAze9jSEWDNGS88xNbHiwSZCTYQ mNB5Vy/uJn4QHvuFiHNcTDtUT5NqT1dJtVKJ8+V2bzGqHOkKfqvFIJPKdwljxuj9YL1P sDvw== X-Gm-Message-State: AOAM531ty/1Q/sD4N19FIk0tlVpxKNqKulqWEXo7MKYXiIFmKMMv2H6q naCvPcErsxgqqTDxgaznM8QzwHW0Ud95lQ== X-Google-Smtp-Source: ABdhPJw0xNlUh4vM2KoYcOwkCUwvlgV0YfSYFwN8YOX8lvBgBnqC+chaeRbbckcmg4G9VNKXVznkEg== X-Received: by 2002:a17:907:1008:: with SMTP id ox8mr30987543ejb.189.1605857074918; Thu, 19 Nov 2020 23:24:34 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id lz27sm779419ejb.39.2020.11.19.23.24.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:24:34 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:18:58 +0100 Message-Id: <20201120072116.818090-26-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> References: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 025/162] avcodec/wnv1: Make decoder 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/wnv1.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c index 7dd0e72596..a17a2bc3b6 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -24,6 +24,8 @@ * Winnov WNV1 codec. */ +#include "libavutil/thread.h" + #define BITSTREAM_READER_LE #include "avcodec.h" #include "get_bits.h" @@ -112,14 +114,22 @@ static int decode_frame(AVCodecContext *avctx, return buf_size; } -static av_cold int decode_init(AVCodecContext *avctx) +static av_cold void wnv1_init_static(void) { - avctx->pix_fmt = AV_PIX_FMT_YUV422P; - INIT_VLC_STATIC_FROM_LENGTHS(&code_vlc, CODE_VLC_BITS, 16, &code_tab[0][1], 2, &code_tab[0][0], 2, 1, -7, INIT_VLC_OUTPUT_LE, 1 << CODE_VLC_BITS); +} + +static av_cold int decode_init(AVCodecContext *avctx) +{ + static AVOnce init_static_once = AV_ONCE_INIT; + + avctx->pix_fmt = AV_PIX_FMT_YUV422P; + + ff_thread_once(&init_static_once, wnv1_init_static); + return 0; } @@ -131,4 +141,5 @@ AVCodec ff_wnv1_decoder = { .init = decode_init, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, };