diff mbox series

[FFmpeg-devel,3/5] avcodec/mobiclip: Don't use too big max_depth, inline constants

Message ID 20201024110500.5424-3-andreas.rheinhardt@gmail.com
State Accepted
Commit 924bc6d8602f3fdad3adbd5d18e49877bdb8b2ef
Headers show
Series [FFmpeg-devel,1/5] avcodec/mobiclip: Reduce size of VLCs, inline constants | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished

Commit Message

Andreas Rheinhardt Oct. 24, 2020, 11:04 a.m. UTC 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavcodec/mobiclip.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Michael Niedermayer Oct. 24, 2020, 12:34 p.m. UTC | #1 
On Sat, Oct 24, 2020 at 01:04:58PM +0200, Andreas Rheinhardt wrote:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
>  libavcodec/mobiclip.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)

probably ok

thx

[...]
diff mbox series

Patch

diff --git a/libavcodec/mobiclip.c b/libavcodec/mobiclip.c
index d209a53b07..ab4baac099 100644
--- a/libavcodec/mobiclip.c
+++ b/libavcodec/mobiclip.c
@@ -31,6 +31,7 @@ 
 #include "golomb.h"
 #include "internal.h"
 
+#define MOBI_RL_VLC_BITS 12
 #define MOBI_MV_VLC_BITS 6
 
 static const uint8_t zigzag4x4_tab[] =
@@ -340,14 +341,14 @@  static av_cold int mobiclip_init(AVCodecContext *avctx)
 
     avctx->pix_fmt = AV_PIX_FMT_YUV420P;
 
-    ret = ff_init_vlc_sparse(&s->vlc[0], 12, 104,
+    ret = ff_init_vlc_sparse(&s->vlc[0], MOBI_RL_VLC_BITS, 104,
                              bits0,  sizeof(*bits0),  sizeof(*bits0),
                              codes0, sizeof(*codes0), sizeof(*codes0),
                              syms0,  sizeof(*syms0),  sizeof(*syms0), 0);
     if (ret < 0)
         return ret;
 
-    ret = ff_init_vlc_sparse(&s->vlc[1], 12, 104,
+    ret = ff_init_vlc_sparse(&s->vlc[1], MOBI_RL_VLC_BITS, 104,
                              bits0,  sizeof(*bits0),  sizeof(*bits0),
                              codes0, sizeof(*codes0), sizeof(*codes0),
                              syms1,  sizeof(*syms1),  sizeof(*syms1), 0);
@@ -465,7 +466,7 @@  static void read_run_encoding(AVCodecContext *avctx,
     MobiClipContext *s = avctx->priv_data;
     GetBitContext *gb = &s->gb;
     int n = get_vlc2(gb, s->vlc[s->dct_tab_idx].table,
-                     s->vlc[s->dct_tab_idx].bits, 2);
+                     MOBI_RL_VLC_BITS, 1);
 
     *last = (n >> 11) == 1;
     *run  = (n >> 5) & 0x3F;