From patchwork Fri Nov 20 07:19:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23952 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:c00a:0:0:0:0:0 with SMTP id c10csp952943ybf; Thu, 19 Nov 2020 23:32:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJx2cm9VV0upNdhDOj/QbTxVjRMGG+GXvRjFoRy+/pyP7Yoph6i0QIVT9zL7Je3runZENl4T X-Received: by 2002:a7b:cf26:: with SMTP id m6mr8857732wmg.121.1605857560346; Thu, 19 Nov 2020 23:32:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605857560; cv=none; d=google.com; s=arc-20160816; b=OwYBX+QO4tEU5qbBe7T/gTAzaMD7tkPycXlaLK4xTRb2sJtU5xQgDe9FhrSCHSm2/g wyvovM9jI85z61Fj4nivfeTSyRxKEMZKyMAA5Emg+7qubX8EbPrDtPAAEWZvrqfaaZEc TltxvIUQXuCjVd+Gpcwgck9nxBL1dN8i2hZevdrP/ItwKZ7a/QSYqp7yE030Un9zU3ld 66p7O9WPPwy/p9X5E6S8U8x6W4fIx5PHgnsk9gNu8xKt8luByk6TlIb5gwdYVTwWsbDF Pdt1c5Ql4xt0ViB9F6KDWQXKh9JiLHV3cu45oZjIh/n84Q3yQdjw3eh0lTOVHmN3wEUC Is+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=YdNFJwfGgTduXpg0F8BYTX/BvyS15mjevyu5+AJ/few=; b=os7sIT251B06WCK6532jAeLbreE7mS51yKNOUSPe+Iejz8ou+Tg5HsYwCZC1Hr5oNP AAoK/ZXn08KO7o8ILplDZaEnHLs+GLFKr4QxUTCIO4ytz9lSOQwYwshxLRTv4iai7l0p djYxWv/DuhtCDBnCn92b6VnNRGChcwg9m04CmE0V7LX5WolvhGQuIlg9CAmDayOQTxBI T+pAi8LtW1uWAmCGRYnsTwWjFXtHZ6hVI/MWFEgYIUp+gEg1rbj258DBL7vY7t0hgpWZ cWJ0lkpa6MuU2Iob8p7r4sFqmNl0fB3Azg6T7bLx6zp9CdTJp+W4Wl/sphuRKkjwucjf 94WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=MquHuiIy; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s8si2149913wmc.213.2020.11.19.23.32.40; Thu, 19 Nov 2020 23:32:40 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=MquHuiIy; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 450BC68BB17; Fri, 20 Nov 2020 09:25:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B68D68BA96 for ; Fri, 20 Nov 2020 09:24:55 +0200 (EET) Received: by mail-ej1-f67.google.com with SMTP id 7so11519479ejm.0 for ; Thu, 19 Nov 2020 23:24:55 -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=KAu7ZH95vEHq3HJduB9zKBPyiJykdWsMBpt7LGL8qII=; b=MquHuiIyWJ3tgMn1vwvDNkoUbyFvpYO5hCTHhYIycKte0Qzfgj4rUyRuRcCM+hodEq GNguDoV9ez4F0aAz8aCV1lqAZgu3GkQQrA/EW3SDvmd9e2OIiYyUxQMq60D4549eF4vj hpaFhVOQP4jvR8fdqym40vWfeV3z4rRtZHV0o/mYBj9Gk1XLAzWgpa7q4E43yFW1DteF 9CeEbBzASaSxX+7YDCUkviA/NbP6nF6JjDiKEzO+idhBA4b/qXgV51OJQzas9pxRTMhq viv3G3RhkY3uW5qZYZt8eYPPOqQqegCTkRvsq37rUG+v1zgVTIcK8ciGU3wcPz4PtTqu 2uNQ== 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=KAu7ZH95vEHq3HJduB9zKBPyiJykdWsMBpt7LGL8qII=; b=aEfzzr452OtKYUGEbMN+oYXjm3mDZD8+CHUVUgVW9vPkp+QPyoX6H5mazVCSbK0edZ 4g4uxNDGlRqkOsMe12Sf4Wv4JZ3urmjpMXkDw7n8yuZTMJmQumQU0ts87TCB5I9ZtgKg pSvMIR7eVWQaOnBdA6JCwWe23IyeC6OProLLNsoWF6btu3lFOPq92ZA/gDp4hmWoz8xz z7uvBBirK+J9p5xAvk6qJ3Bstm+R7iN5rIVxu4jN3WyGLlyKs4cxp0y2oHv1wQoVho5O +OhlLFrDR6ARgiyevbthGlrXIFP8GB6hSSDD1gChggrvlnbJ73NkGBbWwKCV2X9Eb0KP X+dg== X-Gm-Message-State: AOAM533++bIMUa5jWVwAIE0FfRQ6EIsIvMdPceyi8WELfX9yVmdfDlf8 nfhn36eUlAAqZAp4ZKwATGe3LgWtpnxnPg== X-Received: by 2002:a17:906:b0c5:: with SMTP id bk5mr14493577ejb.217.1605857094586; Thu, 19 Nov 2020 23:24:54 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:24:54 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:19:17 +0100 Message-Id: <20201120072116.818090-45-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 044/162] 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" X-TUID: wofgvZroBseE Content-Length: 4746 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..22deb9d1bd 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, avctx); if (ret < 0) goto end; }