From patchwork Sat Aug 1 13:47:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21436 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 996EC44AA8D for ; Sat, 1 Aug 2020 16:49:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 88AFF68BAE1; Sat, 1 Aug 2020 16:49:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C77BF68BA97 for ; Sat, 1 Aug 2020 16:49:37 +0300 (EEST) Received: by mail-ed1-f67.google.com with SMTP id v22so13435971edy.0 for ; Sat, 01 Aug 2020 06:49:37 -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=WH+ViCCeNj/5zkdwVrJjTwPuephVaMdfhGad3Bga/hY=; b=YfHEiemsQvzPZcRuou/P1EDKl2GAOVzOvjjohUzer+LA5B4U6sBlg4wP7ZfaXLuyMH m3Fj2N0qJQsrKEVjHj5A7+a0e8RuGVrN5wXYzGu9MPBeEI/3oUjpGrWC8/plRs+LuPAs 49tSHLRTrHeJGC277FcUXNvjKja4CawCBMp5w10LhNUQ26Ql8YeqYIZ0kg1x76K0+Azs L2EQWrHSbgbvbKypUj7MAnM7MwQX6MEh5rbjVJw/amSi/fsWwVnh0Tpk4USYMGMMdyvx 0M7Y2knFSEtyjTR2jyF+XeEkZDsoIyO4BIE/RYbUDngKAv9UM5jEt+Nz0LCac6xHTJbe 54pA== 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=WH+ViCCeNj/5zkdwVrJjTwPuephVaMdfhGad3Bga/hY=; b=Eti13vI1ifa9z5k1iz4EUCZMOZhyvF8E2qYKUcP88ayYZ/ox7V/wPWNAztfOpy1lku 9HH8UDwb3NBCv6lk2P1vfQqbbrP5T26JxicXdFYkOFxQLcxoQF8sKfpAmA9r20mYi/vX D/eZ+5OKidfSZRIGFucVLLYb9Qak/gd+CS8vuLEWp/nNRoYBmmFmWBLvIdPCzrW1GjwS C0FFJhzs75GEavopBjUVwZNzgrSc9ETw1Ap7mkD59ENcnN7o6OQCVQpdCgTUx+6XUNdT XxV3AQfybCdjiHm7ze4WUXuH8tADC8Qk6vZAIW2Dz6V+hx97WdBk+Ot516JjimBVghGK DI6g== X-Gm-Message-State: AOAM532mPAjBumC3l8rrkasi88QOgLZpC0xlVEr4CgYqwDipGdevSkOd Ymk7qOLjPjoSdkqp3IiiqY/rYPdh X-Google-Smtp-Source: ABdhPJwGGcRlNXSaVdbiMEy/y0lcEsjK8MFKeULs6EP0AaXeVeBbO1yOjYEDoZ8zb+0Yq/zBXxcqCQ== X-Received: by 2002:aa7:cf1a:: with SMTP id a26mr8280638edy.51.1596289776977; Sat, 01 Aug 2020 06:49:36 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id b24sm12178501edn.33.2020.08.01.06.49.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Aug 2020 06:49:36 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Aug 2020 15:47:00 +0200 Message-Id: <20200801134704.3647-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200731112241.8948-1-andreas.rheinhardt@gmail.com> References: <20200731112241.8948-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 17/21] avcodec/smacker: Use smaller types 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" This will mean that we will need less stack space lateron when these arrays are no longer heap-allocated. No discernible speed impact. Signed-off-by: Andreas Rheinhardt --- libavcodec/smacker.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index f5193e1278..c1928e3908 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -69,8 +69,8 @@ typedef struct HuffContext { int length; int current; uint32_t *bits; - int *lengths; - int *values; + uint8_t *lengths; + uint8_t *values; } HuffContext; /* common parameters used for decode_bigtree */ @@ -78,7 +78,7 @@ typedef struct DBCtx { int current, length; int *values; VLC *v1, *v2; - int *recode1, *recode2; + const uint8_t *recode1, *recode2; int escapes[3]; int *last; } DBCtx; @@ -671,7 +671,7 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, skip_bits1(&gb); if(h[i].current > 1) { ret = init_vlc(&vlc[i], SMKTREE_BITS, h[i].current, - h[i].lengths, sizeof(int), sizeof(int), + INIT_VLC_DEFAULT_SIZES(h[i].lengths), h[i].bits, sizeof(uint32_t), sizeof(uint32_t), INIT_VLC_LE); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Cannot build VLC table\n");