From patchwork Sat Oct 10 04:57:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22827 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 4DFB44494F4 for ; Sat, 10 Oct 2020 07:57:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2953A68BA32; Sat, 10 Oct 2020 07:57:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D915F68BA07 for ; Sat, 10 Oct 2020 07:57:13 +0300 (EEST) Received: by mail-ej1-f66.google.com with SMTP id x7so5873922eje.8 for ; Fri, 09 Oct 2020 21:57:13 -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:mime-version :content-transfer-encoding; bh=9PFpIw7mbjSNzLKIDTey9E9HCcLjDQooGX8QKzviKGo=; b=iXJzRY369hT0F1v+EGVp0RB7TrxSxH+Lzc+61U/k0iqEW/Kq+h9s4GXbdVD079gv/r C0/QTqOu49lLBuuOgbZMNqqh/AOJoNJRTYh7JuHzOuRDkEhzFC+q9w3uxyQSWOzAXsro YTDotaps7YT+FSHycfh/R+L6XZXj7NyHyuU8r8Aeh5zrRPBKD/AP8pU6Rhyx0okI/u9q Xu4XsQGGDbG7fl22ZIFpVu4lse1fD3cX3sPhFXIs5hoxGDJ7yWk+M2BFxPcX7Vd4+Kj5 uWUktW8SMTerWRPCoTZBGceQvwV0px7PsnsKYsY0eNq6dJMGyoZ4yejMIHfI6JH4aoKs SgjA== 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:mime-version :content-transfer-encoding; bh=9PFpIw7mbjSNzLKIDTey9E9HCcLjDQooGX8QKzviKGo=; b=jQn+PZIbWtk73WTy3y69tbT/KVrJAWQvkZYm/OJulqTVDSpI7V+R+phpwiXSq1HDV9 GvKKaInvenC/Xe/H7DqXbhUd09hIjzggbxNOTdtDckunXYZGU9/l2Ttz6dgB+hI59inT T22XYQkpedI7OuRmIt5awWt7BqUeUSmwLOQkoBFgQKCeLllaOs1Lpwd1bEaKr6KfWS1N BdE+vVG8Lqn9WBHYhxsbW4+Jyo2xTXSXk7+qqP5zKx+vGmVdkr2S2ZtY2QOo3nF+VPFF jW1JuO7E1Omb14y78y1e8IbD+jFDjCOEAfymYed6pe1ucUSG7sEa8Wd7KmkkGtOXhCxw wXzw== X-Gm-Message-State: AOAM530idrzIqw3WlHVt0KEa4catfaIEb2Y6nCLsqDadJLMOSjgvMHZY ncMAoftYCwf4lLDC5cwEDYeT9QbUDsY= X-Google-Smtp-Source: ABdhPJxG1MR1t1qDSfsJAKPiC+Cmilc7DeuVeEJYtg5k7jT61IVsSbDoJdek3XoaNj1BrwXFXhHvtg== X-Received: by 2002:a17:906:e116:: with SMTP id gj22mr18488708ejb.313.1602305832938; Fri, 09 Oct 2020 21:57:12 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id t7sm1121339edj.45.2020.10.09.21.57.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 21:57:12 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Oct 2020 06:57:03 +0200 Message-Id: <20201010045704.759353-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/sheervideo: Improve creating VLC 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" Don't needlessly copy an array around; don't create a table with default symbols; and use smaller types to save stack space: The longest code here is 16 bits, so one can store the codes in this type. Signed-off-by: Andreas Rheinhardt --- libavcodec/sheervideo.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/libavcodec/sheervideo.c b/libavcodec/sheervideo.c index ba9aecbb11..3f9b299a1e 100644 --- a/libavcodec/sheervideo.c +++ b/libavcodec/sheervideo.c @@ -1782,25 +1782,20 @@ static void decode_rgb(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) static int build_vlc(VLC *vlc, const uint8_t *len, int count) { - uint32_t codes[1024]; - uint8_t bits[1024]; - uint16_t syms[1024]; - uint64_t index; + uint16_t codes[1024]; + unsigned index; int i; index = 0; for (i = 0; i < count; i++) { - codes[i] = index >> (32 - len[i]); - bits[i] = len[i]; - syms[i] = i; - index += 1ULL << (32 - len[i]); + codes[i] = index >> (32 - len[i]); + index += 1U << (32 - len[i]); } ff_free_vlc(vlc); - return ff_init_vlc_sparse(vlc, 12, count, - bits, sizeof(*bits), sizeof(*bits), - codes, sizeof(*codes), sizeof(*codes), - syms, sizeof(*syms), sizeof(*syms), 0); + return init_vlc(vlc, 12, count, + len, sizeof(*len), sizeof(*len), + codes, sizeof(*codes), sizeof(*codes), 0); } static int decode_frame(AVCodecContext *avctx,