From patchwork Thu Dec 10 11:16:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24506 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 526E444AFC6 for ; Thu, 10 Dec 2020 13:25:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E5F168A9E8; Thu, 10 Dec 2020 13:19:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C7EBE68A13F for ; Thu, 10 Dec 2020 13:19:24 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id r3so5080775wrt.2 for ; Thu, 10 Dec 2020 03:19:24 -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=z4B7XoHpfpYfrDlZFZHhTGgJ6FwCLa0QFwygJZ1s+Bs=; b=o5WDB6Ar0y/LB5QfBsvDjJhp6//MY0JCZq/QCeM6VB/EBYz6TYGJ/IC9C6+3u56WYF EpFJBnhmCs9iHplmNP9pPDhxJe4k6v6XIiIWwok0anrcrBdg0AT4Zg/4nmiVdrJ2kVbY smdNZfM19WNnp2WPU2eWpPBEQM1+8nSs2zVnYKzoW7520SnYMtNiJiGedjKFwB0LoKBG SFSH8cBSrNVyEFdIZFEx5y5Qcwkxc+29DA7ua4MnKLm1R7LSgcRJeNAoZPTJwujCIvc+ E+ixfw/abjJxDuurjVRFUUpRP013hajRNVyFpkwcqStOTwfVF29LzHsw3HMMRUrn4i0W 8REw== 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=z4B7XoHpfpYfrDlZFZHhTGgJ6FwCLa0QFwygJZ1s+Bs=; b=opl5QqzB2EFYj6y4J2AGQdnLXI0QCTTjD+jyULkg5dujdND+F+6XHGaLNOhElPaMLE RDDSDO0WXXfP0Aen62qFrh7v1xRlIvO26yR9bP0amZgfHE+Q+e/xC4V7wQyqfKenNTmE 0MKRZgGLKtvUI3Oz3dHb2OTE3kFIhyxNjMQ3rLJ74VaZAaW060U4chylGS/AjHKCTQdu zzxeyT5eCZfb0Nq3/C1h2Ceb/dBGjkpBTjfHNWbdhr7aXy4kbvFCm0F/DoGIrrThnDyM 6xY8nVdPNgwJv6Uf9NlRP0g8tdihFK3g1JBDlQ5t+rQvDH+uQ5+C0amWmkR1bPgoQymU hjrQ== X-Gm-Message-State: AOAM532LOJUV3hDwu+v1Kp9qlFKV/onBy6AzxxvLniMpSogefF8le3oj a2heinfxiJNDt+TtxoKaSELkBh4wTcaSQA== X-Google-Smtp-Source: ABdhPJynyi4AtSdzVpJzmH5Zawt1lCMQDbsEtAPLncVNpTyOg1AH/adk4KkMYuVzrId/GfZrTytV8Q== X-Received: by 2002:a5d:510d:: with SMTP id s13mr7785107wrt.380.1607599163977; Thu, 10 Dec 2020 03:19:23 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id s133sm8942330wmf.38.2020.12.10.03.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Dec 2020 03:19:23 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Dec 2020 12:16:55 +0100 Message-Id: <20201210111657.2276739-38-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201210111657.2276739-1-andreas.rheinhardt@gmail.com> References: <20201210111657.2276739-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 37/39] avcodec/speedhq, speedhqenc: Make codecs 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" The SpeedHQ decoder uses and initializes a RLTable's VLC, yet it also initializes other parts of the RLTable that it does not use. This has downsides besides being wasteful: Because the SpeedHQ encoder also initializes these additional fields, there is a potential for data races (and therefore undefined behaviour). In fact, removing the superfluous initializations from the decoder automatically makes both the decoder and the encoder init-threadsafe. This commit does so. Signed-off-by: Andreas Rheinhardt --- libavcodec/speedhq.c | 4 +--- libavcodec/speedhqenc.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c index 0c08894315..0312ed6f0b 100644 --- a/libavcodec/speedhq.c +++ b/libavcodec/speedhq.c @@ -152,8 +152,6 @@ static const uint8_t unscaled_quant_matrix[64] = { 27, 29, 35, 38, 46, 56, 69, 83 }; -static uint8_t speedhq_static_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3]; - static VLC dc_lum_vlc_le; static VLC dc_chroma_vlc_le; static VLC dc_alpha_run_vlc_le; @@ -570,7 +568,6 @@ static av_cold void speedhq_static_init(void) ff_mpeg12_vlc_dc_chroma_code, 2, 2, INIT_VLC_OUTPUT_LE, 514); - ff_rl_init(&ff_rl_speedhq, speedhq_static_rl_table_store); INIT_2D_VLC_RL(ff_rl_speedhq, 674, INIT_VLC_LE); compute_alpha_vlcs(); @@ -655,4 +652,5 @@ AVCodec ff_speedhq_decoder = { .init = speedhq_decode_init, .decode = speedhq_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/speedhqenc.c b/libavcodec/speedhqenc.c index a5bedd5301..dbc638cb82 100644 --- a/libavcodec/speedhqenc.c +++ b/libavcodec/speedhqenc.c @@ -298,7 +298,7 @@ AVCodec ff_speedhq_encoder = { .init = ff_mpv_encode_init, .encode2 = ff_mpv_encode_picture, .close = ff_mpv_encode_end, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE