comparison aac.c @ 11746:818851623979 libavcodec

Make aac_decode_frame() consume zero padding at the end of a packet.

11745:0cb0697b7f57

    GetBitContext gb;
    enum RawDataBlockType elem_type, elem_type_prev = TYPE_END;
    int err, elem_id, data_size_tmp;
    int buf_consumed;
    int samples = 1024, multiplier;

    init_get_bits(&gb, buf, buf_size * 8);

    if (show_bits(&gb, 12) == 0xfff) {
        if (parse_adts_frame_header(ac, &gb) < 0) {

    if (ac->output_configured)
        ac->output_configured = OC_LOCKED;

    buf_consumed = (get_bits_count(&gb) + 7) >> 3;
    return buf_size > buf_consumed ? buf_consumed : buf_size;
}

static av_cold int aac_decode_close(AVCodecContext *avccontext)
{
    AACContext *ac = avccontext->priv_data;

11746:818851623979

    GetBitContext gb;
    enum RawDataBlockType elem_type, elem_type_prev = TYPE_END;
    int err, elem_id, data_size_tmp;
    int buf_consumed;
    int samples = 1024, multiplier;
    int buf_offset;

    init_get_bits(&gb, buf, buf_size * 8);

    if (show_bits(&gb, 12) == 0xfff) {
        if (parse_adts_frame_header(ac, &gb) < 0) {

    if (ac->output_configured)
        ac->output_configured = OC_LOCKED;

    buf_consumed = (get_bits_count(&gb) + 7) >> 3;
    for (buf_offset = buf_consumed; buf_offset < buf_size; buf_offset++)
        if (buf[buf_offset])
            break;

    return buf_size > buf_offset ? buf_consumed : buf_size;
}

static av_cold int aac_decode_close(AVCodecContext *avccontext)
{
    AACContext *ac = avccontext->priv_data;