RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

j2k: merge ff_j2k_init_tier1_luts() 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-26 17:42:25 +02:00
parent b67fe48f34
commit e66faf71eb
4 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/j2k.c
View File

@ -161,17 +161,6 @@ static int getsgnctxno(int flag, uint8_t *xorbit)
return ctxlbltab[hcontrib][vcontrib];
}
void ff_j2k_init_tier1_luts(void)
{
int i, j;
for (i = 0; i < 256; i++)
for (j = 0; j < 4; j++)
ff_jpeg2000_sigctxno_lut[i][j] = getsigctxno(i, j);
for (i = 0; i < 16; i++)
for (j = 0; j < 16; j++)
ff_jpeg2000_sgnctxno_lut[i][j] = getsgnctxno(i + (j << 8), &ff_jpeg2000_xorbit_lut[i][j]);
}
void ff_j2k_set_significant(Jpeg2000T1Context *t1, int x, int y, int negative)
{
x++; y++;

2
libavcodec/j2k.h
View File

@ -207,7 +207,7 @@ static inline int ff_jpeg2000_ceildiv(int a, int b)
Jpeg2000TgtNode *ff_j2k_tag_tree_init(int w, int h);
/* TIER-1 routines */
void ff_j2k_init_tier1_luts(void);
void ff_jpeg2000_init_tier1_luts(void);
void ff_j2k_set_significant(Jpeg2000T1Context *t1, int x, int y, int negative);

2
libavcodec/j2kdec.c
View File

@ -1088,7 +1088,7 @@ static av_cold int j2kdec_init(AVCodecContext *avctx)
s->avctx = avctx;
ff_j2k_init_tier1_luts();
ff_jpeg2000_init_tier1_luts();
return 0;
}

2
libavcodec/j2kenc.c
View File

@ -1003,7 +1003,7 @@ static av_cold int j2kenc_init(AVCodecContext *avctx)
s->chroma_shift, s->chroma_shift + 1);
}
ff_j2k_init_tier1_luts();
ff_jpeg2000_init_tier1_luts();
init_luts();