From patchwork Fri Nov 20 07:18:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23769 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 C78BE449D14 for ; Fri, 20 Nov 2020 09:27:39 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6FE9D68BA04; Fri, 20 Nov 2020 09:24:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B966668B9DE for ; Fri, 20 Nov 2020 09:24:28 +0200 (EET) Received: by mail-ej1-f47.google.com with SMTP id i19so11470519ejx.9 for ; Thu, 19 Nov 2020 23:24:28 -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=kmwe43vB4tdxMiDpgFoE/yc1FNXm3XgCdK84avwXpZ8=; b=Lkjx2oxmlvxOr8bxNT+d3NjPPWdIZ76Q204DjuNL+H2BeMFLCbNmqqS4fzL0hx3iT6 f0QnMVlO4aN8r7Uslo1nbYeyxUJz3NQGYov2If8LpLlWW9fPcRy6hSw+zEuhurO8tL8F L9Jo6HZSkHRvWudvhm65LgLruFeO95PnaR+lX+n7Pbd4B6b/K5r0T68HLaZEd3Va05PN 1WhoD4s7GwRswEh4c93xnqW4S48em9uh8mgRRhZINdEUAk3+sphbgGEwU+MNRaASOa/A 7ZDF7L5aLKj/KLC6vJQqNtrVHWBqkVsNXpnY0OCaUAtEQSb2QmJOOnRLEbFclPpZrq4z wO2w== 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=kmwe43vB4tdxMiDpgFoE/yc1FNXm3XgCdK84avwXpZ8=; b=pJQU9RdyUqxqvr13i5KdjfNecx/tDaMPEkM4NTgAqj6cbjxe9BZTJiJdmKq085qQhL I/ksdP6qxmDpxxwOBC1Lu84wkGiCXE5+L27pV5Gfqbgmr3NJnjA+QKruY6FGNHQoxMpt Fag+T51DuGSXR39jyD2eFt3Lz2ufxLOZ7s+H2tmWZmbHhDRolPVYm9wg+p5ERk20mX64 crukCtYSeX5u04FyBWDh7HvQsXjMmQ1HTO0IFUnfpa8XY4xpRiyYDpbVo92te6YoVppL wX+MxqLsD9q2VzlHnMoljV2nUP9t5a6jg8rIiItl9wJaEJDcgHRu+noUbB+8uaWpeQRM mRSQ== X-Gm-Message-State: AOAM533M2mt0Q2eEhavChkAkQnhRj5G/z5Rq5PGB1CZlfVKrMERQ1hc8 bpK2Sxgd/vqI2tPoC5CzgkdTDAym759lOg== X-Google-Smtp-Source: ABdhPJwU/RoimjfYNlGFsfWxlgQ4pIT+DeznbwPFUJX2UMyzGNutyLA9l+TJOszEw87HLAS+t5ru0A== X-Received: by 2002:a17:906:1381:: with SMTP id f1mr31225522ejc.87.1605857067858; Thu, 19 Nov 2020 23:24:27 -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.24.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:24:26 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:18:52 +0100 Message-Id: <20201120072116.818090-20-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 019/162] avcodec/clearvideo: 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/clearvideo.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/libavcodec/clearvideo.c b/libavcodec/clearvideo.c index 3e666b98e9..0885b82837 100644 --- a/libavcodec/clearvideo.c +++ b/libavcodec/clearvideo.c @@ -32,6 +32,8 @@ #include "mathops.h" #include "clearvideodata.h" +#define CLV_VLC_BITS 9 + typedef struct LevelCodes { VLC flags_cb; VLC mv_cb; @@ -85,14 +87,14 @@ static inline int decode_block(CLVContext *ctx, int16_t *blk, int has_ac, int idx = 1, last = 0, val, skip; memset(blk, 0, sizeof(*blk) * 64); - blk[0] = get_vlc2(gb, ctx->dc_vlc.table, 9, 3); + blk[0] = get_vlc2(gb, ctx->dc_vlc.table, CLV_VLC_BITS, 3); blk[0] -= 63; if (!has_ac) return 0; while (idx < 64 && !last) { - val = get_vlc2(gb, ctx->ac_vlc.table, 9, 2); + val = get_vlc2(gb, ctx->ac_vlc.table, CLV_VLC_BITS, 2); if (val < 0) return AVERROR_INVALIDDATA; if (val != 0x1BFF) { @@ -363,11 +365,11 @@ static TileInfo* decode_tile_info(GetBitContext *gb, LevelCodes *lc, int level) MV mv = { 0 }; if (lc[level].flags_cb.table) { - flags = get_vlc2(gb, lc[level].flags_cb.table, lc[level].flags_cb.bits, 2); + flags = get_vlc2(gb, lc[level].flags_cb.table, CLV_VLC_BITS, 2); } if (lc[level].mv_cb.table) { - uint16_t mv_code = get_vlc2(gb, lc[level].mv_cb.table, lc[level].mv_cb.bits, 3); + uint16_t mv_code = get_vlc2(gb, lc[level].mv_cb.table, CLV_VLC_BITS, 3); if (mv_code != MV_ESC) { mv.x = (int8_t)(mv_code & 0xff); @@ -379,7 +381,7 @@ static TileInfo* decode_tile_info(GetBitContext *gb, LevelCodes *lc, int level) } if (lc[level].bias_cb.table) { - uint16_t bias_val = get_vlc2(gb, lc[level].bias_cb.table, lc[level].bias_cb.bits, 2); + uint16_t bias_val = get_vlc2(gb, lc[level].bias_cb.table, CLV_VLC_BITS, 2); if (bias_val != BIAS_ESC) { bias = (int16_t)(bias_val); @@ -658,7 +660,8 @@ static av_cold int build_vlc(VLC *vlc, const uint8_t counts[16], for (count += num; num < count; num++) lens[num] = i + 1; } - ret = ff_init_vlc_from_lengths(vlc, 9, num, lens, 1, *syms, 2, 2, 0, 0, NULL); + ret = ff_init_vlc_from_lengths(vlc, CLV_VLC_BITS, num, lens, 1, + *syms, 2, 2, 0, 0, NULL); if (ret < 0) return ret; *syms += num; @@ -709,14 +712,14 @@ static av_cold int clv_decode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); ff_idctdsp_init(&c->idsp, avctx); - ret = init_vlc(&c->dc_vlc, 9, NUM_DC_CODES, + ret = init_vlc(&c->dc_vlc, CLV_VLC_BITS, NUM_DC_CODES, clv_dc_bits, 1, 1, clv_dc_codes, 1, 1, 0); if (ret) { av_log(avctx, AV_LOG_ERROR, "Error initialising DC VLC\n"); return ret; } - ret = ff_init_vlc_from_lengths(&c->ac_vlc, 9, NUM_AC_CODES, + ret = ff_init_vlc_from_lengths(&c->ac_vlc, CLV_VLC_BITS, NUM_AC_CODES, clv_ac_bits, 1, clv_ac_syms, 2, 2, 0, 0, avctx); if (ret) { @@ -734,7 +737,7 @@ static av_cold int clv_decode_init(AVCodecContext *avctx) if (i == FF_ARRAY_ELEMS(c->lev) - 1) break; if (0x1B7 & (1 << i)) { - ret = ff_init_vlc_from_lengths(&c->lev[i].flags_cb, 9, 16, + ret = ff_init_vlc_from_lengths(&c->lev[i].flags_cb, CLV_VLC_BITS, 16, clv_flags_bits[j], 1, clv_flags_syms[j], 1, 1, 0, 0, avctx); if (ret < 0)