From da8b42a4a789f21e33163284b8b3f550bd0511f1 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Mon, 31 Mar 2025 17:45:38 +0200
Subject: [PATCH 05/12] avcodec/aac/aacdec_lpd: Remove dead code
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/aac/aacdec_lpd.c | 63 -------------------------------------
1 file changed, 63 deletions(-)
diff --git a/libavcodec/aac/aacdec_lpd.c b/libavcodec/aac/aacdec_lpd.c
index 0dd8cbe741..93be7a74d1 100644
--- a/libavcodec/aac/aacdec_lpd.c
+++ b/libavcodec/aac/aacdec_lpd.c
@@ -22,42 +22,6 @@
#include "aacdec_usac.h"
#include "libavcodec/unary.h"
-static const uint8_t aac_lpd_mode_tab[32][4] = {
- { 0, 0, 0, 0 },
- { 1, 0, 0, 0 },
- { 0, 1, 0, 0 },
- { 1, 1, 0, 0 },
- { 0, 0, 1, 0 },
- { 1, 0, 1, 0 },
- { 0, 1, 1, 0 },
- { 1, 1, 1, 0 },
- { 0, 0, 0, 1 },
- { 1, 0, 0, 1 },
- { 0, 1, 0, 1 },
- { 1, 1, 0, 1 },
- { 0, 0, 1, 1 },
- { 1, 0, 1, 1 },
- { 0, 1, 1, 1 },
- { 1, 1, 1, 1 },
- { 2, 2, 0, 0 },
- { 2, 2, 1, 0 },
- { 2, 2, 0, 1 },
- { 2, 2, 1, 1 },
- { 0, 0, 2, 2 },
- { 1, 0, 2, 2 },
- { 0, 1, 2, 2 },
- { 1, 1, 2, 2 },
- { 2, 2, 2, 2 },
- { 3, 3, 3, 3 },
- /* Larger values are reserved, but permit them for resilience */
- { 0, 0, 0, 0 },
- { 0, 0, 0, 0 },
- { 0, 0, 0, 0 },
- { 0, 0, 0, 0 },
- { 0, 0, 0, 0 },
- { 0, 0, 0, 0 },
-};
-
static void parse_qn(GetBitContext *gb, int *qn, int nk_mode, int no_qn)
{
if (nk_mode == 1) {
@@ -148,8 +112,6 @@ int ff_aac_parse_fac_data(AACUsacElemData *ce, GetBitContext *gb,
int ff_aac_ldp_parse_channel_stream(AACDecContext *ac, AACUSACConfig *usac,
AACUsacElemData *ce, GetBitContext *gb)
{
- int k;
- const uint8_t *mod;
int first_ldp_flag;
ce->ldp.acelp_core_mode = get_bits(gb, 3);
@@ -159,35 +121,10 @@ int ff_aac_ldp_parse_channel_stream(AACDecContext *ac, AACUSACConfig *usac,
ce->ldp.core_mode_last = get_bits1(gb);
ce->ldp.fac_data_present = get_bits1(gb);
- mod = aac_lpd_mode_tab[ce->ldp.lpd_mode];
-
first_ldp_flag = !ce->ldp.core_mode_last;
if (first_ldp_flag)
ce->ldp.last_lpd_mode = -1; /* last_ldp_mode is a **STATEFUL** value */
- k = 0;
- while (k < 0) {
- if (!k) {
- if (ce->ldp.core_mode_last && ce->ldp.fac_data_present)
- ff_aac_parse_fac_data(ce, gb, 0, usac->core_frame_len/8);
- } else {
- if (!ce->ldp.last_lpd_mode && mod[k] > 0 ||
- ce->ldp.last_lpd_mode && !mod[k])
- ff_aac_parse_fac_data(ce, gb, 0, usac->core_frame_len/8);
- }
- if (!mod[k]) {
-// parse_acelp_coding();
- ce->ldp.last_lpd_mode = 0;
- k++;
- } else {
-// parse_tcx_coding();
- ce->ldp.last_lpd_mode = mod[k];
- k += (1 << (mod[k] - 1));
- }
- }
-
-// parse_lpc_data(first_lpd_flag);
-
if (!ce->ldp.core_mode_last && ce->ldp.fac_data_present) {
uint16_t len_8 = usac->core_frame_len / 8;
uint16_t len_16 = usac->core_frame_len / 16;
--
2.45.2