comparison flacdec.c @ 9235:df759d70d6f9 libavcodec

flacdec: give a more accurate error message when validating channel layout. differentiates between invalid values and unsupported values.

9234:49340eb6f96f

}

static int decode_frame(FLACContext *s)
{
    int bs_code, sr_code, bps_code, i;
    int ch_mode, bps, blocksize, samplerate;
    GetBitContext *gb = &s->gb;

    /* frame sync code */
    skip_bits(&s->gb, 16);

    sr_code = get_bits(gb, 4);

    /* channels and decorrelation */
    ch_mode = get_bits(gb, 4);
    if (ch_mode < FLAC_MAX_CHANNELS && s->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);
        return -1;
    }

    /* bits per sample */
    bps_code = get_bits(gb, 3);

9235:df759d70d6f9

}

static int decode_frame(FLACContext *s)
{
    int bs_code, sr_code, bps_code, i;
    int ch_mode, bps, blocksize, samplerate, channels;
    GetBitContext *gb = &s->gb;

    /* frame sync code */
    skip_bits(&s->gb, 16);

    sr_code = get_bits(gb, 4);

    /* 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) {
        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;
    }

    /* bits per sample */
    bps_code = get_bits(gb, 3);