diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-09-24 15:34:31 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-10-31 20:47:00 +0100 |
| commit | 36e7f9b3395d3be21fb77462f2c620487b92784d (patch) | |
| tree | 702622d8c2af6c8835841c1c5fa10cc21d3ad335 | |
| parent | 99ed510d4b0076a3d809f364109d627c106ec11f (diff) | |
| download | ffmpeg-36e7f9b3395d3be21fb77462f2c620487b92784d.tar.gz | |
avcodec/vqcdec: Avoid unnecessary VLC structure
Everything besides VLC.table is basically write-only
and even VLC.table can be removed by accessing the
underlying table directly.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/vqcdec.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavcodec/vqcdec.c b/libavcodec/vqcdec.c index 462d810a2f..dc9248d99f 100644 --- a/libavcodec/vqcdec.c +++ b/libavcodec/vqcdec.c @@ -49,14 +49,15 @@ static const int8_t vector_symbols[] = { 2, 3, 4, SIGNED_8BIT, -2, -3, -4, SIGNED_6BIT }; -static VLC vector_vlc; +static VLCElem vector_vlc[1 << VECTOR_VLC_BITS]; static av_cold void vqc_init_static_data(void) { - VLC_INIT_STATIC_FROM_LENGTHS(&vector_vlc, VECTOR_VLC_BITS, FF_ARRAY_ELEMS(vector_nbits), - vector_nbits, 1, - vector_symbols, 1, 1, - 0, 0, 1 << VECTOR_VLC_BITS); + VLC_INIT_STATIC_TABLE_FROM_LENGTHS(vector_vlc, VECTOR_VLC_BITS, + FF_ARRAY_ELEMS(vector_nbits), + vector_nbits, 1, + vector_symbols, 1, 1, + 0, 0); } typedef struct VqcContext { @@ -171,7 +172,7 @@ static int decode_vectors(VqcContext * s, const uint8_t * buf, int size, int wid continue; } - symbol = get_vlc2(&gb, vector_vlc.table, VECTOR_VLC_BITS, 1); + symbol = get_vlc2(&gb, vector_vlc, VECTOR_VLC_BITS, 1); switch(symbol) { case SKIP_3: dst += 3; break; case SKIP_4: dst += 4; break; |