comparison flacdec.c @ 9233:8aa63f696237 libavcodec

flacdec: move data size check to flac_decode_frame()

9232:2c3b2ce51b04

    }

    return 0;
}

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

    if (blocksize > s->max_blocksize) {
        av_log(s->avctx, AV_LOG_ERROR, "blocksize %d > %d\n", blocksize,
               s->max_blocksize);
        return -1;
    }

    if (blocksize * s->channels * (s->is32 ? 4 : 2) > alloc_data_size)
        return -1;

    /* sample rate */
    if (sr_code == 0)
        samplerate= s->samplerate;
    else if (sr_code < 12)

    FLACContext *s = avctx->priv_data;
    int i, j = 0, input_buf_size = 0, bytes_read = 0;
    int16_t *samples_16 = data;
    int32_t *samples_32 = data;
    int alloc_data_size= *data_size;

    *data_size=0;

    if (s->max_framesize == 0) {
        s->max_framesize= FFMAX(4, buf_size); // should hopefully be enough for the first header

        goto end; // we may not have enough bits left to decode a frame, so try next time
    }

    /* decode frame */
    init_get_bits(&s->gb, buf, buf_size*8);
    if (decode_frame(s, alloc_data_size) < 0) {
        av_log(s->avctx, AV_LOG_ERROR, "decode_frame() failed\n");
        s->bitstream_size=0;
        s->bitstream_index=0;
        return -1;
    }
    *data_size = s->blocksize * s->channels * (s->is32 ? 4 : 2);
    bytes_read = (get_bits_count(&s->gb)+7)/8;

#define DECORRELATE(left, right)\
            assert(s->channels == 2);\
            for (i = 0; i < s->blocksize; i++) {\
                int a= s->decoded[0][i];\

9233:8aa63f696237

    }

    return 0;
}

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

    if (blocksize > s->max_blocksize) {
        av_log(s->avctx, AV_LOG_ERROR, "blocksize %d > %d\n", blocksize,
               s->max_blocksize);
        return -1;
    }

    /* sample rate */
    if (sr_code == 0)
        samplerate= s->samplerate;
    else if (sr_code < 12)

    FLACContext *s = avctx->priv_data;
    int i, j = 0, input_buf_size = 0, bytes_read = 0;
    int16_t *samples_16 = data;
    int32_t *samples_32 = data;
    int alloc_data_size= *data_size;
    int output_size;

    *data_size=0;

    if (s->max_framesize == 0) {
        s->max_framesize= FFMAX(4, buf_size); // should hopefully be enough for the first header

        goto end; // we may not have enough bits left to decode a frame, so try next time
    }

    /* decode frame */
    init_get_bits(&s->gb, buf, buf_size*8);
    if (decode_frame(s) < 0) {
        av_log(s->avctx, AV_LOG_ERROR, "decode_frame() failed\n");
        s->bitstream_size=0;
        s->bitstream_index=0;
        return -1;
    }
    bytes_read = (get_bits_count(&s->gb)+7)/8;

    /* check if allocated data size is large enough for output */
    output_size = s->blocksize * s->channels * (s->is32 ? 4 : 2);
    if (output_size > alloc_data_size) {
        av_log(s->avctx, AV_LOG_ERROR, "output data size is larger than "
                                       "allocated data size\n");
        return -1;
    }
    *data_size = output_size;

#define DECORRELATE(left, right)\
            assert(s->channels == 2);\
            for (i = 0; i < s->blocksize; i++) {\
                int a= s->decoded[0][i];\