From patchwork Tue Sep 13 11:33:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37889 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp628105pzh; Tue, 13 Sep 2022 04:34:04 -0700 (PDT) X-Google-Smtp-Source: AA6agR44caE/PH3nKBhqbs43hrsu26CfNAkKLK5iKPswsmG/jX8u2druw13dklFYfp8DdF8SdHJ9 X-Received: by 2002:a05:6402:a43:b0:44e:cf0a:5e82 with SMTP id bt3-20020a0564020a4300b0044ecf0a5e82mr24948462edb.118.1663068844277; Tue, 13 Sep 2022 04:34:04 -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 et9-20020a056402378900b004520b2492a1si2681621edb.528.2022.09.13.04.34.02; Tue, 13 Sep 2022 04:34:04 -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=r7zPMvGc; 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 D130D68BB3C; Tue, 13 Sep 2022 14:33:36 +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 31DF468BB3C 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=gZ43VbLyhvr2u914ZT0kC/iEXB4DYc2aF6TENkFP7orFSxn9TuEU/Crbur/U0CLuOCP2qRi0bfpgfvtWOfiuQyHbMKfjXaK/CWaDyqHplLPlj9pbHQbuGVLWUmvd6C8qc1Spiig8eUTC8/YSb5vUzSae3LKdEAqnz0yqGi2tZlpFIcmI7IBV1ATzLj1Fn9OVk0cOXgpahi+rMYlq8nEZqdOVfIz4dExaWb5KMz3pZUJm9HuNFzPDUAJNl8GRzJSFgpgPqwm2KEwiO4DxPpLZjN5dzKrvPp1K1dpA45eQL76F+qb0SgmXrtier3yAF04ZbLP0w/U5fp4ditlKn8S0Mw== 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=KdktDvD9P2b0VFYuia6qYCwITPuG8R0zdos6FWF5sv4=; b=LFY0m98lB4p8QwfSqus6n1SovxKWI5ZJqzT6YyR+Wi5GMyxmSU1ZadE65niRmmIq+UKSfy8pPAEIFBtKPyrrSrW390yrpeBFqfmsTmiyeUn596a+obItMAtmOfugLadDSnNuB/bj2afd4adj+yqQW/N0Kao//k+Zc9HIjZ+yBJA+pzceCW8j3Oy0PKZPd+Xkzb1UmdNo3z6nM9MIXyQStKR1009rb1gMmBxAyqzHx6W3ZuRASfm2y0/guMA8qKmiTtQtywVuoRXtVv5xEFOQFHCZbzDadCbtu9Oh6P7aUW8ylG1hgTX8VTnclwzzHK0hqh74jn5POJEHGVpYWHsiiQ== 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=KdktDvD9P2b0VFYuia6qYCwITPuG8R0zdos6FWF5sv4=; b=r7zPMvGc7GLCxGK4xDT3YHP7br5t97zRuTMFRMJd/4BRJxVk9t4It2tE9KmCx6xiicVE/0QH2v55PTuLJoGCI5+cHxfsrBQoEmq8KDRlfL1UyPOkxil5w4AjVlq3QoZyLaf+HDYsiPsy/hMDraOGdLTCc3nLHw6o1MjEYzsjw3i3KOFlmKrKoFl9K9r5wd+Gtl5+g8fFiCBO+JYYuGlmjd2qFowjlVlFvPEEdOUcS5Eh7bvs528+Mnnj6KNotWKPidu2dGMWsvdcrJB6ZvXLkivTegypljcXEi8GY5+qbyYIPlSDIZD1411QkLnndmAIWMmRmlLzCAcmn0AYY33xEw== 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:25 +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:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Sep 2022 13:33:05 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [bhhcCv4W/lnMprBhj4MIaJxF/J5+xcRTON0SBJw/7xE=] 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-7-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: 9864f805-d59b-48ec-200a-08da957bc57b X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKy7YnLMs5Csile4q0ca2x3wyG9zlL+WOLYMWStPN+IP/vfJJ/DpkIUkgR/jcSjOpJQ6Ac/Br2rJjiwAq3E6BegzP+CUGCN6lJUrE+E0lHuJ6DFnXd+eFlSypoflMzRARzOJdOK1ep/KuwMVMEyKDHtf3Gm0b+8vzrOrCyO/w3LZamOgNfoz4M1MPIW3SbirSujlzZ33umH61v97IJz23Dh1cYTAdEfDQYPKIlhmDJlc7J2Hx+BhSs3bGaME707ejEXd8JYXGqxgE7yRsGUbhDfqnLKIsjVzop0LrP66k12zXdJ6lkDFa1q1J7/R0Q6alRrUVPunovXmxJtCrbaUN4pUmQYnk99uLWQgv8NvyA2LBMbd1E336NAhG4nv1dYSfoTWvEvpAyPjpCD9GiTCW4JjkSyNYIKHEhSn86z/cCWEX/AVC5vQhdqztu+Q80q4arP5fUgCUZ2GltBdAE+pp50Wlk76ewZC1iPDJyfREv2pflEc+4lIcl+1ZdsIjcB4THzbjMoBnyK+kmI1SUvMDmAyQBv16pBZJDUJcUCJgZX4/3Abtmw7Kfzy74fJjjqs584k45bw1qUMeYccAClGikx4AyKjZbDP8BUAJC0RgxwYj38kypGND384reKT/Y0/DFuDQNJKUsNtTYq4QwNyXg1jekM7BeyszAQsNsySkG03ykYKrH0UTZAIjRlDIV9FSQzq6UQaPDEAy6wXK4EGkeEv+RETWaVGdQU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yBp84XO5SAN0l63ZbTw/s5pzu2e+BPgxzLuKXbL5HIGw2RxiTd2tgccGNZnuuA+6K1vU1O2GA49id41gU09Wv0P/lPDb0iFC/PTxHUoEbxY/680lwppOWEvAZKqvacECkMAJ2CDiBeUCKn/5wY8s6u7Zw5MtkWf9Sjw7NP+U7X3NnVMtbTF1JQhIxqeXHa4TL7atrQzuiSzG5EzXdipYuxQzu9v/IU91Rm00pwwAYPn90er1bHtDQIPSssr6CcE+CQMo/4+MFh8sNv632gtlxixdxDkAlEd8ZLa4Ylh9/7nPWz22OskmuvjcTholerT5BN+pVFZurSyQDxCt5ICtgpZMbSTHykrZjdhFr3gcl9RII1gAfWM+nQPHmPylXyNqS3PByS4ZNPoO2XZ9yyxZ11/dnhtpwXhEPdcz/LkMgFWdVPYLaOspQQ1pJ00IeSNYAQunMs+evYc3f+jwfS07LuSPLPBQf1PV4W1c71NUT6GsXgpB1LGPmrkEoncjAYLB/oGzzQj+5Ssc1B6FI7RmKUnKQVQXHLYqHVADS8nm4vOsxCVOcLTkZE5xZv536TZ9idX1IIj0FA6t31tsD71Feyea3FKDR6pXKii1ABaie+vlkcW7kO1PkTOg0M7CXCh6So03ns4Dpdc3JHWAcKjG3A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jOflEAVDCxC0Wkq0mK3Uo73NLS4m6kxpioYhqyI9loVkb3ieDvBauE4ntcNgcVYw4l/p/rZZpPGJAZ8Zoqy1LGFhnx6V0J5kRdibuD9C9e9u3e3kxqR21dWef4Gvied+tSS6FXYFl5MDNvBB7yd/fyw44qXNw4a6VV2cYdcp+NzhOci/MZRQUDV17/qcnFzOMNxeFrY4RgZmYGvooA+pzUvcgOxwMOUzju9ehZA2WX0+WhplBSgGE+0Ki9Twsy2AwB1vl2ywIQyFQJxin4qxUHeQFkml5+z07p8l1tNGSK9qg7c8bP+8rqe5N8Lb1dL6v2dg06ZWCqs7mwOjYkbQVWz35h7pPIQNIb56ML3iaetOu6T+Bm6gTyAdWqz8p2rhDtlUgHWsQjQfPTzaovspafmhlRnB9MAZYZRefNFi0ByAvX0zpCtpOIcEM5sMxi/SGHB8HGlYRTTl2gW78CJY1QvpqkHH0+mlHsBfayYSFH5y7bn2V9adxHzAbmoNjM0W5EeZnwbde6CwftjbnD8o9ucbQLB8fBlV3SCXtho8abqYJFLRAbXF8i2s3rB9FRANA19S6LD+9MVEWs56swqnzw+EO5VSNC0Z1gk/SShyvmDsShe3Cp9jCM+BIgQHkaIZpLB/tMv7vnY2PS9dfK5snyBq9u7MKMuwhG3LUbz5Aiw5m+3eH2W8x+F1nd+uEB3wSYCi0G18R51/Xb7C83j5WjvY5Hj67MuOLVBRio7Ga4sQr/6G1nDmH5HuUf1aKzAKZUZf+pDFiZk0RrZP9sjbZ33hKe6XAukFTghOEcIiXbhzIhNr4ne0v66tkz23avNGbGJtu+GEoJJYl3KcjAnHoRMNkL0sA9xHYP4PO35tJaeQcxCUI1ovDD+Sxx0ZIjgcIlM7P/uUdb3f4f5GRUZQbZD0hafrIbkrW9k6l2ucN5AbEEjsZcolDjxBqCMTKL+I0KFhCpbkzk8zh5IXXZlbCnyq5L3fvf6kqftjR+SGjzf5YsOP11PG3T64jOcmAWT8QOd1g68O9uS0YpAABX7tpyQslD02a7XFnDX4253cmQYjJ9QhaUfuFJBwfqZp7xRfXxFbKNMhuQwvhYBk111I50wj1F/AsXoLabu3eIU3CFpyF1AIsPjhd3lIt6or1/+AEGP9rJwhItbNRmFgp2D9Ckm/vDkf1easXvdhpESX8ZbKtAXW/4LXawTB1O6C7hqVOp7NknMfMArDtzaHUqoLi7pCcxP2ETigG2sr48ayds3MsVdAoH26LfFkYE7Z9k2tWX6pUaY1syyHaAeYJit+xYLCxVkG6lQVhuuoCm6fZpidClDNsH030DPeNuA5xsYM X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9864f805-d59b-48ec-200a-08da957bc57b 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:25.6648 (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 08/13] avcodec/dcahuff, dca_core, dca_lbr: Apply offset during VLC creation 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: HreD55bJQ9XM Signed-off-by: Andreas Rheinhardt --- libavcodec/dca_core.c | 2 +- libavcodec/dca_lbr.c | 4 ++-- libavcodec/dcahuff.c | 45 ++++++++++++++++++++----------------------- libavcodec/dcahuff.h | 1 - 4 files changed, 24 insertions(+), 28 deletions(-) diff --git a/libavcodec/dca_core.c b/libavcodec/dca_core.c index 069d428fff..96787fe95d 100644 --- a/libavcodec/dca_core.c +++ b/libavcodec/dca_core.c @@ -69,7 +69,7 @@ static const uint8_t block_code_nbits[7] = { static int dca_get_vlc(GetBitContext *s, DCAVLC *v, int i) { - return get_vlc2(s, v->vlc[i].table, v->vlc[i].bits, v->max_depth) + v->offset; + return get_vlc2(s, v->vlc[i].table, v->vlc[i].bits, v->max_depth); } static void get_array(GetBitContext *s, int32_t *array, int size, int n) diff --git a/libavcodec/dca_lbr.c b/libavcodec/dca_lbr.c index 5343bcde8a..579bd9c469 100644 --- a/libavcodec/dca_lbr.c +++ b/libavcodec/dca_lbr.c @@ -263,8 +263,8 @@ static int parse_lfe_chunk(DCALbrDecoder *s, LBRChunk *chunk) static inline int parse_vlc(GetBitContext *s, VLC *vlc, int max_depth) { int v = get_vlc2(s, vlc->table, vlc->bits, max_depth); - if (v > 0) - return v - 1; + if (v >= 0) + return v; // Rare value return get_bits(s, get_bits(s, 3) + 1); } diff --git a/libavcodec/dcahuff.c b/libavcodec/dcahuff.c index ee4d4bcd6d..7a5b054dd5 100644 --- a/libavcodec/dcahuff.c +++ b/libavcodec/dcahuff.c @@ -793,44 +793,41 @@ av_cold void ff_dca_init_vlcs(void) unsigned offset = 0; int i; -#define DCA_INIT_VLC(vlc, nb_bits, nb_codes) \ +#define DCA_INIT_VLC(vlc, nb_bits, nb_codes, entry_offset) \ do { \ vlc.table = &dca_table[offset]; \ vlc.table_allocated = FF_ARRAY_ELEMS(dca_table) - offset; \ ff_init_vlc_from_lengths(&vlc, nb_bits, nb_codes, &src_table[0][1], 2, \ - &src_table[0][0], 2, 1, \ - 0, INIT_VLC_STATIC_OVERLONG, NULL); \ + &src_table[0][0], 2, 1, entry_offset, \ + INIT_VLC_STATIC_OVERLONG, NULL); \ offset += vlc.table_size; \ src_table += nb_codes; \ } while (0) for (unsigned i = 0; i < DCA_CODE_BOOKS; i++) { - ff_dca_vlc_quant_index[i].offset = ff_dca_bitalloc_offsets[i]; ff_dca_vlc_quant_index[i].max_depth = 1 + (i > 4); for (unsigned j = 0; j < ff_dca_quant_index_group_size[i]; j++) DCA_INIT_VLC(ff_dca_vlc_quant_index[i].vlc[j], bitalloc_maxbits[i][j], - ff_dca_bitalloc_sizes[i]); + ff_dca_bitalloc_sizes[i], ff_dca_bitalloc_offsets[i]); } - ff_dca_vlc_bit_allocation.offset = 1; ff_dca_vlc_bit_allocation.max_depth = 2; for (i = 0; i < 5; i++) - DCA_INIT_VLC(ff_dca_vlc_bit_allocation.vlc[i], bitalloc_12_vlc_bits[i], 12); + DCA_INIT_VLC(ff_dca_vlc_bit_allocation.vlc[i], bitalloc_12_vlc_bits[i], 12, 1); - ff_dca_vlc_scale_factor.offset = -64; ff_dca_vlc_scale_factor.max_depth = 2; for (i = 0; i < 5; i++) - DCA_INIT_VLC(ff_dca_vlc_scale_factor.vlc[i], SCALES_VLC_BITS, 129); + DCA_INIT_VLC(ff_dca_vlc_scale_factor.vlc[i], SCALES_VLC_BITS, 129, -64); for (unsigned i = 0; i < FF_ARRAY_ELEMS(ff_dca_vlc_transition_mode); i++) - DCA_INIT_VLC(ff_dca_vlc_transition_mode[i], DCA_TMODE_VLC_BITS, 4); + DCA_INIT_VLC(ff_dca_vlc_transition_mode[i], DCA_TMODE_VLC_BITS, 4, 0); -#define LBR_INIT_VLC(vlc, nb_bits, nb_codes) \ +#define LBR_INIT_VLC(vlc, nb_bits, nb_codes, entry_offset) \ do { \ vlc.table = &dca_table[offset]; \ vlc.table_allocated = FF_ARRAY_ELEMS(dca_table) - offset; \ ff_init_vlc_from_lengths(&vlc, nb_bits, nb_codes, &src_table[0][1], 2, \ - &src_table[0][0], 2, 1, 0, \ + &src_table[0][0], 2, 1, entry_offset, \ INIT_VLC_STATIC_OVERLONG | INIT_VLC_LE,\ NULL); \ offset += vlc.table_size; \ @@ -838,16 +835,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]); - LBR_INIT_VLC(ff_dca_vlc_tnl_scf, 9, 20); - LBR_INIT_VLC(ff_dca_vlc_damp, 6, 7); - LBR_INIT_VLC(ff_dca_vlc_dph, 6, 9); - LBR_INIT_VLC(ff_dca_vlc_fst_rsd_amp, 9, 24); - LBR_INIT_VLC(ff_dca_vlc_rsd_apprx, 5, 6); - LBR_INIT_VLC(ff_dca_vlc_rsd_amp, 9, 33); - LBR_INIT_VLC(ff_dca_vlc_avg_g3, 9, 18); - LBR_INIT_VLC(ff_dca_vlc_st_grid, 9, 22); - LBR_INIT_VLC(ff_dca_vlc_grid_2, 9, 20); - LBR_INIT_VLC(ff_dca_vlc_grid_3, 9, 13); - LBR_INIT_VLC(ff_dca_vlc_rsd, 6, 9); + 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); } diff --git a/libavcodec/dcahuff.h b/libavcodec/dcahuff.h index c0bdce5998..a50d49d6dd 100644 --- a/libavcodec/dcahuff.h +++ b/libavcodec/dcahuff.h @@ -36,7 +36,6 @@ + 7 * (17 + 25 + 33 + 65 + 129)) typedef struct DCAVLC { - int offset; ///< Code values offset int max_depth; ///< Parameter for get_vlc2() VLC vlc[7]; ///< Actual codes } DCAVLC;