comparison aacenc.c @ 9941:a7b6bbf19002 libavcodec

Prevent AAC frame size overflows.

9940:580fad942ae6

            s->cur_channel = start_ch + j;
            apply_window_and_mdct(avctx, s, &cpe->ch[j], samples2, j);
        }
        start_ch += chans;
    }
    init_put_bits(&s->pb, frame, buf_size*8);
    if ((avctx->frame_number & 0xFF)==1 && !(avctx->flags & CODEC_FLAG_BITEXACT))
        put_bitstream_info(avctx, s, LIBAVCODEC_IDENT);
    start_ch = 0;
    memset(chan_el_counter, 0, sizeof(chan_el_counter));

            encode_individual_channel(avctx, s, &cpe->ch[j], cpe->common_window);
        }
        start_ch += chans;
    }

    put_bits(&s->pb, 3, TYPE_END);
    flush_put_bits(&s->pb);
    avctx->frame_bits = put_bits_count(&s->pb);

    // rate control stuff
    if (!(avctx->flags & CODEC_FLAG_QSCALE)) {
        float ratio = avctx->bit_rate * 1024.0f / avctx->sample_rate / avctx->frame_bits;
        s->lambda *= ratio;
        s->lambda = fminf(s->lambda, 65536.f);
    }

    if (avctx->frame_bits > 6144*avctx->channels)
        av_log(avctx, AV_LOG_ERROR, "input buffer violation %d > %d.\n",
               avctx->frame_bits, 6144*avctx->channels);

    if (!data)
        s->last_frame = 1;
    memcpy(s->samples, s->samples + 1024 * avctx->channels,
           1024 * avctx->channels * sizeof(s->samples[0]));

9941:a7b6bbf19002

            s->cur_channel = start_ch + j;
            apply_window_and_mdct(avctx, s, &cpe->ch[j], samples2, j);
        }
        start_ch += chans;
    }
    do {
        int frame_bits;
    init_put_bits(&s->pb, frame, buf_size*8);
    if ((avctx->frame_number & 0xFF)==1 && !(avctx->flags & CODEC_FLAG_BITEXACT))
        put_bitstream_info(avctx, s, LIBAVCODEC_IDENT);
    start_ch = 0;
    memset(chan_el_counter, 0, sizeof(chan_el_counter));

            encode_individual_channel(avctx, s, &cpe->ch[j], cpe->common_window);
        }
        start_ch += chans;
    }

        frame_bits = put_bits_count(&s->pb);
        if (frame_bits <= 6144 * avctx->channels - 3)
            break;

        s->lambda *= avctx->bit_rate * 1024.0f / avctx->sample_rate / frame_bits;

    } while (1);

    put_bits(&s->pb, 3, TYPE_END);
    flush_put_bits(&s->pb);
    avctx->frame_bits = put_bits_count(&s->pb);

    // rate control stuff
    if (!(avctx->flags & CODEC_FLAG_QSCALE)) {
        float ratio = avctx->bit_rate * 1024.0f / avctx->sample_rate / avctx->frame_bits;
        s->lambda *= ratio;
        s->lambda = fminf(s->lambda, 65536.f);
    }

    if (!data)
        s->last_frame = 1;
    memcpy(s->samples, s->samples + 1024 * avctx->channels,
           1024 * avctx->channels * sizeof(s->samples[0]));