comparison h264.c @ 8972:eaf39f9b25df libavcodec

Parse buffering period (H.264, D.1.1). Patch by Ivan Schreter, schreter gmx net

8971:734114ba02fa

    h->outputed_poc = INT_MIN;
    h->prev_poc_msb= 1<<16;
    h->sei_recovery_frame_cnt = -1;
    h->sei_dpb_output_delay = 0;
    h->sei_cpb_removal_delay = -1;
    return 0;
}

static int frame_start(H264Context *h){
    MpegEncContext * const s = &h->s;

        h->s.current_picture_ptr->reference= 0;
    h->s.first_field= 0;
    h->sei_recovery_frame_cnt = -1;
    h->sei_dpb_output_delay = 0;
    h->sei_cpb_removal_delay = -1;
    ff_mpeg_flush(avctx);
}

/**
 * Find a Picture in the short term reference list by frame number.

    skip_bits(&s->gb, 4);       /* 1b exact_match_flag, 1b broken_link_flag, 2b changing_slice_group_idc */

    return 0;
}

static int decode_sei(H264Context *h){
    MpegEncContext * const s = &h->s;

    while(get_bits_count(&s->gb) + 16 < s->gb.size_in_bits){
        int size, type;

            if(decode_unregistered_user_data(h, size) < 0)
                return -1;
            break;
        case SEI_TYPE_RECOVERY_POINT:
            if(decode_recovery_point(h) < 0)
                return -1;
            break;
        default:
            skip_bits(&s->gb, 8*size);
        }

        MPV_frame_end(s);
        h->sei_recovery_frame_cnt = -1;
        h->sei_dpb_output_delay = 0;
        h->sei_cpb_removal_delay = -1;

        if (cur->field_poc[0]==INT_MAX || cur->field_poc[1]==INT_MAX) {
            /* Wait for second field. */
            *data_size = 0;

8972:eaf39f9b25df

    h->outputed_poc = INT_MIN;
    h->prev_poc_msb= 1<<16;
    h->sei_recovery_frame_cnt = -1;
    h->sei_dpb_output_delay = 0;
    h->sei_cpb_removal_delay = -1;
    h->sei_buffering_period_present = 0;
    return 0;
}

static int frame_start(H264Context *h){
    MpegEncContext * const s = &h->s;

        h->s.current_picture_ptr->reference= 0;
    h->s.first_field= 0;
    h->sei_recovery_frame_cnt = -1;
    h->sei_dpb_output_delay = 0;
    h->sei_cpb_removal_delay = -1;
    h->sei_buffering_period_present = 0;
    ff_mpeg_flush(avctx);
}

/**
 * Find a Picture in the short term reference list by frame number.

    skip_bits(&s->gb, 4);       /* 1b exact_match_flag, 1b broken_link_flag, 2b changing_slice_group_idc */

    return 0;
}

static int decode_buffering_period(H264Context *h){
    MpegEncContext * const s = &h->s;
    unsigned int sps_id;
    int sched_sel_idx;
    SPS *sps;

    sps_id = get_ue_golomb_31(&s->gb);
    if(sps_id > 31 || !h->sps_buffers[sps_id]) {
        av_log(h->s.avctx, AV_LOG_ERROR, "non-existing SPS %d referenced in buffering period\n", sps_id);
        return -1;
    }
    sps = h->sps_buffers[sps_id];

    // NOTE: This is really so duplicated in the standard... See H.264, D.1.1
    if (sps->nal_hrd_parameters_present_flag) {
        for (sched_sel_idx = 0; sched_sel_idx < sps->cpb_cnt; sched_sel_idx++) {
            h->initial_cpb_removal_delay[sched_sel_idx] = get_bits(&s->gb, sps->initial_cpb_removal_delay_length);
            skip_bits(&s->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset
        }
    }
    if (sps->vcl_hrd_parameters_present_flag) {
        for (sched_sel_idx = 0; sched_sel_idx < sps->cpb_cnt; sched_sel_idx++) {
            h->initial_cpb_removal_delay[sched_sel_idx] = get_bits(&s->gb, sps->initial_cpb_removal_delay_length);
            skip_bits(&s->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset
        }
    }

    h->sei_buffering_period_present = 1;
    return 0;
}

static int decode_sei(H264Context *h){
    MpegEncContext * const s = &h->s;

    while(get_bits_count(&s->gb) + 16 < s->gb.size_in_bits){
        int size, type;

            if(decode_unregistered_user_data(h, size) < 0)
                return -1;
            break;
        case SEI_TYPE_RECOVERY_POINT:
            if(decode_recovery_point(h) < 0)
                return -1;
            break;
        case SEI_BUFFERING_PERIOD:
            if(decode_buffering_period(h) < 0)
                return -1;
            break;
        default:
            skip_bits(&s->gb, 8*size);
        }

        MPV_frame_end(s);
        h->sei_recovery_frame_cnt = -1;
        h->sei_dpb_output_delay = 0;
        h->sei_cpb_removal_delay = -1;
        h->sei_buffering_period_present = 0;

        if (cur->field_poc[0]==INT_MAX || cur->field_poc[1]==INT_MAX) {
            /* Wait for second field. */
            *data_size = 0;