generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/diracdec: Replace default_bsep[] by multiplication

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-07 05:07:55 +02:00
parent 21b30947f2
commit 9253cc496a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/diracdec.c
View File

@ -872,7 +872,6 @@ static void init_planes(DiracContext *s)
static int dirac_unpack_prediction_parameters(DiracContext *s) static int dirac_unpack_prediction_parameters(DiracContext *s)
{ {
static const uint8_t default_blen[] = { 4, 12, 16, 24 }; static const uint8_t default_blen[] = { 4, 12, 16, 24 };
static const uint8_t default_bsep[] = { 4, 8, 12, 16 };
GetBitContext *gb = &s->gb; GetBitContext *gb = &s->gb;
unsigned idx, ref; unsigned idx, ref;
@ -896,8 +895,8 @@ static int dirac_unpack_prediction_parameters(DiracContext *s)
/*[DIRAC_STD] preset_block_params(index). Table 11.1 */ /*[DIRAC_STD] preset_block_params(index). Table 11.1 */
s->plane[0].xblen = default_blen[idx-1]; s->plane[0].xblen = default_blen[idx-1];
s->plane[0].yblen = default_blen[idx-1]; s->plane[0].yblen = default_blen[idx-1];
s->plane[0].xbsep = default_bsep[idx-1]; s->plane[0].xbsep = 4 * idx;
s->plane[0].ybsep = default_bsep[idx-1]; s->plane[0].ybsep = 4 * idx;
} }
/*[DIRAC_STD] 11.2.4 motion_data_dimensions() /*[DIRAC_STD] 11.2.4 motion_data_dimensions()
Calculated in function dirac_unpack_block_motion_data */ Calculated in function dirac_unpack_block_motion_data */