comparison flacdec.c @ 9244:cbf65173eed3 libavcodec

flacdec: allow sample rate to change mid-stream, but log a warning message when it does

9243:c09443000c4b

               s->max_blocksize);
        return -1;
    }

    /* sample rate */
    if (sr_code == 0) {
        samplerate= s->samplerate;
    } else if (sr_code < 12) {
        samplerate = ff_flac_sample_rate_table[sr_code];
    } else if (sr_code == 12) {
        samplerate = get_bits(gb, 8) * 1000;
    } else if (sr_code == 13) {
        samplerate = get_bits(gb, 16);

    } else {
        av_log(s->avctx, AV_LOG_ERROR, "illegal sample rate code %d\n",
               sr_code);
        return -1;
    }

    /* header CRC-8 check */
    skip_bits(gb, 8);
    if (av_crc(av_crc_get_table(AV_CRC_8_ATM), 0, gb->buffer,
               get_bits_count(gb)/8)) {
        av_log(s->avctx, AV_LOG_ERROR, "header crc mismatch\n");
        return -1;
    }

    s->blocksize    = blocksize;
    s->samplerate   = samplerate;
    s->bps          = bps;
    s->ch_mode      = ch_mode;

//    dump_headers(s->avctx, (FLACStreaminfo *)s);

9244:cbf65173eed3

               s->max_blocksize);
        return -1;
    }

    /* sample rate */
    if (sr_code < 12) {
        samplerate = ff_flac_sample_rate_table[sr_code];
    } else if (sr_code == 12) {
        samplerate = get_bits(gb, 8) * 1000;
    } else if (sr_code == 13) {
        samplerate = get_bits(gb, 16);

    } else {
        av_log(s->avctx, AV_LOG_ERROR, "illegal sample rate code %d\n",
               sr_code);
        return -1;
    }
    if (samplerate == 0) {
        samplerate = s->samplerate;
    } else if (samplerate != s->samplerate) {
        av_log(s->avctx, AV_LOG_WARNING, "sample rate changed from %d to %d\n",
               s->samplerate, samplerate);
    }

    /* header CRC-8 check */
    skip_bits(gb, 8);
    if (av_crc(av_crc_get_table(AV_CRC_8_ATM), 0, gb->buffer,
               get_bits_count(gb)/8)) {
        av_log(s->avctx, AV_LOG_ERROR, "header crc mismatch\n");
        return -1;
    }

    s->blocksize    = blocksize;
    s->samplerate   = s->avctx->sample_rate = samplerate;
    s->bps          = bps;
    s->ch_mode      = ch_mode;

//    dump_headers(s->avctx, (FLACStreaminfo *)s);