From patchwork Fri Nov 20 07:19:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23780 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 CFD2844AB58 for ; Fri, 20 Nov 2020 09:29:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E1FE368BB9D; Fri, 20 Nov 2020 09:25:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2454E68BA16 for ; Fri, 20 Nov 2020 09:25:34 +0200 (EET) Received: by mail-ej1-f68.google.com with SMTP id f20so11493560ejz.4 for ; Thu, 19 Nov 2020 23:25:34 -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=T46IY1Wd56GNaqP2zS5a0DIRg7qj1qTNaLJchIPAHAo=; b=tRYgS/IK7x4tLjDiuYW+dbRiTpt2X5BEOWPggpwFQre3U/dBhWTZp4Q9uOCMOZUpSW vc0PXWXqG2NC10wKtoM06HuCel/V9y3s1a1Z1/qklTASAnh/JA9DatH3FUsgOBKgmml0 TbGOmjZ1E+mSahVGu2R8+m1nCz5DTBev1l8abDXcvvYNy1nnlB05jKs7rAuOsqAeVqEI 13FVNGCDAu/UopP7/0g5aSffNMaPZ97t8uNn1rgzSOwsZBMIUkGG2bR23KLKLedeStPP 809HB1y+m+CbZ5yyT6JD4SYvWdov5Uh8x23jwL4c7BvQb6vEza01tPSnhRbccbvMSzmg mQtA== 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=T46IY1Wd56GNaqP2zS5a0DIRg7qj1qTNaLJchIPAHAo=; b=NVpDV4zQPduRYGbDPss3nKNYCs4NSvu+tmzo0uJw4eWXCqqNydSKmJygXZo+uB4ZrC Z5Va+SDiMvvTCsGJ2x51Qh5E9wP3jN6vkWYGnRJx1lPqAaGrglSiaViCs7Buo0uzwfW6 Cos7KVZxdaD/niph13CJ7zvLbnYBIyqp1CMFokXOzPfgD0ShAduKfP0ieGS5bseOcDrE 1l1xce3Wx2KE2FtTR1xJtwXHNCkLWt+HYfTTb3cDnElja5SJquiHSONryW1//Ct4/yKJ mZMrvapBL1pBNkQK5Ytu6U9j7Qu4OXSkpDVol+8e1myHqFbt9tqL4W8tADl5VUGSvggS aYQg== X-Gm-Message-State: AOAM532nOG0NhNvdntj62FLJhPEwH8w6HJ04GKINzD9+I38SOkETnk2A ccJwqB/JQNjvFKiNrmB20VwHwgTbh5miyg== X-Google-Smtp-Source: ABdhPJy/7jqF0cGkZPbVWUz4OoHAwbqgOAtYdRqFlh43F/AYV2PxD2EGUIn/YA7pJ+znGIa8lWW8jg== X-Received: by 2002:a17:906:c084:: with SMTP id f4mr17662387ejz.4.1605857133359; Thu, 19 Nov 2020 23:25:33 -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.25.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:25:32 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:19:56 +0100 Message-Id: <20201120072116.818090-84-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 083/162] avcodec/mjpegdec: Simplify creating VLC table 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" ff_init_vlc_from_lengths() can be used to offload the computation of the codes; it also allows to omit the check whether the codes are already properly ordered (they are). Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegdec.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 147dd819e5..e101e582da 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -50,33 +50,28 @@ #include "bytestream.h" -static void build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code, - const uint8_t *bits_table) +static void build_huffman_codes(uint8_t *huff_size, const uint8_t *bits_table) { - for (int i = 1, code = 0, k = 0; i <= 16; i++) { + for (int i = 1, k = 0; i <= 16; i++) { int nb = bits_table[i]; for (int j = 0; j < nb;j++) { huff_size[k] = i; - huff_code[k] = code; - code++; k++; } - code <<= 1; } } static int build_vlc(VLC *vlc, const uint8_t *bits_table, const uint8_t *val_table, int nb_codes, - int is_ac) + int is_ac, void *logctx) { uint8_t huff_size[256]; - uint16_t huff_code[256]; uint16_t huff_sym[256]; int i; av_assert0(nb_codes <= 256); - build_huffman_codes(huff_size, huff_code, bits_table); + build_huffman_codes(huff_size, bits_table); for (i = 0; i < nb_codes; i++) { huff_sym[i] = val_table[i] + 16 * is_ac; @@ -85,8 +80,8 @@ static int build_vlc(VLC *vlc, const uint8_t *bits_table, huff_sym[i] = 16 * 256; } - return ff_init_vlc_sparse(vlc, 9, nb_codes, huff_size, 1, 1, - huff_code, 2, 2, huff_sym, 2, 2, 0); + return ff_init_vlc_from_lengths(vlc, 9, nb_codes, huff_size, 1, + huff_sym, 2, 2, 0, 0, logctx); } static int init_default_huffman_tables(MJpegDecodeContext *s) @@ -116,7 +111,7 @@ static int init_default_huffman_tables(MJpegDecodeContext *s) for (i = 0; i < FF_ARRAY_ELEMS(ht); i++) { ret = build_vlc(&s->vlcs[ht[i].class][ht[i].index], ht[i].bits, ht[i].values, ht[i].length, - ht[i].class == 1); + ht[i].class == 1, s->avctx); if (ret < 0) return ret; @@ -296,13 +291,13 @@ int ff_mjpeg_decode_dht(MJpegDecodeContext *s) av_log(s->avctx, AV_LOG_DEBUG, "class=%d index=%d nb_codes=%d\n", class, index, n); if ((ret = build_vlc(&s->vlcs[class][index], bits_table, val_table, - n, class > 0)) < 0) + n, class > 0, s->avctx)) < 0) return ret; if (class > 0) { ff_free_vlc(&s->vlcs[2][index]); if ((ret = build_vlc(&s->vlcs[2][index], bits_table, val_table, - n, 0)) < 0) + n, 0, s->avctx)) < 0) return ret; }