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

Merge commit '70ecc175c7b513a153ac87d1c5d219556ca55070' 

* commit '70ecc175c7b513a153ac87d1c5d219556ca55070':
  alsdec: Fix the clipping range

Conflicts:
	libavcodec/alsdec.c

See: feaff427c0

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-24 10:15:50 +02:00
parent 6bab3430a7 70ecc175c7
commit 865f34823c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/alsdec.c
View File

@ -1169,6 +1169,12 @@ static int decode_blocks(ALSDecContext *ctx, unsigned int ra_frame,
return 0; return 0;
} }
static inline int als_weighting(GetBitContext *gb, int k, int off)
{
int idx = av_clip(decode_rice(gb, k) + off,
0, FF_ARRAY_ELEMS(mcc_weightings) - 1);
return mcc_weightings[idx];
}
/** Read the channel data. /** Read the channel data.
*/ */
@ -1189,14 +1195,14 @@ static int read_channel_data(ALSDecContext *ctx, ALSChannelData *cd, int c)
if (current->master_channel != c) { if (current->master_channel != c) {
current->time_diff_flag = get_bits1(gb); current->time_diff_flag = get_bits1(gb);
current->weighting[0] = mcc_weightings[av_clip(decode_rice(gb, 1) + 16, 0, 31)]; current->weighting[0] = als_weighting(gb, 1, 16);
current->weighting[1] = mcc_weightings[av_clip(decode_rice(gb, 2) + 14, 0, 31)]; current->weighting[1] = als_weighting(gb, 2, 14);
current->weighting[2] = mcc_weightings[av_clip(decode_rice(gb, 1) + 16, 0, 31)]; current->weighting[2] = als_weighting(gb, 1, 16);
if (current->time_diff_flag) { if (current->time_diff_flag) {
current->weighting[3] = mcc_weightings[av_clip(decode_rice(gb, 1) + 16, 0, 31)]; current->weighting[3] = als_weighting(gb, 1, 16);
current->weighting[4] = mcc_weightings[av_clip(decode_rice(gb, 1) + 16, 0, 31)]; current->weighting[4] = als_weighting(gb, 1, 16);
current->weighting[5] = mcc_weightings[av_clip(decode_rice(gb, 1) + 16, 0, 31)]; current->weighting[5] = als_weighting(gb, 1, 16);
current->time_diff_sign = get_bits1(gb); current->time_diff_sign = get_bits1(gb);
current->time_diff_index = get_bits(gb, ctx->ltp_lag_length - 3) + 3; current->time_diff_index = get_bits(gb, ctx->ltp_lag_length - 3) + 3;