From patchwork Tue Nov 10 10:47: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: 23478 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 7943B449B06 for ; Tue, 10 Nov 2020 12:49:53 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6086268BD8E; Tue, 10 Nov 2020 12:49:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C69668BDD8 for ; Tue, 10 Nov 2020 12:49:41 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id 23so12137217wrc.8 for ; Tue, 10 Nov 2020 02:49:40 -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=WDceH3BvzNWQRv6j0OzYBfD5y7uy3TDo/v+9lN2Nfc8=; b=EmRHrjoXf15TRVMng83wOGGD3yNddgVy6Ida14R2M5qq+zpU+f32htkw9wQYYm02uC elJmbTDNUnLdCgWD8yogA9ndtmNNlALX6ATTRNK7n8kGmNKbpiQJI5z8cdHaxFM/HLVC uL55MgBkI17WhMBX70oDG8M3keeWYSldteDkcLP3dPMwXBcfEGOZIkX+USJbweL0JaKu CmTyJvHCgoVKmy2DYMqn2ZDUqjyqRKrUGvApUFk+YEe55i8TSscnn9Llt36N6Ro8/4Pp I3nKGmGa6Jh/DGH6KrmTV0XFUeESg1TpmAIIcPtgh6oq1eoE8OKClX8F3a7k5vsOBI1A Z7kA== 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=WDceH3BvzNWQRv6j0OzYBfD5y7uy3TDo/v+9lN2Nfc8=; b=mY+EG/WDVBe2fTyeUYpLdSE4MyIiwNaf437sYQNzh91ac9+DYmjGfcOUytdzrlRzjg DtE7jm0emCZNqWA5Qd4PZ1LkUVxdLojFTqGfJABLZ+kEGaWwScpN3MxmX8g9czIiBO8Y JbM2m+rMA1ocIUvDCBy/uccmTJrCDsVLRWzfBzt6iSSvzynIgW9obApwRb7qa+DuSgum Fsz4Wq1PwKibp9mKx5/PgDCsRomZmESY0Kss97MDzILC20WGQLRbjuCLxHXQmIxgXVvi hQrqFTEH5pwd3VrmPUolhMHFFzQsLjbD8N/bjukj/gC/cZmghnXRif/DTlgeECthTfQ5 LEsw== X-Gm-Message-State: AOAM533IgL6p1oOJW3NghLiFdpc6qmlrru5Ka8/gcw5xtRaer07Etg5R QPzYGJ6r3f/apMIdww2+4ffHyt+8MzE= X-Google-Smtp-Source: ABdhPJz0FcSz3RsH27/IH/bRpCfxXeiEzKgZoT8ibFxQr4kp94XUtY8YLCg4gutv8wmj1LWXoqRDSA== X-Received: by 2002:adf:ed11:: with SMTP id a17mr8487830wro.197.1605005380201; Tue, 10 Nov 2020 02:49:40 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:49:39 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 11:47:17 +0100 Message-Id: <20201110104851.321029-21-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 020/114] avcodec/wnv1: Make array for initializing VLC smaller 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" This is possible by switching to ff_init_vlc_from_lengths() which allows to replace the table for the codes (which need an uint16_t) by a table of symbols which fit into an uint8_t. Also switch to an ordinary INIT_VLC macro while just at it. Signed-off-by: Andreas Rheinhardt --- libavcodec/wnv1.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c index b5cd0f0f0c..f8a9b94746 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -29,11 +29,10 @@ #include "get_bits.h" #include "internal.h" - -static const uint16_t code_tab[16][2] = { - { 0x17F, 9 }, { 0xBF, 8 }, { 0x5F, 7 }, { 0x2F, 6 }, { 0x17, 5 }, { 0x0B, 4 }, { 0x005, 3 }, - { 0x000, 1 }, - { 0x01, 3 }, { 0x03, 4 }, { 0x07, 5 }, { 0x0F, 6 }, { 0x1F, 7 }, { 0x3F, 8 }, { 0x07F, 9 }, { 0xFF, 8 } +static const uint8_t code_tab[16][2] = { + { 7, 1 }, { 8, 3 }, { 6, 3 }, { 9, 4 }, { 5, 4 }, { 10, 5 }, { 4, 5 }, + { 11, 6 }, { 3, 6 }, { 12, 7 }, { 2, 7 }, { 13, 8 }, { 1, 8 }, { 14, 9 }, + { 0, 9 }, { 15, 8 } }; #define CODE_VLC_BITS 9 @@ -115,16 +114,12 @@ static int decode_frame(AVCodecContext *avctx, static av_cold int decode_init(AVCodecContext *avctx) { - static VLC_TYPE code_table[1 << CODE_VLC_BITS][2]; - avctx->pix_fmt = AV_PIX_FMT_YUV422P; - code_vlc.table = code_table; - code_vlc.table_allocated = 1 << CODE_VLC_BITS; - init_vlc(&code_vlc, CODE_VLC_BITS, 16, - &code_tab[0][1], 4, 2, - &code_tab[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE); - + INIT_VLC_STATIC_FROM_LENGTHS(&code_vlc, CODE_VLC_BITS, 16, + &code_tab[0][1], 2, + &code_tab[0][0], 2, 1, + 0, INIT_VLC_OUTPUT_LE, 1 << CODE_VLC_BITS); return 0; }