diff mbox series

[FFmpeg-devel,27/61] avcodec/mv30: Avoid unnecessary VLC structure

Message ID GV1P250MB0737E5CCB0295AE346B51CA38FC3A@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
State Accepted
Commit 99ed510d4b0076a3d809f364109d627c106ec11f
Headers show
Series [FFmpeg-devel,01/61] avcodec/vlc: Add functions to init static VLCElem[] without VLC | expand

Commit Message

Andreas Rheinhardt Sept. 26, 2023, 10:16 p.m. UTC 
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>
---
 libavcodec/mv30.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/mv30.c b/libavcodec/mv30.c
index 9c72c0080d..8c45c8304b 100644
--- a/libavcodec/mv30.c
+++ b/libavcodec/mv30.c
@@ -59,7 +59,7 @@  typedef struct MV30Context {
     AVFrame *prev_frame;
 } MV30Context;
 
-static VLC cbp_tab;
+static VLCElem cbp_tab[1 << CBP_VLC_BITS];
 
 static const uint8_t luma_tab[] = {
     12, 12, 15, 19, 25, 34, 40, 48,
@@ -379,7 +379,7 @@  static int decode_coeffs(GetBitContext *gb, int16_t *coeffs, int nb_codes)
     memset(coeffs, 0, nb_codes * sizeof(*coeffs));
 
     for (int i = 0; i < nb_codes;) {
-        int value = get_vlc2(gb, cbp_tab.table, CBP_VLC_BITS, 1);
+        int value = get_vlc2(gb, cbp_tab, CBP_VLC_BITS, 1);
 
         if (value > 0) {
             int x = get_bits(gb, value);
@@ -657,8 +657,9 @@  static const uint8_t cbp_bits[] = {
 
 static av_cold void init_static_data(void)
 {
-    VLC_INIT_STATIC_FROM_LENGTHS(&cbp_tab, CBP_VLC_BITS, FF_ARRAY_ELEMS(cbp_bits),
-                                 cbp_bits, 1, NULL, 0, 0, 0, 0, 1 << CBP_VLC_BITS);
+    VLC_INIT_STATIC_TABLE_FROM_LENGTHS(cbp_tab, CBP_VLC_BITS,
+                                       FF_ARRAY_ELEMS(cbp_bits),
+                                       cbp_bits, 1, NULL, 0, 0, 0, 0);
 }
 
 static av_cold int decode_init(AVCodecContext *avctx)