#include "intrax8dsp.h"
#include "mpegutils.h"
+#define VLC_BUFFER_SIZE 28150
+
#define MAX_TABLE_DEPTH(table_bits, max_bits) \
((max_bits + table_bits - 1) / table_bits)
static VLC j_dc_vlc[2][8]; // [quant], [select]
static VLC j_orient_vlc[2][4]; // [quant], [select]
+static av_cold void x8_init_vlc(VLC *vlc, int nb_bits, int nb_codes,
+ int *offset, const uint8_t table[][2])
+{
+ static VLC_TYPE vlc_buf[VLC_BUFFER_SIZE][2];
+
+ vlc->table = &vlc_buf[*offset];
+ vlc->table_allocated = VLC_BUFFER_SIZE - *offset;
+ ff_init_vlc_from_lengths(vlc, nb_bits, nb_codes, &table[0][1], 2,
+ &table[0][0], 2, 1, 0, INIT_VLC_STATIC_OVERLONG, NULL);
+ *offset += vlc->table_size;
+}
+
static av_cold void x8_vlc_init(void)
{
int i;
int offset = 0;
- static VLC_TYPE table[28150][2];
-
// set ac tables
-#define init_ac_vlc(dst, src) \
- do { \
- dst.table = &table[offset]; \
- dst.table_allocated = FF_ARRAY_ELEMS(table) - offset; \
- init_vlc(&dst, AC_VLC_BITS, 77, &src[1], 4, 2, &src[0], 4, 2, \
- INIT_VLC_STATIC_OVERLONG); \
- offset += dst.table_size; \
- } while(0)
-
- for (i = 0; i < 8; i++) {
- init_ac_vlc(j_ac_vlc[0][0][i], x8_ac0_highquant_table[i][0]);
- init_ac_vlc(j_ac_vlc[0][1][i], x8_ac1_highquant_table[i][0]);
- init_ac_vlc(j_ac_vlc[1][0][i], x8_ac0_lowquant_table[i][0]);
- init_ac_vlc(j_ac_vlc[1][1][i], x8_ac1_lowquant_table[i][0]);
- }
-#undef init_ac_vlc
+ for (int i = 0; i < 2; i++)
+ for (int j = 0; j < 2; j++)
+ for (int k = 0; k < 8; k++)
+ x8_init_vlc(&j_ac_vlc[i][j][k], AC_VLC_BITS, 77,
+ &offset, x8_ac_quant_table[i][j][k]);
// set dc tables
-#define init_dc_vlc(dst, src) \
- do { \
- dst.table = &table[offset]; \
- dst.table_allocated = FF_ARRAY_ELEMS(table) - offset; \
- init_vlc(&dst, DC_VLC_BITS, 34, &src[1], 4, 2, &src[0], 4, 2, \
- INIT_VLC_STATIC_OVERLONG); \
- offset += dst.table_size; \
- } while(0)
-
- for (i = 0; i < 8; i++) {
- init_dc_vlc(j_dc_vlc[0][i], x8_dc_highquant_table[i][0]);
- init_dc_vlc(j_dc_vlc[1][i], x8_dc_lowquant_table[i][0]);
- }
-#undef init_dc_vlc
+ for (int i = 0; i < 2; i++)
+ for (int j = 0; j < 8; j++)
+ x8_init_vlc(&j_dc_vlc[i][j], DC_VLC_BITS, 34, &offset,
+ x8_dc_quant_table[i][j]);
// set orient tables
-#define init_or_vlc(dst, src) \
- do { \
- dst.table = &table[offset]; \
- dst.table_allocated = FF_ARRAY_ELEMS(table) - offset; \
- init_vlc(&dst, OR_VLC_BITS, 12, &src[1], 4, 2, &src[0], 4, 2, \
- INIT_VLC_STATIC_OVERLONG); \
- offset += dst.table_size; \
- } while(0)
-
for (i = 0; i < 2; i++)
- init_or_vlc(j_orient_vlc[0][i], x8_orient_highquant_table[i][0]);
+ x8_init_vlc(&j_orient_vlc[0][i], OR_VLC_BITS, 12,
+ &offset, x8_orient_highquant_table[i]);
for (i = 0; i < 4; i++)
- init_or_vlc(j_orient_vlc[1][i], x8_orient_lowquant_table[i][0]);
-#undef init_or_vlc
+ x8_init_vlc(&j_orient_vlc[1][i], OR_VLC_BITS, 12,
+ &offset, x8_orient_lowquant_table[i]);
- av_assert2(offset == FF_ARRAY_ELEMS(table));
+ av_assert2(offset == VLC_BUFFER_SIZE);
}
static void x8_reset_vlc_tables(IntraX8Context *w)