RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-19 05:40:56 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/hqx: Inline constants

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-11-07 10:31:59 +01:00
parent b1af617f51
commit a03caa384f
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/hqx.c
View File

@ -197,7 +197,7 @@ static int hqx_decode_422a(HQXContext *ctx, int slice_no, int x, int y)
int i, ret; int i, ret;
int cbp; int cbp;
cbp = get_vlc2(gb, ctx->cbp_vlc.table, ctx->cbp_vlc.bits, 1); cbp = get_vlc2(gb, ctx->cbp_vlc.table, HQX_CBP_VLC_BITS, 1);
for (i = 0; i < 12; i++) for (i = 0; i < 12; i++)
memset(slice->block[i], 0, sizeof(**slice->block) * 64); memset(slice->block[i], 0, sizeof(**slice->block) * 64);
@ -283,7 +283,7 @@ static int hqx_decode_444a(HQXContext *ctx, int slice_no, int x, int y)
int i, ret; int i, ret;
int cbp; int cbp;
cbp = get_vlc2(gb, ctx->cbp_vlc.table, ctx->cbp_vlc.bits, 1); cbp = get_vlc2(gb, ctx->cbp_vlc.table, HQX_CBP_VLC_BITS, 1);
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
memset(slice->block[i], 0, sizeof(**slice->block) * 64); memset(slice->block[i], 0, sizeof(**slice->block) * 64);

1
libavcodec/hqx.h
View File

@ -77,6 +77,7 @@ typedef struct HQXContext {
VLC dc_vlc[3]; VLC dc_vlc[3];
} HQXContext; } HQXContext;
#define HQX_CBP_VLC_BITS 5
#define HQX_DC_VLC_BITS 9 #define HQX_DC_VLC_BITS 9
extern const HQXAC ff_hqx_ac[NUM_HQX_AC]; extern const HQXAC ff_hqx_ac[NUM_HQX_AC];

2
libavcodec/hqxvlc.c
View File

@ -2150,7 +2150,7 @@ const HQXAC ff_hqx_ac[NUM_HQX_AC] = {
av_cold int ff_hqx_init_vlcs(HQXContext *ctx) av_cold int ff_hqx_init_vlcs(HQXContext *ctx)
{ {
int ret = init_vlc(&ctx->cbp_vlc, 5, FF_ARRAY_ELEMS(cbp_vlc_lens), int ret = init_vlc(&ctx->cbp_vlc, HQX_CBP_VLC_BITS, FF_ARRAY_ELEMS(cbp_vlc_lens),
cbp_vlc_lens, 1, 1, cbp_vlc_bits, 1, 1, 0); cbp_vlc_lens, 1, 1, cbp_vlc_bits, 1, 1, 0);
if (ret < 0) if (ret < 0)
return ret; return ret;