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

flacdec: give a more accurate error message when validating channel 

layout. differentiates between invalid values and unsupported values.

Originally committed as revision 18153 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2009-03-22 21:07:43 +00:00
parent d2863e72ab
commit 7660dc6f4f
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/flacdec.c
View File

@ -483,7 +483,7 @@ static inline int decode_subframe(FLACContext *s, int channel)
static int decode_frame(FLACContext *s) static int decode_frame(FLACContext *s)
{ {
int bs_code, sr_code, bps_code, i; int bs_code, sr_code, bps_code, i;
int ch_mode, bps, blocksize, samplerate; int ch_mode, bps, blocksize, samplerate, channels;
GetBitContext *gb = &s->gb; GetBitContext *gb = &s->gb;
/* frame sync code */ /* frame sync code */
@ -496,10 +496,17 @@ static int decode_frame(FLACContext *s)
/* channels and decorrelation */ /* channels and decorrelation */
ch_mode = get_bits(gb, 4); ch_mode = get_bits(gb, 4);
if (ch_mode < FLAC_MAX_CHANNELS && s->channels == ch_mode+1) { if (ch_mode < FLAC_MAX_CHANNELS && s->channels == ch_mode+1) {
channels = ch_mode + 1;
ch_mode = FLAC_CHMODE_INDEPENDENT; ch_mode = FLAC_CHMODE_INDEPENDENT;
} else if (ch_mode > FLAC_CHMODE_MID_SIDE || s->channels != 2) { } else if (ch_mode <= FLAC_CHMODE_MID_SIDE) {
av_log(s->avctx, AV_LOG_ERROR, "unsupported channel assignment %d (channels=%d)\n", channels = 2;
ch_mode, s->channels); } else {
av_log(s->avctx, AV_LOG_ERROR, "invalid channel mode: %d\n", ch_mode);
return -1;
}
if (channels != s->channels) {
av_log(s->avctx, AV_LOG_ERROR, "switching channel layout mid-stream "
"is not supported\n");
return -1; return -1;
} }