From patchwork Tue Nov 10 10:47:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23500 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 21BF544B922 for ; Tue, 10 Nov 2020 12:56:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5248968BE5D; Tue, 10 Nov 2020 12:50:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F34068BD8E for ; Tue, 10 Nov 2020 12:49:49 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id p8so11337905wrx.5 for ; Tue, 10 Nov 2020 02:49:49 -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=Tsc060vVoZ2eDQdmyp5mMOHIsvRDmXKbAZd0xou183c=; b=EkDDSEvZWDd62iGY5FLtJLuBpH0Gtw2dadU+WOZZ1ckD2MieA8FPHpoxIWp3tRCSGm 06Cwaxqz3L4oarasMOJi+b9ofbRjoaV/yOKc1hMq203xsKTlbIlub9bpTwbxh22uTKaJ zC0v4bNdNWe1i7AuGERv0cc3stkre5Uyxqf+sP9vD7NsDhmc87sOO9zjUaj4/s+FgQxF PIKz1uFjWhQ+Io190Dn0Lqi39/eB+mHHTC/IpV+DbKJgMN9wQsdp3COY/WuyHFBm4B0N v4Z16GFP5Jh9UbYgFJQ6XddtZDqc42qFkjaTd2qB/SQSQs8Nt0XPFgPzztlJZH/lb3+l NMGA== 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=Tsc060vVoZ2eDQdmyp5mMOHIsvRDmXKbAZd0xou183c=; b=kIECLpfdS5T03WAS5SaC2tu1XSj7YmW7DavS21cvBhldOU86gs/zU3cP4jjEE//Iwt 4mb7DDNv8WrSYsJS4LTiLA58JpynvY566i+/2v+2Z3lFhTlhp7w0pZR18cansvcEiDPG Z80VIlTf5wKF/CagJNw5G5vWMqBLiZeYuZE5AJ8fyo3CKDy+wJHDwi7nuH/ITlqbeAA6 uOeJZSmKxNZ65s63Lb+xZJQaRvzqTUPC5TgXiW+ATh+kHv4LU0mImqILUEeSTCEfESv5 FzFHqSo52u2E27z55/LgE9/vdtgN1cf8NYsEuO3/wwbe3+15ej+Di3We7gT7a3x9WFWM 6QLw== X-Gm-Message-State: AOAM533I1BfDUussC43RB8m7PlohKWDsm5Quv29UMUwUnoM90lyGYtu5 ftWDMYz/Z6t1MtYjzeKmkQr2NoitaVU= X-Google-Smtp-Source: ABdhPJxFaBqXAi8n/wuHxabQnqaNQx4PxrZqGMmmzw1r/lnXJ4PlJzu/OOOW7eLvHFzdmf2KaMK8dQ== X-Received: by 2002:adf:ed11:: with SMTP id a17mr8488504wro.197.1605005389271; Tue, 10 Nov 2020 02:49:49 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:49:48 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 11:47:26 +0100 Message-Id: <20201110104851.321029-30-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 029/114] avcodec/rv10: Make VLC tables 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" These tables were huge (14 bits) because one needed 14 bits in order to find out whether a code is valid and in the VLC table or a valid code that required hacky workarounds due to RealVideo 1.0 using multiple codes for the same symbol and the code predating the introduction of symbols tables for VLCs. Signed-off-by: Andreas Rheinhardt --- libavcodec/rv10.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 08887c121b..a7cb8118e5 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -46,7 +46,7 @@ #define RV_GET_MICRO_VER(x) (((x) >> 12) & 0xFF) #define MAX_VLC_ENTRIES 1023 // Note: Does not include the skip entries. -#define DC_VLC_BITS 14 // FIXME find a better solution +#define DC_VLC_BITS 9 typedef struct RVDecContext { MpegEncContext m; @@ -409,14 +409,14 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx) /* init rv vlc */ if (!done) { - static VLC_TYPE table[16896 + 16640][2]; + static VLC_TYPE table[1472 + 992][2]; rv_dc_lum.table = table; - rv_dc_lum.table_allocated = 16896; + rv_dc_lum.table_allocated = 1472; rv10_build_vlc(&rv_dc_lum, rv_lum_len_count, rv_sym_run_len, FF_ARRAY_ELEMS(rv_sym_run_len)); - rv_dc_chrom.table = &table[16896]; - rv_dc_chrom.table_allocated = 16640; + rv_dc_chrom.table = &table[1472]; + rv_dc_chrom.table_allocated = 992; rv10_build_vlc(&rv_dc_chrom, rv_chrom_len_count, rv_sym_run_len, FF_ARRAY_ELEMS(rv_sym_run_len) - 2); done = 1;