From patchwork Wed Dec 30 23:31:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24708 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 6843A44B882 for ; Thu, 31 Dec 2020 01:35:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AD3CA68AA1F; Thu, 31 Dec 2020 01:33:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E83C968A86F for ; Thu, 31 Dec 2020 01:32:49 +0200 (EET) Received: by mail-ej1-f54.google.com with SMTP id g20so23726651ejb.1 for ; Wed, 30 Dec 2020 15:32: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=xz/2ejXqPXqMFGEKZ+m+Coo2Ni5CWV1tiD4+7XVVVV4=; b=rNS88UvRKi9BFvfmPR9ztES6fWyRcgar9fOZeAau2TJuza172gKIFRaJwIlxpHMBAH DP3++yCcVFgXL/t0nAD4Eucpb+dbtKcftbnTG+HiznLv1Ngxw8JMlAfnARiSOsyapqqC 8zuKHAfgUiHiSB5+j6d7h9wxILXcq3pjqwdqnaAZy7K7Yk0JPQEK4W9UStT8NnEJkGi+ hkNjOTBHT0fBotNj3SNfqLkmaxrCO3mFIY7qqUMVN4I3YdLBD+ZVi6Fmgfzuj7H2vjJj 7G//t/XgsX/E9XFEHSQLyDVaqaMGReqP0B3bYCjDIlrE0IBrDkNweAqeUwG46BPw8OLp n9Ig== 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=xz/2ejXqPXqMFGEKZ+m+Coo2Ni5CWV1tiD4+7XVVVV4=; b=nvaCXGq4Cdb2LmqTdwUMAu1+bjRC+NkJr8rXN91j4JfVkiy7BoRKGYRMFLMIZ2Qmh1 UhmG3D0JVs3SiAG9cygSeiwvvtM7/rP89gEQYeQlGb9bfa6ZFwBj3JU2rhkqpxpkamHL BnTvivWuEvcq+CFCD8ONfgr7wmRuq/i0BM5g3hXDSVm2pe+jkW6hx6kecwk5q8Xg8OsT ehrfoffU1UE24mTm3J0U7LInYJIgMZjnenBKOMxpDyMS1g4ksa1T5GMkCbhYpVZtukkk wfwddSCNo75pUs/ROluJETda9WexWFZM1ijCoqGYjixjmEu/X/iagnUv/Fmn+RE8CWSz AVXA== X-Gm-Message-State: AOAM533UJuIVrzj9DR/woRrSAnXJEHXzKxXAedhKiPZEMJtGq7fB//yT ZrxYdKVMRJVKvpMvnJvjP4Cd70txd3o= X-Google-Smtp-Source: ABdhPJzkme8Zdd8eOlIV+nM3Fw9RqEvRV3V+gz6VetIGFWszZalrf/GwsSdsrZZUUydgSTgHvAcRGw== X-Received: by 2002:a17:906:1291:: with SMTP id k17mr51821085ejb.288.1609371169259; Wed, 30 Dec 2020 15:32:49 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id u19sm19630409ejg.16.2020.12.30.15.32.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Dec 2020 15:32:48 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Dec 2020 00:31:43 +0100 Message-Id: <20201230233157.1055287-16-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> References: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/30] avcodec/aacps_common: Use minimal VLC nb_bits/max_depth 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/aacps_common.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/libavcodec/aacps_common.c b/libavcodec/aacps_common.c index ecc220f94b..8653b871ca 100644 --- a/libavcodec/aacps_common.c +++ b/libavcodec/aacps_common.c @@ -61,7 +61,7 @@ static const int huff_iid[] = { static VLC vlc_ps[10]; -#define READ_PAR_DATA(PAR, OFFSET, MASK, ERR_CONDITION) \ +#define READ_PAR_DATA(PAR, OFFSET, MASK, ERR_CONDITION, NB_BITS, MAX_DEPTH) \ /** \ * Read Inter-channel Intensity Difference/Inter-Channel Coherence/ \ * Inter-channel Phase Difference/Overall Phase Difference parameters from the \ @@ -83,7 +83,7 @@ static int read_ ## PAR ## _data(AVCodecContext *avctx, GetBitContext *gb, PSCom int e_prev = e ? e - 1 : ps->num_env_old - 1; \ e_prev = FFMAX(e_prev, 0); \ for (b = 0; b < num; b++) { \ - int val = PAR[e_prev][b] + get_vlc2(gb, vlc_table, 9, 3) - OFFSET; \ + int val = PAR[e_prev][b] + get_vlc2(gb, vlc_table, NB_BITS, MAX_DEPTH) - OFFSET; \ if (MASK) val &= MASK; \ PAR[e][b] = val; \ if (ERR_CONDITION) \ @@ -92,7 +92,7 @@ static int read_ ## PAR ## _data(AVCodecContext *avctx, GetBitContext *gb, PSCom } else { \ int val = 0; \ for (b = 0; b < num; b++) { \ - val += get_vlc2(gb, vlc_table, 9, 3) - OFFSET; \ + val += get_vlc2(gb, vlc_table, NB_BITS, MAX_DEPTH) - OFFSET; \ if (MASK) val &= MASK; \ PAR[e][b] = val; \ if (ERR_CONDITION) \ @@ -105,9 +105,9 @@ err: \ return AVERROR_INVALIDDATA; \ } -READ_PAR_DATA(iid, huff_offset[table_idx], 0, FFABS(ps->iid_par[e][b]) > 7 + 8 * ps->iid_quant) -READ_PAR_DATA(icc, huff_offset[table_idx], 0, ps->icc_par[e][b] > 7U) -READ_PAR_DATA(ipdopd, 0, 0x07, 0) +READ_PAR_DATA(iid, huff_offset[table_idx], 0, FFABS(ps->iid_par[e][b]) > 7 + 8 * ps->iid_quant, 9, 3) +READ_PAR_DATA(icc, huff_offset[table_idx], 0, ps->icc_par[e][b] > 7U, 9, 2) +READ_PAR_DATA(ipdopd, 0, 0x07, 0, 5, 1) static int ps_read_extension_data(GetBitContext *gb, PSCommonContext *ps, int ps_extension_id) @@ -289,8 +289,8 @@ err: return bits_left; } -#define PS_INIT_VLC_STATIC(num, size) \ - INIT_VLC_STATIC(&vlc_ps[num], 9, ps_tmp[num].table_size / ps_tmp[num].elem_size, \ +#define PS_INIT_VLC_STATIC(num, nb_bits, size) \ + INIT_VLC_STATIC(&vlc_ps[num], nb_bits, ps_tmp[num].table_size / ps_tmp[num].elem_size, \ ps_tmp[num].ps_bits, 1, 1, \ ps_tmp[num].ps_codes, ps_tmp[num].elem_size, ps_tmp[num].elem_size, \ size); @@ -317,16 +317,16 @@ static av_cold void ps_init_common(void) PS_VLC_ROW(huff_opd_dt), }; - PS_INIT_VLC_STATIC(0, 1544); - PS_INIT_VLC_STATIC(1, 832); - PS_INIT_VLC_STATIC(2, 1024); - PS_INIT_VLC_STATIC(3, 1036); - PS_INIT_VLC_STATIC(4, 544); - PS_INIT_VLC_STATIC(5, 544); - PS_INIT_VLC_STATIC(6, 512); - PS_INIT_VLC_STATIC(7, 512); - PS_INIT_VLC_STATIC(8, 512); - PS_INIT_VLC_STATIC(9, 512); + PS_INIT_VLC_STATIC(0, 9, 1544); + PS_INIT_VLC_STATIC(1, 9, 832); + PS_INIT_VLC_STATIC(2, 9, 1024); + PS_INIT_VLC_STATIC(3, 9, 1036); + PS_INIT_VLC_STATIC(4, 9, 544); + PS_INIT_VLC_STATIC(5, 9, 544); + PS_INIT_VLC_STATIC(6, 5, 32); + PS_INIT_VLC_STATIC(7, 5, 32); + PS_INIT_VLC_STATIC(8, 5, 32); + PS_INIT_VLC_STATIC(9, 5, 32); } av_cold void ff_ps_init_common(void)