From patchwork Mon Aug 31 21:09:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22036 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 05C2F44B3A0 for ; Tue, 1 Sep 2020 00:10:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E3C5A68AE45; Tue, 1 Sep 2020 00:10:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2ED5F68AD4C for ; Tue, 1 Sep 2020 00:10:09 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id o5so3407373wrn.13 for ; Mon, 31 Aug 2020 14:10:08 -0700 (PDT) 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=1cGAbG+JjXZSFjXFjji+jHBJONkzBL+F3oBrKTzYYq8=; b=GhUdJUaqySiv/mj1aBdMuRXDjdMbmHlNI30zlrlX58RdLyo4Hw8PfnxxqF8eYogoSI BGD52Sj/QujlaIIesOVfB20cZn4mCHK/VOTi9cLAvAvM0mVmrpvlz4yzz47NTVBtmltt Eftpm3vJMkbtx/811dB5ag4h2mbm2rLv86K/JUgG6YUevjxULmGcJo+WJTNH/7AAogvg leyKlefSorrn0AW3ielCHRj+3kXtctKSorHAHJVJmwj4rSwmqlDeeFMq5ob1s4nf+S4y F9IGuNDWhQ6BM3oRbgjgHzl1PALOYpdIHeBtv4qskPJS2QWsjfDTR/GLOoI54zZCP9cH vD4w== 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=1cGAbG+JjXZSFjXFjji+jHBJONkzBL+F3oBrKTzYYq8=; b=PoqfjgfmF0Df3djVAJFKUG5wtJNv7NZnQ6hST1gtSBSlr7bLiysXBWu/vQh3qfjh7g Y2Qo5ciYDiNCJ40ZplIOg6DT7mt0VupI2oFXT6yHT6g08zhoAN/88YlIH4/Nqaq5gn50 s8FPWzDKTOvE/ZRhzl55bjp/y/8FDSNPzBFoMBKeePe0N/SRRaEjf9x9lOLWUdhFUnak G4Re/29A9EhNvlzo5Ye5FQA3e+wMrgx8x3qO6wWO3cQxkXYHZVPLsNatEVs/3rQxzaw+ jAJC9QE4jm0SPLctKIxEFLOJmq2blXBgbaWLdVuYsetlpTGCHwaV4ZQgUbaRXIeLlx4g Qjzg== X-Gm-Message-State: AOAM530ihI0+JGFY2xqwJMEC/Is0spEjvPpSQPCsxGJ6LbwVJS/Fs9Jf w7GuRZeUF2DVRB2MS7w8L2Rb7x6oNao= X-Google-Smtp-Source: ABdhPJzVgUfcZE0h6eyBY9mhEEY1aPh8rVqPWW2Tl+s/rpOIuZvgODLnNQ6S+rT/03q4eatNUkhvEA== X-Received: by 2002:adf:9ed4:: with SMTP id b20mr3283301wrf.206.1598908207591; Mon, 31 Aug 2020 14:10:07 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id s124sm1035798wme.29.2020.08.31.14.10.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2020 14:10:07 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 Aug 2020 23:09:30 +0200 Message-Id: <20200831210930.18900-8-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200831210930.18900-1-andreas.rheinhardt@gmail.com> References: <20200831210930.18900-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 8/8] avcodec/magicyuv: Avoid intermediate array when parsing Huffman tables 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/magicyuv.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/libavcodec/magicyuv.c b/libavcodec/magicyuv.c index d2656427b9..eed5ad1b40 100644 --- a/libavcodec/magicyuv.c +++ b/libavcodec/magicyuv.c @@ -68,7 +68,6 @@ typedef struct MagicYUVContext { int vshift[4]; Slice *slices[4]; // slice bitstream positions for each plane unsigned int slices_size[4]; // slice sizes for each plane - uint8_t len[4096]; // scratch table of code lengths VLC vlc[4]; // VLC for each plane int (*magy_decode_slice)(AVCodecContext *avctx, void *tdata, int j, int threadnr); @@ -81,18 +80,11 @@ static int huff_cmp_len(const void *a, const void *b) return (aa->len - bb->len) * 4096 + bb->sym - aa->sym; } -static int huff_build(VLC *vlc, uint8_t *len, int nb_elems) +static int huff_build(HuffEntry he[], VLC *vlc, int nb_elems) { - HuffEntry he[4096]; uint32_t code; int i; - for (i = 0; i < nb_elems; i++) { - he[i].sym = i; - he[i].len = len[i]; - if (len[i] == 0 || len[i] > 32) - return AVERROR_INVALIDDATA; - } AV_QSORT(he, nb_elems, HuffEntry, huff_cmp_len); code = 1; @@ -396,6 +388,7 @@ static int magy_decode_slice(AVCodecContext *avctx, void *tdata, static int build_huffman(AVCodecContext *avctx, GetBitContext *gbit, int max) { MagicYUVContext *s = avctx->priv_data; + HuffEntry he[4096]; int i = 0, j = 0, k; while (get_bits_left(gbit) >= 8) { @@ -404,17 +397,19 @@ static int build_huffman(AVCodecContext *avctx, GetBitContext *gbit, int max) int l = get_bitsz(gbit, b * 8) + 1; k = j + l; - if (k > max) { + if (k > max || x == 0 || x > 32) { av_log(avctx, AV_LOG_ERROR, "Invalid Huffman codes\n"); return AVERROR_INVALIDDATA; } - for (; j < k; j++) - s->len[j] = x; + for (; j < k; j++) { + he[j].sym = j; + he[j].len = x; + } if (j == max) { j = 0; - if (huff_build(&s->vlc[i], s->len, max)) { + if (huff_build(he, &s->vlc[i], max)) { av_log(avctx, AV_LOG_ERROR, "Cannot build Huffman codes\n"); return AVERROR_INVALIDDATA; }