From patchwork Tue Sep 13 11:33:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37895 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp628608pzh; Tue, 13 Sep 2022 04:35:02 -0700 (PDT) X-Google-Smtp-Source: AA6agR7idzLshq6eO/j7xgASo4kT0PLsolGwfxlmASk9jJawhZ7ADRpcNrDid0HCaKumnTsRjrv1 X-Received: by 2002:a17:906:9c82:b0:6e1:2c94:1616 with SMTP id fj2-20020a1709069c8200b006e12c941616mr21701549ejc.64.1663068902445; Tue, 13 Sep 2022 04:35:02 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hd19-20020a170907969300b0076fa013dde4si10488831ejc.266.2022.09.13.04.35.02; Tue, 13 Sep 2022 04:35:02 -0700 (PDT) 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=@outlook.com header.s=selector1 header.b=Hd91DKM4; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4162E68BB78; Tue, 13 Sep 2022 14:33:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067064.outbound.protection.outlook.com [40.92.67.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B6B5B68BB3C for ; Tue, 13 Sep 2022 14:33:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MAGJID4DNeQu4kOwVnlpVtwYhAwKFZXwFCc0XPnfPbnY5CfsCgdrR4CwhNeFV6tNohHAYB7W/BRSDwEYUPQYJlw6Vo1CisDZw3EzyWPmGKL825pfRWTylBUAgmbBbHFWcnuOtCFA78CoczkitYQ/wr4XXs7dd8Crw+FbJ4888Hi4vHt4fpfIy+7oUZR/T39C4PudILH2Fe3oSdANPriuPlmjoB8h2uRT9Az9JmvhLBUdWjUFkxhvRmEoKJvDDlQ1VeemQ+DDmvVJPN6nQ8S0LN2OC14fiEp0fC3+GnExcfWV6I6amg+/UWEzQiyVAPR4K45O++lWqN73j6MoKZpiEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=IPRem+ZBMqUz/O+WlYKoD1HuZUkYlDqMOxN3DfN/y6g=; b=AXnVaky/9tVta+8CHazpQ+mvlpkR1vMThisH4hwa2mpk/Y8Hc565pi3UGckFMsfpaycvgE3XSodLnOEiK9IIpbbRITs+RMTzskFdbaWGSUd6LADFLD91PiuQnaX8D2LMJkmzyeMngr0zEoxCZTow8b5hfyYqQpGyfyxHFYoPiLtkd76r0Nw9FlwCoDUdqkf2kQqCzolB7H7+X4SYjvMGpEbyt3JV8kjSPYHpf+qTO/ADBRaR+p6JMmSQXTOuHGOZigqV8Vkp91YRbFrnKkDVgREAsQv5e/kMlCFS/k3tEg+ndwU3pQB6EYxQ06AlXkNr+Q+aQkIlGhDN5h6l7iADXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IPRem+ZBMqUz/O+WlYKoD1HuZUkYlDqMOxN3DfN/y6g=; b=Hd91DKM4H1+QDi1gRQrPKaZdHGtoXom297cLW1JfoXi8zPv2POsu8tQG9N1NvHyA7T+luJAo1cc8JAC4TyeJRI3iBQvC0HdyY5nOpqMFuay0V6r9aiohLHAsgzoN+STP9DbWIqDiiNEoTkS7eHy/ImfAZKMrPuWXxMRqCkKgzLF/Fkk755qcoh1yoFKtzGKU+om9/m26NYGisXC/GDpW6OFqQpprN46z/7pxFyEXYrIzTsrJZt9p4UKv6b1aagjmOH3lmJjI68tjCEmasgLjPaG7nBzQISDtgR5EOZuBVS7/J2ChcUjS9yGe245rBlBINqXrqzm2Qu3HEW4Rk4zKFA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0072.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:374::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Tue, 13 Sep 2022 11:33:31 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb%7]) with mapi id 15.20.5612.022; Tue, 13 Sep 2022 11:33:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Sep 2022 13:33:10 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [DtefW2K53v+U8EzihgB7TZICTbfMIBoHi330t6ulJpo=] X-ClientProxiedBy: AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220913113310.451876-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0072:EE_ X-MS-Office365-Filtering-Correlation-Id: 67e3babc-866a-4c41-6c24-08da957bc8dd X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpEumVcsW5Tnf3Q/Hh5f4HAoDV2G9dxVdQZuBk7aLrKQ5oVRK+JRxGsQdCynhRVU2u8ZzSmnmhPIvAjNW0qCgSlPfXFCeRM5/O/canzjI0M9p6shyK6BG+5QVGW5y/v3YOTStCJpjzDGsn9LwpKJA42dE4FTDIl9IoZydSwbbRCvI+O9H07iFn6u1jmlcYBfDy4skDQKYEUtNzoloZjJ0qLbNTVVRtg8omw8ewgt10NPFIndyYapiq7ve5Ld10eG/eDaBZ0UWQqrQBr4E7szvF/rfbI7tw2YOdrBR8HcyYGWBd9CtklZ/13hn4RdmLRHAf7qutPF5cSYZlmnVdmUVyuZm3UqehQVKilQurzm6RdfcHgyzpafATOPxb3nEgL/F06epcGvMIMF+06TpXNj/0rgy6wiW6ig5Q46E+pQfhmp6Fmfnks/0SOXymOY2jigLtV/l6HZrhCtwV+l1j+QOFm3c3wc8bIKbED75NYukAVJwLDJHhLxj/lL0ag36YKq1/AoxyWx6Yy8XNiv3ZWGUzSUdDTTjfAvtD/dSi3Ov9fcfJALnEsuj1eEjHtX6IQkA0HYJF8Tlx734sJH1tbrRt0ywUx7P2G7ArgS20Zsdx5lE8NKEAgkImc7IZnFZ+MtKWwEI9fRuQKYAZJCMoiAOaz5k1dY3SApD1mLpG4pt5zGM71SD7N8chKwtIDKXPbTYBu6nGL9sChYzdKVrvMjluJabcjYVCS8a6SDu1Q8zaxZkIHrBAYXgC32nvg1F00H0w= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: md+Qaap5IlBjjoju9XVhcZ0/z1e0jjEn2j8yNYddVfCMvhq9/At/p0co9+3dJqdklCgd9UT3yu+Jj2vH0KRlEF+o3RAgb3LEaK52aUgm/if/1zGdnILJuz/9pgr+TLLTGEC6/MP8Jk/dc0mcbRr2LAO+SwdprtQrFM4OtYQ4uCqrYvKX6Umf0ucwK/aIJUpWdF+XX1vo0FfDdUhIpOKrA8Oi/FseLIik+W+dD3wrYO25et3ojAK1BEkA5ebnr3UQWiZl6ZuNg547h/9BfCs7/A/3CvuwDiHKgfBK2DLtTNV2UMt9cFKG97hmyh3LDMiACbctbOeG2DZvHS/buvNWpUvTRUGf2BwA1kRQHRSmphV9AQlMjJ6/J+NE23t3V9P/gAG54HCXCG8hmp5ZJrQ1Etw1AD27qz/WMKtyvnwePtqHrsRBczLIrdjGpm3muORRLHNAfdqppyPD5AyJZj+vp52aRPx7d4xVBlZ2JBrZDQHMyXCgOheiqb8xZE+fqPoCyhuZkAnt09kbFwLsgLQdJD5UIzbcNZBnoNs7XSwkEjjDHklvs1lcv80aslC9ppiysPRhGB8nguL/+XJnekuyQ/vGl46wpG7ebwVTm0h7dBh1OXdbQDdjg06DhmdJ0iOYAuwf/BwlTzBJygBm7hGhzw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NTMxOluPWC8Le9Azv7jb4vXrIZIDvHLn/JhXSpcHdsq/altmERq8aTzUSRKmckBOVFmN4eHi63++EJUOXhhR4QLqwSQ0vMD8EaUwzCL6Zm4dbkIfYkNLwv98/RUY/nSe8PuGOOUbVL/a2vxfrYiLY4G//HYilm7RGm6labAkku66GCR55vmC6S4p1paKiAXmSHdzcoJxmVov0po8y0ufgbl71SqSgGxlfsx0UyThlLRgBg5njI+Mv5fJlMCRfLuNSwHMhFxvjNAQTWeA6Izryyy6bMy3VEoiF9oYwd2gGbTxMUK3GLzO9J1AmN+lrDIeruFE0GDwM9B28TFbLbz7E0Nrq3H0VXv+8M5o87CnoQEm+8glAO/hs1xL1wv1ArG8CAYoTi+74rj+H2BsVvJj1fqyBEdhgEnm5l8KYWwwq0uXmaI4cYun3aJ+otqVb5i/m6Xt+zQbrUT2Eyv2IbsFcDqPiPzgvOYKMJWbiEBDhM5+dJpdqZLWSj7sKISB0CpeSXChrp6JKo/tVLVZdFdO8YgS4z/scUgz6HwqzjfZqkYTU5p4UaIlKGYnKjLZ9cgQ5nXNiqUgeVE8VHKqi9Nan6aJdY6AFipPIip0zu9KnVVN7cZXT0eoyN5cedXl2W6z9xoz+Su3sc0E9IiKLotsmPFxXVC/TUH0FrL/H5GVHdV5g17gbVcQWDedH+BmQ0owEGKlRYp7ckIK4Ehy7X1R+l49VvLH27naxOebmjtTicGUcd4t0Xwk9YZ+SopQBTZ1RPFLphOyua4WIzne6Cb60bnb32VTlFJh9CsZ0XE4CKCGaHaPkksLPTSnRG7HKndLpbUxpgNvXn7ReH43kBkA5cpEv7IBRa01/lwsC67XbuYkqhQpjVQ2Rx/dZa14WiPc7rDu3deGRt/1HfyVrTcb2JN9sCK4Zs6sUZZS/eXgi22/DNpJdRt8mwG9riR6p6g1yMkWwOsqWlNW2p+WUTOnrp6Ehyi95D6BDxydUnSun97mdVH6zt1/wzdmEzY3DwWNIyaxRYha1JtDAhUKhayjL1NwzaF1D4hDHaA2aakFz9wMsLsSkivdMSpYZMfYp4nkQNgmsHYZS1WgutDgCZlDM6AKxUwwRjB1yh+unITTfgoZHAbtiSsLeuAuOX8LWORWePOzi9KLvumC1ZNYqp4UVSrjyekhuag6gkR0ydxCbN+8O4WvTRD17FnLGYZVflFNTeFovFcNmO84vnccPqGnkPXtthP2XKE1mrQfecUizcAhQwSFRzToD/o7t4Gbqnqy7f6i0rLcUqOyom7Ot4CEd8LWH8rov9qIgVn18DCi+560R+NVRRAm0L9zouilLdsJ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67e3babc-866a-4c41-6c24-08da957bc8dd X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2022 11:33:31.1861 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0072 Subject: [FFmpeg-devel] [PATCH 13/13] avcodec/dca_lbr: Inline nb_bits for VLCs X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: LIZwfQTtcSUx Signed-off-by: Andreas Rheinhardt --- libavcodec/dca_lbr.c | 31 ++++++++++++++++--------------- libavcodec/dcahuff.c | 24 ++++++++++++------------ libavcodec/dcahuff.h | 11 +++++++++++ 3 files changed, 39 insertions(+), 27 deletions(-) diff --git a/libavcodec/dca_lbr.c b/libavcodec/dca_lbr.c index 9a0eb62f06..73bc16d275 100644 --- a/libavcodec/dca_lbr.c +++ b/libavcodec/dca_lbr.c @@ -267,9 +267,10 @@ static int parse_lfe_chunk(DCALbrDecoder *s, LBRChunk *chunk) return AVERROR_INVALIDDATA; } -static inline int parse_vlc(GetBitContext *s, VLC *vlc, int max_depth) +static inline int parse_vlc(GetBitContext *s, const VLC *vlc, + int nb_bits, int max_depth) { - int v = get_vlc2(s, vlc->table, vlc->bits, max_depth); + int v = get_vlc2(s, vlc->table, nb_bits, max_depth); if (v >= 0) return v; // Rare value @@ -296,7 +297,7 @@ static int parse_tonal(DCALbrDecoder *s, int group) return AVERROR_INVALIDDATA; } - diff = parse_vlc(&s->gb, &ff_dca_vlc_tnl_grp[group], 2); + diff = parse_vlc(&s->gb, &ff_dca_vlc_tnl_grp[group], DCA_TNL_GRP_VLC_BITS, 2); if (diff >= FF_ARRAY_ELEMS(ff_dca_fst_amp)) { av_log(s->avctx, AV_LOG_ERROR, "Invalid tonal frequency diff\n"); return AVERROR_INVALIDDATA; @@ -314,7 +315,7 @@ static int parse_tonal(DCALbrDecoder *s, int group) // Main channel main_ch = get_bitsz(&s->gb, ch_nbits); - main_amp = parse_vlc(&s->gb, &ff_dca_vlc_tnl_scf, 2) + main_amp = parse_vlc(&s->gb, &ff_dca_vlc_tnl_scf, DCA_TNL_SCF_VLC_BITS, 2) + s->tonal_scf[ff_dca_freq_to_sb[freq >> (7 - group)]] + s->limited_range - 2; amp[main_ch] = main_amp < AMP_MAX ? main_amp : 0; @@ -325,8 +326,8 @@ static int parse_tonal(DCALbrDecoder *s, int group) if (ch == main_ch) continue; if (get_bits1(&s->gb)) { - amp[ch] = amp[main_ch] - parse_vlc(&s->gb, &ff_dca_vlc_damp, 1); - phs[ch] = phs[main_ch] - parse_vlc(&s->gb, &ff_dca_vlc_dph, 1); + amp[ch] = amp[main_ch] - parse_vlc(&s->gb, &ff_dca_vlc_damp, DCA_DAMP_VLC_BITS, 1); + phs[ch] = phs[main_ch] - parse_vlc(&s->gb, &ff_dca_vlc_dph, DCA_DPH_VLC_BITS, 1); } else { amp[ch] = 0; phs[ch] = 0; @@ -430,7 +431,7 @@ static int parse_scale_factors(DCALbrDecoder *s, uint8_t *scf) return 0; // Initial scale factor - prev = parse_vlc(&s->gb, &ff_dca_vlc_fst_rsd_amp, 2); + prev = parse_vlc(&s->gb, &ff_dca_vlc_fst_rsd_amp, DCA_FST_RSD_VLC_BITS, 2); for (sf = 0; sf < 7; sf += dist) { scf[sf] = prev; // Store previous value @@ -439,7 +440,7 @@ static int parse_scale_factors(DCALbrDecoder *s, uint8_t *scf) return 0; // Interpolation distance - dist = parse_vlc(&s->gb, &ff_dca_vlc_rsd_apprx, 1) + 1; + dist = parse_vlc(&s->gb, &ff_dca_vlc_rsd_apprx, DCA_RSD_APPRX_VLC_BITS, 1) + 1; if (dist > 7 - sf) { av_log(s->avctx, AV_LOG_ERROR, "Invalid scale factor distance\n"); return AVERROR_INVALIDDATA; @@ -449,7 +450,7 @@ static int parse_scale_factors(DCALbrDecoder *s, uint8_t *scf) return 0; // Final interpolation point - next = parse_vlc(&s->gb, &ff_dca_vlc_rsd_amp, 2); + next = parse_vlc(&s->gb, &ff_dca_vlc_rsd_amp, DCA_RSD_AMP_VLC_BITS, 2); if (next & 1) next = prev + ((next + 1) >> 1); @@ -493,7 +494,7 @@ static int parse_scale_factors(DCALbrDecoder *s, uint8_t *scf) static int parse_st_code(GetBitContext *s, int min_v) { - unsigned int v = parse_vlc(s, &ff_dca_vlc_st_grid, 2) + min_v; + unsigned int v = parse_vlc(s, &ff_dca_vlc_st_grid, DCA_ST_GRID_VLC_BITS, 2) + min_v; if (v & 1) v = 16 + (v >> 1); @@ -534,10 +535,10 @@ static int parse_grid_1_chunk(DCALbrDecoder *s, LBRChunk *chunk, int ch1, int ch // Average values for third grid for (sb = 0; sb < s->nsubbands - 4; sb++) { - s->grid_3_avg[ch1][sb] = parse_vlc(&s->gb, &ff_dca_vlc_avg_g3, 2) - 16; + s->grid_3_avg[ch1][sb] = parse_vlc(&s->gb, &ff_dca_vlc_avg_g3, DCA_AVG_G3_VLC_BITS, 2) - 16; if (ch1 != ch2) { if (sb + 4 < s->min_mono_subband) - s->grid_3_avg[ch2][sb] = parse_vlc(&s->gb, &ff_dca_vlc_avg_g3, 2) - 16; + s->grid_3_avg[ch2][sb] = parse_vlc(&s->gb, &ff_dca_vlc_avg_g3, DCA_AVG_G3_VLC_BITS, 2) - 16; else s->grid_3_avg[ch2][sb] = s->grid_3_avg[ch1][sb]; } @@ -592,7 +593,7 @@ static int parse_grid_1_sec_ch(DCALbrDecoder *s, int ch2) if (sb + 4 >= s->min_mono_subband) { if (ensure_bits(&s->gb, 20)) return 0; - s->grid_3_avg[ch2][sb] = parse_vlc(&s->gb, &ff_dca_vlc_avg_g3, 2) - 16; + s->grid_3_avg[ch2][sb] = parse_vlc(&s->gb, &ff_dca_vlc_avg_g3, DCA_AVG_G3_VLC_BITS, 2) - 16; } } @@ -613,7 +614,7 @@ static void parse_grid_3(DCALbrDecoder *s, int ch1, int ch2, int sb, int flag) for (i = 0; i < 8; i++) { if (ensure_bits(&s->gb, 20)) return; - s->grid_3_scf[ch][sb][i] = parse_vlc(&s->gb, &ff_dca_vlc_grid_3, 2) - 16; + s->grid_3_scf[ch][sb][i] = parse_vlc(&s->gb, &ff_dca_vlc_grid_3, DCA_GRID_VLC_BITS, 2) - 16; } // Flag scale factors for this subband parsed @@ -896,7 +897,7 @@ static int parse_grid_2(DCALbrDecoder *s, int ch1, int ch2, for (j = 0; j < 8; j++) { if (ensure_bits(&s->gb, 20)) break; - g2_scf[j] = parse_vlc(&s->gb, &ff_dca_vlc_grid_2, 2); + g2_scf[j] = parse_vlc(&s->gb, &ff_dca_vlc_grid_2, DCA_GRID_VLC_BITS, 2); } } else { memset(g2_scf, 0, 8); diff --git a/libavcodec/dcahuff.c b/libavcodec/dcahuff.c index 937a87ee05..af3a6e5326 100644 --- a/libavcodec/dcahuff.c +++ b/libavcodec/dcahuff.c @@ -831,16 +831,16 @@ av_cold void ff_dca_init_vlcs(void) } while (0) for (unsigned i = 0; i < FF_ARRAY_ELEMS(ff_dca_vlc_tnl_grp); i++) - LBR_INIT_VLC(ff_dca_vlc_tnl_grp[i], 9, tnl_grp_sizes[i], -1); - LBR_INIT_VLC(ff_dca_vlc_tnl_scf, 9, 20, -1); - LBR_INIT_VLC(ff_dca_vlc_damp, 6, 7, -1); - LBR_INIT_VLC(ff_dca_vlc_dph, 6, 9, -1); - LBR_INIT_VLC(ff_dca_vlc_fst_rsd_amp, 9, 24, -1); - LBR_INIT_VLC(ff_dca_vlc_rsd_apprx, 5, 6, -1); - LBR_INIT_VLC(ff_dca_vlc_rsd_amp, 9, 33, -1); - LBR_INIT_VLC(ff_dca_vlc_avg_g3, 9, 18, -1); - LBR_INIT_VLC(ff_dca_vlc_st_grid, 9, 22, -1); - LBR_INIT_VLC(ff_dca_vlc_grid_2, 9, 20, -1); - LBR_INIT_VLC(ff_dca_vlc_grid_3, 9, 13, -1); - LBR_INIT_VLC(ff_dca_vlc_rsd, 6, 9, 0); + LBR_INIT_VLC(ff_dca_vlc_tnl_grp[i], DCA_TNL_GRP_VLC_BITS, tnl_grp_sizes[i], -1); + LBR_INIT_VLC(ff_dca_vlc_tnl_scf, DCA_TNL_SCF_VLC_BITS, 20, -1); + LBR_INIT_VLC(ff_dca_vlc_damp, DCA_DAMP_VLC_BITS, 7, -1); + LBR_INIT_VLC(ff_dca_vlc_dph, DCA_DPH_VLC_BITS, 9, -1); + LBR_INIT_VLC(ff_dca_vlc_fst_rsd_amp, DCA_FST_RSD_VLC_BITS, 24, -1); + LBR_INIT_VLC(ff_dca_vlc_rsd_apprx, DCA_RSD_APPRX_VLC_BITS, 6, -1); + LBR_INIT_VLC(ff_dca_vlc_rsd_amp, DCA_RSD_AMP_VLC_BITS, 33, -1); + LBR_INIT_VLC(ff_dca_vlc_avg_g3, DCA_AVG_G3_VLC_BITS, 18, -1); + LBR_INIT_VLC(ff_dca_vlc_st_grid, DCA_ST_GRID_VLC_BITS, 22, -1); + LBR_INIT_VLC(ff_dca_vlc_grid_2, DCA_GRID_VLC_BITS, 20, -1); + LBR_INIT_VLC(ff_dca_vlc_grid_3, DCA_GRID_VLC_BITS, 13, -1); + LBR_INIT_VLC(ff_dca_vlc_rsd, DCA_RSD_VLC_BITS, 9, 0); } diff --git a/libavcodec/dcahuff.h b/libavcodec/dcahuff.h index eaae234479..fdfe7e922a 100644 --- a/libavcodec/dcahuff.h +++ b/libavcodec/dcahuff.h @@ -42,17 +42,28 @@ extern VLC ff_dca_vlc_transition_mode[4]; extern VLC ff_dca_vlc_scale_factor[5]; extern VLC ff_dca_vlc_quant_index[DCA_CODE_BOOKS][7]; +#define DCA_TNL_GRP_VLC_BITS 9 extern VLC ff_dca_vlc_tnl_grp[5]; +#define DCA_TNL_SCF_VLC_BITS 9 extern VLC ff_dca_vlc_tnl_scf; +#define DCA_DAMP_VLC_BITS 6 extern VLC ff_dca_vlc_damp; +#define DCA_DPH_VLC_BITS 6 extern VLC ff_dca_vlc_dph; +#define DCA_FST_RSD_VLC_BITS 9 extern VLC ff_dca_vlc_fst_rsd_amp; +#define DCA_RSD_APPRX_VLC_BITS 5 extern VLC ff_dca_vlc_rsd_apprx; +#define DCA_RSD_AMP_VLC_BITS 9 extern VLC ff_dca_vlc_rsd_amp; +#define DCA_AVG_G3_VLC_BITS 9 extern VLC ff_dca_vlc_avg_g3; +#define DCA_ST_GRID_VLC_BITS 9 extern VLC ff_dca_vlc_st_grid; +#define DCA_GRID_VLC_BITS 9 extern VLC ff_dca_vlc_grid_2; extern VLC ff_dca_vlc_grid_3; +#define DCA_RSD_VLC_BITS 6 extern VLC ff_dca_vlc_rsd; extern const int8_t ff_dca_bitalloc_offsets[DCA_CODE_BOOKS];