Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qdm2: Allow hard-coding VLC tables.

Browse Source 
Also adds a lot of infrastructure necessary for it.
Some of it is a bit ugly though.
Increases binary size for hardcoded tables by about 12 kB,
which is about 15 kB from qdm2_table minus data and code
saved that was only used for creating it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
pull/101/head
Reimar Döffinger 11 years ago
parent de6d44829c
commit 70d80ed40f
5 changed files with 265 additions and 166 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 167
      libavcodec/qdm2.c
  2. 19
      libavcodec/qdm2_tablegen.c
  3. 164
      libavcodec/qdm2_tablegen.h
  4. 1
      libavcodec/tableprint.h
  5. 80
      libavcodec/tableprint_vlc.h

167
libavcodec/qdm2.c
Unescape View File

@ -44,7 +44,6 @@
#include "mpegaudiodsp.h" #include "mpegaudiodsp.h"
#include "mpegaudio.h" #include "mpegaudio.h"
#include "qdm2data.h"
#include "qdm2_tablegen.h" #include "qdm2_tablegen.h"
#undef NDEBUG #undef NDEBUG
@ -197,173 +196,11 @@ typedef struct {
int noise_idx; ///< index for dithering noise table int noise_idx; ///< index for dithering noise table
} QDM2Context; } QDM2Context;
static VLC vlc_tab_level;
static VLC vlc_tab_diff;
static VLC vlc_tab_run;
static VLC fft_level_exp_alt_vlc;
static VLC fft_level_exp_vlc;
static VLC fft_stereo_exp_vlc;
static VLC fft_stereo_phase_vlc;
static VLC vlc_tab_tone_level_idx_hi1;
static VLC vlc_tab_tone_level_idx_mid;
static VLC vlc_tab_tone_level_idx_hi2;
static VLC vlc_tab_type30;
static VLC vlc_tab_type34;
static VLC vlc_tab_fft_tone_offset[5];
static const uint16_t qdm2_vlc_offs[] = {
0,260,566,598,894,1166,1230,1294,1678,1950,2214,2278,2310,2570,2834,3124,3448,3838,
};
static const int switchtable[23] = { static const int switchtable[23] = {
0, 5, 1, 5, 5, 5, 5, 5, 2, 5, 5, 5, 5, 5, 5, 5, 3, 5, 5, 5, 5, 5, 4 0, 5, 1, 5, 5, 5, 5, 5, 2, 5, 5, 5, 5, 5, 5, 5, 3, 5, 5, 5, 5, 5, 4
}; };
static av_cold void qdm2_init_vlc(void) static int qdm2_get_vlc(GetBitContext *gb, const VLC *vlc, int flag, int depth)
{
static VLC_TYPE qdm2_table[3838][2];
vlc_tab_level.table = &qdm2_table[qdm2_vlc_offs[0]];
vlc_tab_level.table_allocated = qdm2_vlc_offs[1] - qdm2_vlc_offs[0];
init_vlc(&vlc_tab_level, 8, 24,
vlc_tab_level_huffbits, 1, 1,
vlc_tab_level_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_diff.table = &qdm2_table[qdm2_vlc_offs[1]];
vlc_tab_diff.table_allocated = qdm2_vlc_offs[2] - qdm2_vlc_offs[1];
init_vlc(&vlc_tab_diff, 8, 37,
vlc_tab_diff_huffbits, 1, 1,
vlc_tab_diff_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_run.table = &qdm2_table[qdm2_vlc_offs[2]];
vlc_tab_run.table_allocated = qdm2_vlc_offs[3] - qdm2_vlc_offs[2];
init_vlc(&vlc_tab_run, 5, 6,
vlc_tab_run_huffbits, 1, 1,
vlc_tab_run_huffcodes, 1, 1,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
fft_level_exp_alt_vlc.table = &qdm2_table[qdm2_vlc_offs[3]];
fft_level_exp_alt_vlc.table_allocated = qdm2_vlc_offs[4] -
qdm2_vlc_offs[3];
init_vlc(&fft_level_exp_alt_vlc, 8, 28,
fft_level_exp_alt_huffbits, 1, 1,
fft_level_exp_alt_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
fft_level_exp_vlc.table = &qdm2_table[qdm2_vlc_offs[4]];
fft_level_exp_vlc.table_allocated = qdm2_vlc_offs[5] - qdm2_vlc_offs[4];
init_vlc(&fft_level_exp_vlc, 8, 20,
fft_level_exp_huffbits, 1, 1,
fft_level_exp_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
fft_stereo_exp_vlc.table = &qdm2_table[qdm2_vlc_offs[5]];
fft_stereo_exp_vlc.table_allocated = qdm2_vlc_offs[6] -
qdm2_vlc_offs[5];
init_vlc(&fft_stereo_exp_vlc, 6, 7,
fft_stereo_exp_huffbits, 1, 1,
fft_stereo_exp_huffcodes, 1, 1,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
fft_stereo_phase_vlc.table = &qdm2_table[qdm2_vlc_offs[6]];
fft_stereo_phase_vlc.table_allocated = qdm2_vlc_offs[7] -
qdm2_vlc_offs[6];
init_vlc(&fft_stereo_phase_vlc, 6, 9,
fft_stereo_phase_huffbits, 1, 1,
fft_stereo_phase_huffcodes, 1, 1,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_tone_level_idx_hi1.table =
&qdm2_table[qdm2_vlc_offs[7]];
vlc_tab_tone_level_idx_hi1.table_allocated = qdm2_vlc_offs[8] -
qdm2_vlc_offs[7];
init_vlc(&vlc_tab_tone_level_idx_hi1, 8, 20,
vlc_tab_tone_level_idx_hi1_huffbits, 1, 1,
vlc_tab_tone_level_idx_hi1_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_tone_level_idx_mid.table =
&qdm2_table[qdm2_vlc_offs[8]];
vlc_tab_tone_level_idx_mid.table_allocated = qdm2_vlc_offs[9] -
qdm2_vlc_offs[8];
init_vlc(&vlc_tab_tone_level_idx_mid, 8, 24,
vlc_tab_tone_level_idx_mid_huffbits, 1, 1,
vlc_tab_tone_level_idx_mid_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_tone_level_idx_hi2.table =
&qdm2_table[qdm2_vlc_offs[9]];
vlc_tab_tone_level_idx_hi2.table_allocated = qdm2_vlc_offs[10] -
qdm2_vlc_offs[9];
init_vlc(&vlc_tab_tone_level_idx_hi2, 8, 24,
vlc_tab_tone_level_idx_hi2_huffbits, 1, 1,
vlc_tab_tone_level_idx_hi2_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_type30.table = &qdm2_table[qdm2_vlc_offs[10]];
vlc_tab_type30.table_allocated = qdm2_vlc_offs[11] - qdm2_vlc_offs[10];
init_vlc(&vlc_tab_type30, 6, 9,
vlc_tab_type30_huffbits, 1, 1,
vlc_tab_type30_huffcodes, 1, 1,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_type34.table = &qdm2_table[qdm2_vlc_offs[11]];
vlc_tab_type34.table_allocated = qdm2_vlc_offs[12] - qdm2_vlc_offs[11];
init_vlc(&vlc_tab_type34, 5, 10,
vlc_tab_type34_huffbits, 1, 1,
vlc_tab_type34_huffcodes, 1, 1,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_fft_tone_offset[0].table =
&qdm2_table[qdm2_vlc_offs[12]];
vlc_tab_fft_tone_offset[0].table_allocated = qdm2_vlc_offs[13] -
qdm2_vlc_offs[12];
init_vlc(&vlc_tab_fft_tone_offset[0], 8, 23,
vlc_tab_fft_tone_offset_0_huffbits, 1, 1,
vlc_tab_fft_tone_offset_0_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_fft_tone_offset[1].table =
&qdm2_table[qdm2_vlc_offs[13]];
vlc_tab_fft_tone_offset[1].table_allocated = qdm2_vlc_offs[14] -
qdm2_vlc_offs[13];
init_vlc(&vlc_tab_fft_tone_offset[1], 8, 28,
vlc_tab_fft_tone_offset_1_huffbits, 1, 1,
vlc_tab_fft_tone_offset_1_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_fft_tone_offset[2].table =
&qdm2_table[qdm2_vlc_offs[14]];
vlc_tab_fft_tone_offset[2].table_allocated = qdm2_vlc_offs[15] -
qdm2_vlc_offs[14];
init_vlc(&vlc_tab_fft_tone_offset[2], 8, 32,
vlc_tab_fft_tone_offset_2_huffbits, 1, 1,
vlc_tab_fft_tone_offset_2_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_fft_tone_offset[3].table =
&qdm2_table[qdm2_vlc_offs[15]];
vlc_tab_fft_tone_offset[3].table_allocated = qdm2_vlc_offs[16] -
qdm2_vlc_offs[15];
init_vlc(&vlc_tab_fft_tone_offset[3], 8, 35,
vlc_tab_fft_tone_offset_3_huffbits, 1, 1,
vlc_tab_fft_tone_offset_3_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_fft_tone_offset[4].table =
&qdm2_table[qdm2_vlc_offs[16]];
vlc_tab_fft_tone_offset[4].table_allocated = qdm2_vlc_offs[17] -
qdm2_vlc_offs[16];
init_vlc(&vlc_tab_fft_tone_offset[4], 8, 38,
vlc_tab_fft_tone_offset_4_huffbits, 1, 1,
vlc_tab_fft_tone_offset_4_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
}
static int qdm2_get_vlc(GetBitContext *gb, VLC *vlc, int flag, int depth)
{ {
int value; int value;
@ -392,7 +229,7 @@ static int qdm2_get_vlc(GetBitContext *gb, VLC *vlc, int flag, int depth)
return value; return value;
} }
static int qdm2_get_se_vlc(VLC *vlc, GetBitContext *gb, int depth) static int qdm2_get_se_vlc(const VLC *vlc, GetBitContext *gb, int depth)
{ {
int value = qdm2_get_vlc(gb, vlc, 0, depth); int value = qdm2_get_vlc(gb, vlc, 0, depth);

19
libavcodec/qdm2_tablegen.c
Unescape View File

@ -21,9 +21,9 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include "tableprint_vlc.h"
#define CONFIG_HARDCODED_TABLES 0 #define CONFIG_HARDCODED_TABLES 0
#include "qdm2_tablegen.h" #include "qdm2_tablegen.h"
#include "tableprint.h"
int main(void) int main(void)
{ {
@ -40,5 +40,22 @@ int main(void)
WRITE_2D_ARRAY("static const", uint8_t, random_dequant_index); WRITE_2D_ARRAY("static const", uint8_t, random_dequant_index);
WRITE_2D_ARRAY("static const", uint8_t, random_dequant_type24); WRITE_2D_ARRAY("static const", uint8_t, random_dequant_type24);
qdm2_init_vlc();
WRITE_2D_ARRAY("static const", VLC_TYPE, qdm2_table);
WRITE_VLC_TYPE("static const", vlc_tab_level, qdm2_table);
WRITE_VLC_TYPE("static const", vlc_tab_diff, qdm2_table);
WRITE_VLC_TYPE("static const", vlc_tab_run, qdm2_table);
WRITE_VLC_TYPE("static const", fft_level_exp_alt_vlc, qdm2_table);
WRITE_VLC_TYPE("static const", fft_level_exp_vlc, qdm2_table);
WRITE_VLC_TYPE("static const", fft_stereo_exp_vlc, qdm2_table);
WRITE_VLC_TYPE("static const", fft_stereo_phase_vlc, qdm2_table);
WRITE_VLC_TYPE("static const", vlc_tab_tone_level_idx_hi1, qdm2_table);
WRITE_VLC_TYPE("static const", vlc_tab_tone_level_idx_mid, qdm2_table);
WRITE_VLC_TYPE("static const", vlc_tab_tone_level_idx_hi2, qdm2_table);
WRITE_VLC_TYPE("static const", vlc_tab_type30, qdm2_table);
WRITE_VLC_TYPE("static const", vlc_tab_type34, qdm2_table);
WRITE_VLC_ARRAY("static const", vlc_tab_fft_tone_offset, qdm2_table);
return 0; return 0;
} }

164
libavcodec/qdm2_tablegen.h
Unescape View File

@ -26,6 +26,7 @@
#include <stdint.h> #include <stdint.h>
#include <math.h> #include <math.h>
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "qdm2data.h"
#define SOFTCLIP_THRESHOLD 27600 #define SOFTCLIP_THRESHOLD 27600
#define HARDCLIP_THRESHOLD 35716 #define HARDCLIP_THRESHOLD 35716
@ -34,6 +35,7 @@
#define softclip_table_init() #define softclip_table_init()
#define rnd_table_init() #define rnd_table_init()
#define init_noise_samples() #define init_noise_samples()
#define qdm2_init_vlc()
#include "libavcodec/qdm2_tables.h" #include "libavcodec/qdm2_tables.h"
#else #else
static uint16_t softclip_table[HARDCLIP_THRESHOLD - SOFTCLIP_THRESHOLD + 1]; static uint16_t softclip_table[HARDCLIP_THRESHOLD - SOFTCLIP_THRESHOLD + 1];
@ -92,6 +94,168 @@ static av_cold void init_noise_samples(void) {
noise_samples[i] = (delta * (float)((random_seed >> 16) & 0x00007fff) - 1.0); noise_samples[i] = (delta * (float)((random_seed >> 16) & 0x00007fff) - 1.0);
} }
} }
static VLC vlc_tab_level;
static VLC vlc_tab_diff;
static VLC vlc_tab_run;
static VLC fft_level_exp_alt_vlc;
static VLC fft_level_exp_vlc;
static VLC fft_stereo_exp_vlc;
static VLC fft_stereo_phase_vlc;
static VLC vlc_tab_tone_level_idx_hi1;
static VLC vlc_tab_tone_level_idx_mid;
static VLC vlc_tab_tone_level_idx_hi2;
static VLC vlc_tab_type30;
static VLC vlc_tab_type34;
static VLC vlc_tab_fft_tone_offset[5];
static const uint16_t qdm2_vlc_offs[] = {
0,260,566,598,894,1166,1230,1294,1678,1950,2214,2278,2310,2570,2834,3124,3448,3838,
};
static VLC_TYPE qdm2_table[3838][2];
static av_cold void qdm2_init_vlc(void)
{
vlc_tab_level.table = &qdm2_table[qdm2_vlc_offs[0]];
vlc_tab_level.table_allocated = qdm2_vlc_offs[1] - qdm2_vlc_offs[0];
init_vlc(&vlc_tab_level, 8, 24,
vlc_tab_level_huffbits, 1, 1,
vlc_tab_level_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_diff.table = &qdm2_table[qdm2_vlc_offs[1]];
vlc_tab_diff.table_allocated = qdm2_vlc_offs[2] - qdm2_vlc_offs[1];
init_vlc(&vlc_tab_diff, 8, 37,
vlc_tab_diff_huffbits, 1, 1,
vlc_tab_diff_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_run.table = &qdm2_table[qdm2_vlc_offs[2]];
vlc_tab_run.table_allocated = qdm2_vlc_offs[3] - qdm2_vlc_offs[2];
init_vlc(&vlc_tab_run, 5, 6,
vlc_tab_run_huffbits, 1, 1,
vlc_tab_run_huffcodes, 1, 1,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
fft_level_exp_alt_vlc.table = &qdm2_table[qdm2_vlc_offs[3]];
fft_level_exp_alt_vlc.table_allocated = qdm2_vlc_offs[4] -
qdm2_vlc_offs[3];
init_vlc(&fft_level_exp_alt_vlc, 8, 28,
fft_level_exp_alt_huffbits, 1, 1,
fft_level_exp_alt_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
fft_level_exp_vlc.table = &qdm2_table[qdm2_vlc_offs[4]];
fft_level_exp_vlc.table_allocated = qdm2_vlc_offs[5] - qdm2_vlc_offs[4];
init_vlc(&fft_level_exp_vlc, 8, 20,
fft_level_exp_huffbits, 1, 1,
fft_level_exp_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
fft_stereo_exp_vlc.table = &qdm2_table[qdm2_vlc_offs[5]];
fft_stereo_exp_vlc.table_allocated = qdm2_vlc_offs[6] -
qdm2_vlc_offs[5];
init_vlc(&fft_stereo_exp_vlc, 6, 7,
fft_stereo_exp_huffbits, 1, 1,
fft_stereo_exp_huffcodes, 1, 1,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
fft_stereo_phase_vlc.table = &qdm2_table[qdm2_vlc_offs[6]];
fft_stereo_phase_vlc.table_allocated = qdm2_vlc_offs[7] -
qdm2_vlc_offs[6];
init_vlc(&fft_stereo_phase_vlc, 6, 9,
fft_stereo_phase_huffbits, 1, 1,
fft_stereo_phase_huffcodes, 1, 1,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_tone_level_idx_hi1.table =
&qdm2_table[qdm2_vlc_offs[7]];
vlc_tab_tone_level_idx_hi1.table_allocated = qdm2_vlc_offs[8] -
qdm2_vlc_offs[7];
init_vlc(&vlc_tab_tone_level_idx_hi1, 8, 20,
vlc_tab_tone_level_idx_hi1_huffbits, 1, 1,
vlc_tab_tone_level_idx_hi1_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_tone_level_idx_mid.table =
&qdm2_table[qdm2_vlc_offs[8]];
vlc_tab_tone_level_idx_mid.table_allocated = qdm2_vlc_offs[9] -
qdm2_vlc_offs[8];
init_vlc(&vlc_tab_tone_level_idx_mid, 8, 24,
vlc_tab_tone_level_idx_mid_huffbits, 1, 1,
vlc_tab_tone_level_idx_mid_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_tone_level_idx_hi2.table =
&qdm2_table[qdm2_vlc_offs[9]];
vlc_tab_tone_level_idx_hi2.table_allocated = qdm2_vlc_offs[10] -
qdm2_vlc_offs[9];
init_vlc(&vlc_tab_tone_level_idx_hi2, 8, 24,
vlc_tab_tone_level_idx_hi2_huffbits, 1, 1,
vlc_tab_tone_level_idx_hi2_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_type30.table = &qdm2_table[qdm2_vlc_offs[10]];
vlc_tab_type30.table_allocated = qdm2_vlc_offs[11] - qdm2_vlc_offs[10];
init_vlc(&vlc_tab_type30, 6, 9,
vlc_tab_type30_huffbits, 1, 1,
vlc_tab_type30_huffcodes, 1, 1,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_type34.table = &qdm2_table[qdm2_vlc_offs[11]];
vlc_tab_type34.table_allocated = qdm2_vlc_offs[12] - qdm2_vlc_offs[11];
init_vlc(&vlc_tab_type34, 5, 10,
vlc_tab_type34_huffbits, 1, 1,
vlc_tab_type34_huffcodes, 1, 1,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_fft_tone_offset[0].table =
&qdm2_table[qdm2_vlc_offs[12]];
vlc_tab_fft_tone_offset[0].table_allocated = qdm2_vlc_offs[13] -
qdm2_vlc_offs[12];
init_vlc(&vlc_tab_fft_tone_offset[0], 8, 23,
vlc_tab_fft_tone_offset_0_huffbits, 1, 1,
vlc_tab_fft_tone_offset_0_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_fft_tone_offset[1].table =
&qdm2_table[qdm2_vlc_offs[13]];
vlc_tab_fft_tone_offset[1].table_allocated = qdm2_vlc_offs[14] -
qdm2_vlc_offs[13];
init_vlc(&vlc_tab_fft_tone_offset[1], 8, 28,
vlc_tab_fft_tone_offset_1_huffbits, 1, 1,
vlc_tab_fft_tone_offset_1_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_fft_tone_offset[2].table =
&qdm2_table[qdm2_vlc_offs[14]];
vlc_tab_fft_tone_offset[2].table_allocated = qdm2_vlc_offs[15] -
qdm2_vlc_offs[14];
init_vlc(&vlc_tab_fft_tone_offset[2], 8, 32,
vlc_tab_fft_tone_offset_2_huffbits, 1, 1,
vlc_tab_fft_tone_offset_2_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_fft_tone_offset[3].table =
&qdm2_table[qdm2_vlc_offs[15]];
vlc_tab_fft_tone_offset[3].table_allocated = qdm2_vlc_offs[16] -
qdm2_vlc_offs[15];
init_vlc(&vlc_tab_fft_tone_offset[3], 8, 35,
vlc_tab_fft_tone_offset_3_huffbits, 1, 1,
vlc_tab_fft_tone_offset_3_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
vlc_tab_fft_tone_offset[4].table =
&qdm2_table[qdm2_vlc_offs[16]];
vlc_tab_fft_tone_offset[4].table_allocated = qdm2_vlc_offs[17] -
qdm2_vlc_offs[16];
init_vlc(&vlc_tab_fft_tone_offset[4], 8, 38,
vlc_tab_fft_tone_offset_4_huffbits, 1, 1,
vlc_tab_fft_tone_offset_4_huffcodes, 2, 2,
INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
}
#endif /* CONFIG_HARDCODED_TABLES */ #endif /* CONFIG_HARDCODED_TABLES */
#endif /* AVCODEC_QDM2_TABLEGEN_H */ #endif /* AVCODEC_QDM2_TABLEGEN_H */

1
libavcodec/tableprint.h
Unescape View File

@ -114,6 +114,7 @@ void write_float_2d_array (const void *, int, int);
WRITE_1D_FUNC(int8_t, "%3"PRIi8, 15) WRITE_1D_FUNC(int8_t, "%3"PRIi8, 15)
WRITE_1D_FUNC(uint8_t, "0x%02"PRIx8, 15) WRITE_1D_FUNC(uint8_t, "0x%02"PRIx8, 15)
WRITE_1D_FUNC(uint16_t, "0x%08"PRIx16, 7) WRITE_1D_FUNC(uint16_t, "0x%08"PRIx16, 7)
WRITE_1D_FUNC(int16_t, "%5"PRIi16, 7)
WRITE_1D_FUNC(uint32_t, "0x%08"PRIx32, 7) WRITE_1D_FUNC(uint32_t, "0x%08"PRIx32, 7)
WRITE_1D_FUNC(float, "%.18e", 3) WRITE_1D_FUNC(float, "%.18e", 3)

80
libavcodec/tableprint_vlc.h
Unescape View File

@ -0,0 +1,80 @@
/*
* Helpers for generating hard-coded VLC tables
*
* Copyright (c) 2014 Reimar Döffinger <Reimar.Doeffinger@gmx.de>
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_TABLEPRINT_VLC_H
#define AVCODEC_TABLEPRINT_VLC_H
#define FFMPEG_CONFIG_H
#define AVUTIL_LOG_H
#define av_log(a, ...)
#define av_dlog(a, ...)
#define AVUTIL_MEM_H
#define av_malloc(s) NULL
#define av_malloc_array(a, b) NULL
#define av_realloc_f(p, o, n) NULL
#define av_free(p)
#define av_freep(p)
#define AVCODEC_AVCODEC_H
#include "tableprint.h"
#include "get_bits.h"
#include "mathtables.c"
#include "bitstream.c"
#define REPLACE_DEFINE2(type) write_##type##_array
#define REPLACE_DEFINE(type) REPLACE_DEFINE2(type)
static void write_VLC_TYPE_array(const VLC_TYPE *p, int s) {
REPLACE_DEFINE(VLC_TYPE)(p, s);
}
WRITE_2D_FUNC(VLC_TYPE)
static void write_vlc_type(const VLC *vlc, VLC_TYPE (*base_table)[2], const char *base_table_name)
{
printf(" .bits = %i,\n", vlc->bits);
// Unfortunately need to cast away const currently
printf(" .table = (VLC_TYPE (*)[2])(%s + 0x%x),\n", base_table_name, (int)(vlc->table - base_table));
printf(" .table_size = 0x%x,\n", vlc->table_size);
printf(" .table_allocated = 0x%x,\n", vlc->table_allocated);
}
#define WRITE_VLC_TYPE(prefix, name, base_table) \
do { \
printf(prefix" VLC "#name" = {\n"); \
write_vlc_type(&name, base_table, #base_table); \
printf("};\n"); \
} while(0)
#define WRITE_VLC_ARRAY(prefix, name, base_table) \
do { \
int i; \
const size_t array_size = FF_ARRAY_ELEMS(name); \
printf(prefix" VLC "#name"[%"FMT"] = {{\n", \
array_size); \
for (i = 0; i < array_size; i++) { \
write_vlc_type(name + i, \
base_table, #base_table); \
if (i != array_size - 1) printf("}, {\n"); \
} \
printf("}};\n"); \
} while(0)
#endif /* AVCODEC_TABLEPRINT_VLC_H */
Write Preview
Loading…
Cancel
Save