From patchwork Tue Nov 10 10:47:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23489 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 AEBC444B3FF for ; Tue, 10 Nov 2020 12:54:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BC65868BE43; Tue, 10 Nov 2020 12:50:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCE4E68BE4D for ; Tue, 10 Nov 2020 12:49:57 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id h2so2542321wmm.0 for ; Tue, 10 Nov 2020 02:49:57 -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=lLGVpimPvZkAsuRQ7vOmWkfX/W5w878L0aCHoQ7Dr3s=; b=LTJJ1qLO8s2BvCVL0eowZEnpuDpZEi2ABBCRUNayzRK86XE9RGs7fI8f5K9hHL9q5n hLFg8RsHLhjqjykNtRvC/yfAQmVyxp46x5SlkqAw/rxuGniJE/WyPEvBMQGeTAzkBr+h /yITD2eBgWJ3qzUpc/PMPlo6A5lfeSLMZPgFikCEFT7hABtYY3FefLiZZN2a9Ra8amFp BeXTM9ac5qVLIYsHAcOOZZrlE8FiSwT+NaNjsiMvjOrjHpwti9tm+PQIfIYCinod3QeV otCApYuMfrmuLYqR+7J1dWy4HnUzotKTAI0MOtEslBYfhmi4YFQMBVZsrdhFlP7nRj1I 0tew== 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=lLGVpimPvZkAsuRQ7vOmWkfX/W5w878L0aCHoQ7Dr3s=; b=iJxUGCq64KwvxxAmGAydLrGr7qRsnNocFfpERwMV3SI9OflvT0ZYxLOV/XpRbcnQFd oEamEcewhRxVNHBtsoD3+f6eR5lzwWWWObzhjGAqCtKNMbEkj0B7es02Sx8K7hwJiPE+ 9M826x3Nfc3ClhEpXTcGGCZ7giEVInZB4/9qdMAHZi0Db/jBOxRvML6Fw3G1z7Mdw6HF jrmM8ZtPklKPsKTWLtexjtrxTUnrzlCuNTXlxoJrPObn2nXcMjB5vt7kJN0pBDDlWYiI pgIF7TNaY7LEis0F84/SGTKOCE1OZKkdayLiBWsKcHRwnL0PQur+bj1+gjYbRP1A3zmJ yU5w== X-Gm-Message-State: AOAM532nzqbzbfGl+7f0ttRLxy4oty8AXRDzc6mRl8iXxcPvXyM1dUaq cGMyfqRhMEhblkLc4k6LUSP+vF1Cpw8= X-Google-Smtp-Source: ABdhPJzkoV35KukuUBbN6zt7aJJ3kEuQAsLnSLhGlQgJjrF6NhmcvOJXMjNXYTJHVLStgv7s2IEUDA== X-Received: by 2002:a7b:cc13:: with SMTP id f19mr3972125wmh.44.1605005397020; Tue, 10 Nov 2020 02:49:57 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id l24sm2572543wmi.7.2020.11.10.02.49.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:49:56 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 11:47:34 +0100 Message-Id: <20201110104851.321029-38-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201110104851.321029-1-andreas.rheinhardt@gmail.com> References: <20201110104851.321029-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 037/114] avcodec/motionpixels: Simplify 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" By using ff_init_vlc_from_lengths(), we do not have to keep track of the codes themselves, but can offload this to ff_init_vlc_from_lengths(). Furthermore, the old code presumed sizeof(int) == 4; this is no longer so. Signed-off-by: Andreas Rheinhardt --- libavcodec/motionpixels.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c index 927f9fdc14..3bc31870d9 100644 --- a/libavcodec/motionpixels.c +++ b/libavcodec/motionpixels.c @@ -29,7 +29,6 @@ #include "motionpixels_tablegen.h" typedef struct HuffCode { - int code; uint8_t size; uint8_t delta; } HuffCode; @@ -121,7 +120,7 @@ static void mp_read_changes_map(MotionPixelsContext *mp, GetBitContext *gb, int } } -static int mp_get_code(MotionPixelsContext *mp, GetBitContext *gb, int size, int code) +static int mp_get_code(MotionPixelsContext *mp, GetBitContext *gb, int size) { while (get_bits1(gb)) { ++size; @@ -129,8 +128,7 @@ static int mp_get_code(MotionPixelsContext *mp, GetBitContext *gb, int size, int av_log(mp->avctx, AV_LOG_ERROR, "invalid code size %d/%d\n", size, mp->max_codes_bits); return AVERROR_INVALIDDATA; } - code <<= 1; - if (mp_get_code(mp, gb, size, code + 1) < 0) + if (mp_get_code(mp, gb, size) < 0) return AVERROR_INVALIDDATA; } if (mp->current_codes_count >= mp->codes_count) { @@ -138,7 +136,6 @@ static int mp_get_code(MotionPixelsContext *mp, GetBitContext *gb, int size, int return AVERROR_INVALIDDATA; } - mp->codes[mp->current_codes_count ].code = code; mp->codes[mp->current_codes_count++].size = size; return 0; } @@ -155,7 +152,7 @@ static int mp_read_codes_table(MotionPixelsContext *mp, GetBitContext *gb) for (i = 0; i < mp->codes_count; ++i) mp->codes[i].delta = get_bits(gb, 4); mp->current_codes_count = 0; - if ((ret = mp_get_code(mp, gb, 0, 0)) < 0) + if ((ret = mp_get_code(mp, gb, 0)) < 0) return ret; if (mp->current_codes_count < mp->codes_count) { av_log(mp->avctx, AV_LOG_ERROR, "too few codes\n"); @@ -321,10 +318,12 @@ static int mp_decode_frame(AVCodecContext *avctx, goto end; if (mp->codes_count > 1) { - ret = ff_init_vlc_sparse(&mp->vlc, mp->max_codes_bits, mp->codes_count, - &mp->codes[0].size, sizeof(HuffCode), 1, - &mp->codes[0].code, sizeof(HuffCode), 4, - &mp->codes[0].delta, sizeof(HuffCode), 1, 0); + /* The entries of the mp->codes array are sorted from right to left + * in the Huffman tree, hence -(int)sizeof(HuffCode). */ + ret = ff_init_vlc_from_lengths(&mp->vlc, mp->max_codes_bits, mp->codes_count, + &mp->codes[mp->codes_count - 1].size, -(int)sizeof(HuffCode), + &mp->codes[mp->codes_count - 1].delta, -(int)sizeof(HuffCode), 1, + 0, 0); if (ret < 0) goto end; }