From patchwork Fri Nov 20 07:33:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23900 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 7E79F449F1B for ; Fri, 20 Nov 2020 09:53:37 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 13D3068BD65; Fri, 20 Nov 2020 09:35:07 +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 13AF068BD4C for ; Fri, 20 Nov 2020 09:34:54 +0200 (EET) Received: by mail-ej1-f67.google.com with SMTP id s25so11525748ejy.6 for ; Thu, 19 Nov 2020 23:34:54 -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=NO94hvtgm9AmBChvVz/OOYUNNS89wDGoGuSgJgOiQIg=; b=k4v3eJu87iZ4eQ5dS2zf5Y8zfzifioRHkLNa9XTmwAokhrCIo7FFOrxo+RuUVuzNws GmdAAuDWN03yuMbi3gTXrfIO32oDy1ig8J0wE7Q4ov2LVShENBKA3yDwG+EyM/Mrhmlp uBqZnDLI/lrGqqcWEh90gf9qaRap361fdk15UHHgfdI+6f/nUGAlmMTvdREdMbhhXGRf FigYHBCDlZTUFVNUTTOepmA/P3kQbH8hVgV4W+L+eqU9t+pu/ETzt0/sENRJDrTqg1gC cvqiEe+uhd1DWTp3fvyzmhQyr1AaUpFRzTUw3Im/es1mg1/L2xCNbZZ2hVWqSaypcpWe acPA== 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=NO94hvtgm9AmBChvVz/OOYUNNS89wDGoGuSgJgOiQIg=; b=OGwaMef5Yk65nX5MD8Vp+KsHd9mdoKus7/scqQx9Xi8mb9IC13mPqQd/gmzD39RHhD cNWK7bS4GXJOQpkNgmsoQt0CaMLYnl5IOtH101troNdkmGAypTsNVE+MufwQzfwbgfrM DbDoFLpbPDRMpZ588qDRLjJ1M0lxnEnhS3MEM4YjpnR1P9UaLHgGc6DGTGrDzK+ur5Le CqqJuFkYY11/bQmWl6eLo8yEcDH6r/LHfVV9dhiyutl5rtLeUysuXYrFN7Iz0GdiaRkh 3FAAGfBdN2yT1SmR758zOlHRHD7UegLX3p3CTAW7iO2rAPK5PtcMQpM5PzzwNq9N+Wb1 r7JA== X-Gm-Message-State: AOAM533GXSaxSrhgmx2UwL5LBtlw5eNKDIqXJuOgAX/Esn3ot+Bw2T0B 4CqzZkjdcXUUhbLuq34IobF3AQQnpWkK9A== X-Google-Smtp-Source: ABdhPJwfczRxCz/ALW3NaOZvnRdZxYamyS1op5lJeDKJzO5IvbvI2wfMCDMme621N/LlhoobFQuy/w== X-Received: by 2002:a17:906:ce2a:: with SMTP id sd10mr13482603ejb.21.1605857694140; Thu, 19 Nov 2020 23:34:54 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id i13sm769110ejv.84.2020.11.19.23.34.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:34:53 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:33:14 +0100 Message-Id: <20201120073327.820745-50-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 149/162] avcodec/mv30: Reduce the size of tables used to initialize VLCs 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 switching from ff_init_vlc_sparse() to ff_init_vlc_from_lengths() one can remove the array of codes of type uint16_t here; given that the symbols are the default ones (0,1,2,...), no explicit symbols table needs to be added. Signed-off-by: Andreas Rheinhardt --- libavcodec/mv30.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavcodec/mv30.c b/libavcodec/mv30.c index 5bfe4b0614..1ee6be0c99 100644 --- a/libavcodec/mv30.c +++ b/libavcodec/mv30.c @@ -35,6 +35,8 @@ #include "internal.h" #include "aandcttab.h" +#define CBP_VLC_BITS 9 + typedef struct MV30Context { GetBitContext gb; @@ -651,18 +653,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, return avpkt->size; } -static const uint16_t cbp_codes[] = { - 0, 1, 4, 5, 6, 0xE, 0x1E, 0x3E, 0x7E, 0xFE, 0x1FE, 0x1FF, -}; - static const uint8_t cbp_bits[] = { 2, 2, 3, 3, 3, 4, 5, 6, 7, 8, 9, 9, }; static av_cold void init_static_data(void) { - INIT_VLC_SPARSE_STATIC(&cbp_tab, 9, FF_ARRAY_ELEMS(cbp_bits), - cbp_bits, 1, 1, cbp_codes, 2, 2, NULL, 0, 0, 512); + INIT_VLC_STATIC_FROM_LENGTHS(&cbp_tab, CBP_VLC_BITS, FF_ARRAY_ELEMS(cbp_bits), + cbp_bits, 1, NULL, 0, 0, 0, 0, 1 << CBP_VLC_BITS); } static av_cold int decode_init(AVCodecContext *avctx)