From patchwork Sat Oct 24 11:04:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23193 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 62DF7442607 for ; Sat, 24 Oct 2020 14:05:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B40168A9BB; Sat, 24 Oct 2020 14:05:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6575E68A7F2 for ; Sat, 24 Oct 2020 14:05:32 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id k21so2713294wmi.1 for ; Sat, 24 Oct 2020 04:05:32 -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=5/jZSkI+kFZn/4ZsPVRHTPF5IdimyU+NTDInjfJjtEc=; b=TAfbcpOBwoxnrNeFqv7NuRIM/ai7/UgmHZCvEge4xeit0c225KT5Ip7X1DQ1rzR5HT o8YcKKXnvfi2fglM6i6ic5hJ31XahICIZaKnQj+TmTOguahLDiMOjnqM9QIYnlGb52I0 l4aTrL0JEtBh1A4piyjs/woOytBO6OV0PSJjdZ8d2cQ9EUTnhjHFKSLnIMjbPsP4VtlU 7pgbeng+hKBnzuOt4oHlKx5ItMSjtaXE/GCMnzl/3c0ji0Rr+MdZ/is+OJ/NvErUQICE VqIoLnEZQPH/D5ZIHLiQKLLc2+FhBuC6vpPyCnol6Kw9YNwmSnLZ0turye8KFbDXK2lK GZzg== 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=5/jZSkI+kFZn/4ZsPVRHTPF5IdimyU+NTDInjfJjtEc=; b=EqMwBdu7SLgHyJH3qHgYp9BN9bwOg3uU2V+O6HJyC75FJqhTNqV0vWc+e3n5CYGI7F Bp2O2mT30/wPy7/jHfoAMbY8wmzoLlHnnY97r/DL0KfHAtfppqN9EmnwaQ23YWkAUNHX 5r45XqvaIv1jiN1VZmCc94iGLdn3jV9xsWqUNbQJJLztMR9DhhZo6O0kHlEooN98XUPt +oPqY6aOZpIt93xRTgvr4k7Ky5YuSdmfD3LtKWq2puNk3f7PSCJ2v++f3vYSaPHvBsyl CO0Sobj62NBfovrYbhNYoH5QTpae3cFXZc0XMv+mXLjbO8fnUId0RF+zDzpVeW/hEU+m itSw== X-Gm-Message-State: AOAM533PrESZZ0IoQusvt3ynUPzjot4387T4nrwGArHPR9JEFyQ7APwK oiBI5virB42Rbiyo7glV0D2mdkyIftc= X-Google-Smtp-Source: ABdhPJx5qCBPJ6x7ICVVXf3xoDI949MJQ/HGMecrPYWBGdYAU4P74BgRYO7ClzS9FdJYmS2SwIB27w== X-Received: by 2002:a7b:cf04:: with SMTP id l4mr7041079wmg.137.1603537531608; Sat, 24 Oct 2020 04:05:31 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id m1sm8476890wme.48.2020.10.24.04.05.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 04:05:31 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Oct 2020 13:04:58 +0200 Message-Id: <20201024110500.5424-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201024110500.5424-1-andreas.rheinhardt@gmail.com> References: <20201024110500.5424-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/mobiclip: Don't use too big max_depth, inline constants 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/mobiclip.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/mobiclip.c b/libavcodec/mobiclip.c index d209a53b07..ab4baac099 100644 --- a/libavcodec/mobiclip.c +++ b/libavcodec/mobiclip.c @@ -31,6 +31,7 @@ #include "golomb.h" #include "internal.h" +#define MOBI_RL_VLC_BITS 12 #define MOBI_MV_VLC_BITS 6 static const uint8_t zigzag4x4_tab[] = @@ -340,14 +341,14 @@ static av_cold int mobiclip_init(AVCodecContext *avctx) avctx->pix_fmt = AV_PIX_FMT_YUV420P; - ret = ff_init_vlc_sparse(&s->vlc[0], 12, 104, + ret = ff_init_vlc_sparse(&s->vlc[0], MOBI_RL_VLC_BITS, 104, bits0, sizeof(*bits0), sizeof(*bits0), codes0, sizeof(*codes0), sizeof(*codes0), syms0, sizeof(*syms0), sizeof(*syms0), 0); if (ret < 0) return ret; - ret = ff_init_vlc_sparse(&s->vlc[1], 12, 104, + ret = ff_init_vlc_sparse(&s->vlc[1], MOBI_RL_VLC_BITS, 104, bits0, sizeof(*bits0), sizeof(*bits0), codes0, sizeof(*codes0), sizeof(*codes0), syms1, sizeof(*syms1), sizeof(*syms1), 0); @@ -465,7 +466,7 @@ static void read_run_encoding(AVCodecContext *avctx, MobiClipContext *s = avctx->priv_data; GetBitContext *gb = &s->gb; int n = get_vlc2(gb, s->vlc[s->dct_tab_idx].table, - s->vlc[s->dct_tab_idx].bits, 2); + MOBI_RL_VLC_BITS, 1); *last = (n >> 11) == 1; *run = (n >> 5) & 0x3F;