comparison mpegaudiodec.c @ 6692:25413354a79a libavcodec

simplify

6691:863e939331aa

    uint32_t header;
    OUT_INT *out_samples = data;
    OUT_INT decoded_buf[MPA_FRAME_SIZE * MPA_MAX_CHANNELS];
    OUT_INT *outptr, *bp;
    int fsize;
    const unsigned char *start2 = buf, *start;
    int fr, i, j, n;
    int off = avctx->channels;
    const uint8_t *coff = chan_offset[s->chan_cfg];

    len = buf_size;

    // If only one decoder interleave is not needed
    outptr = s->frames == 1 ? out_samples : decoded_buf;

    for (fr = 0; fr < s->frames; fr++) {
        start = start2;
        fsize = AV_RB16(start) >> 4;
        fsize = FFMIN3(fsize, len, MPA_MAX_CODED_FRAME_SIZE);
        start2 += fsize;
        len -= fsize;
        m = s->mp3decctx[fr];
        assert (m != NULL);

        // Get header
        header = AV_RB32(start) | 0xfff00000;

        if (ff_mpa_check_header(header) < 0) { // Bad header, discard block
            *data_size = 0;
            return buf_size;
        }

        ff_mpegaudio_decode_header(m, header);
        out_size += mp_decode_frame(m, decoded_buf, start, fsize);

        if(s->frames > 1) {
            n = m->avctx->frame_size*m->nb_channels;
            /* interleave output data */
            bp = out_samples + coff[fr];

6692:25413354a79a

    uint32_t header;
    OUT_INT *out_samples = data;
    OUT_INT decoded_buf[MPA_FRAME_SIZE * MPA_MAX_CHANNELS];
    OUT_INT *outptr, *bp;
    int fsize;
    int fr, i, j, n;
    int off = avctx->channels;
    const uint8_t *coff = chan_offset[s->chan_cfg];

    len = buf_size;

    // If only one decoder interleave is not needed
    outptr = s->frames == 1 ? out_samples : decoded_buf;

    for (fr = 0; fr < s->frames; fr++) {
        fsize = AV_RB16(buf) >> 4;
        fsize = FFMIN3(fsize, len, MPA_MAX_CODED_FRAME_SIZE);
        m = s->mp3decctx[fr];
        assert (m != NULL);

        // Get header
        header = AV_RB32(buf) | 0xfff00000;

        if (ff_mpa_check_header(header) < 0) { // Bad header, discard block
            *data_size = 0;
            return buf_size;
        }

        ff_mpegaudio_decode_header(m, header);
        out_size += mp_decode_frame(m, decoded_buf, buf, fsize);
        buf += fsize;
        len -= fsize;

        if(s->frames > 1) {
            n = m->avctx->frame_size*m->nb_channels;
            /* interleave output data */
            bp = out_samples + coff[fr];