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

diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index b067dc5..eea2b0e 100644 (file)
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -483,7 +483,7 @@ static inline int decode_subframe(FLACContext *s, int channel)
 static int decode_frame(FLACContext *s)
 {
     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;
 
     /* frame sync code */
@@ -496,10 +496,17 @@ static int decode_frame(FLACContext *s)
     /* channels and decorrelation */
     ch_mode = get_bits(gb, 4);
     if (ch_mode < FLAC_MAX_CHANNELS && s->channels == ch_mode+1) {
+        channels = ch_mode + 1;
         ch_mode = FLAC_CHMODE_INDEPENDENT;
-    } else if (ch_mode > FLAC_CHMODE_MID_SIDE || s->channels != 2) {
-        av_log(s->avctx, AV_LOG_ERROR, "unsupported channel assignment %d (channels=%d)\n",
-               ch_mode, s->channels);
+    } else if (ch_mode <= FLAC_CHMODE_MID_SIDE) {
+        channels = 2;
+    } 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;
     }