opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-29 12:26:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

flacdec: use get_sbits_long() where needed.

Browse Source 
Originally committed as revision 17741 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles
2009-03-03 02:19:01 +00:00
parent 017c0811a1
commit 9de6e090a7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/flacdec.c
View File

@ -288,7 +288,7 @@ static int decode_residuals(FLACContext *s, int channel, int pred_order)
if (tmp == (method_type == 0 ? 15 : 31)) { if (tmp == (method_type == 0 ? 15 : 31)) {
tmp = get_bits(&s->gb, 5); tmp = get_bits(&s->gb, 5);
for (; i < samples; i++, sample++) for (; i < samples; i++, sample++)
s->decoded[channel][sample] = get_sbits(&s->gb, tmp); s->decoded[channel][sample] = get_sbits_long(&s->gb, tmp);
} else { } else {
for (; i < samples; i++, sample++) { for (; i < samples; i++, sample++) {
s->decoded[channel][sample] = get_sr_golomb_flac(&s->gb, tmp, INT_MAX, 0); s->decoded[channel][sample] = get_sr_golomb_flac(&s->gb, tmp, INT_MAX, 0);
@ -308,7 +308,7 @@ static int decode_subframe_fixed(FLACContext *s, int channel, int pred_order)
/* warm up samples */ /* warm up samples */
for (i = 0; i < pred_order; i++) { for (i = 0; i < pred_order; i++) {
decoded[i] = get_sbits(&s->gb, s->curr_bps); decoded[i] = get_sbits_long(&s->gb, s->curr_bps);
} }
if (decode_residuals(s, channel, pred_order) < 0) if (decode_residuals(s, channel, pred_order) < 0)
@ -359,7 +359,7 @@ static int decode_subframe_lpc(FLACContext *s, int channel, int pred_order)
/* warm up samples */ /* warm up samples */
for (i = 0; i < pred_order; i++) { for (i = 0; i < pred_order; i++) {
decoded[i] = get_sbits(&s->gb, s->curr_bps); decoded[i] = get_sbits_long(&s->gb, s->curr_bps);
} }
coeff_prec = get_bits(&s->gb, 4) + 1; coeff_prec = get_bits(&s->gb, 4) + 1;
@ -446,12 +446,12 @@ static inline int decode_subframe(FLACContext *s, int channel)
//FIXME use av_log2 for types //FIXME use av_log2 for types
if (type == 0) { if (type == 0) {
tmp = get_sbits(&s->gb, s->curr_bps); tmp = get_sbits_long(&s->gb, s->curr_bps);
for (i = 0; i < s->blocksize; i++) for (i = 0; i < s->blocksize; i++)
s->decoded[channel][i] = tmp; s->decoded[channel][i] = tmp;
} else if (type == 1) { } else if (type == 1) {
for (i = 0; i < s->blocksize; i++) for (i = 0; i < s->blocksize; i++)
s->decoded[channel][i] = get_sbits(&s->gb, s->curr_bps); s->decoded[channel][i] = get_sbits_long(&s->gb, s->curr_bps);
} else if ((type >= 8) && (type <= 12)) { } else if ((type >= 8) && (type <= 12)) {
if (decode_subframe_fixed(s, channel, type & ~0x8) < 0) if (decode_subframe_fixed(s, channel, type & ~0x8) < 0)
return -1; return -1;