comparison h264.c @ 8966:328b7d545d0b libavcodec

Parse dpb_output_delay in SEI picture structure. Patch by Ivan Schreter, schreter gmx net

8965:a5dce344904a

    h->thread_context[0] = h;
    h->outputed_poc = INT_MIN;
    h->prev_poc_msb= 1<<16;
    h->sei_recovery_frame_cnt = -1;
    return 0;
}

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

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

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

static int decode_picture_timing(H264Context *h){
    MpegEncContext * const s = &h->s;
    if(h->sps.nal_hrd_parameters_present_flag || h->sps.vcl_hrd_parameters_present_flag){
        skip_bits(&s->gb, h->sps.cpb_removal_delay_length); /* cpb_removal_delay */
        skip_bits(&s->gb, h->sps.dpb_output_delay_length);  /* dpb_output_delay */
    }
    if(h->sps.pic_struct_present_flag){
        unsigned int i, num_clock_ts;
        h->sei_pic_struct = get_bits(&s->gb, 4);

        if (!FIELD_PICTURE)
            ff_er_frame_end(s);

        MPV_frame_end(s);
        h->sei_recovery_frame_cnt = -1;

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

8966:328b7d545d0b

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

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

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

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

static int decode_picture_timing(H264Context *h){
    MpegEncContext * const s = &h->s;
    if(h->sps.nal_hrd_parameters_present_flag || h->sps.vcl_hrd_parameters_present_flag){
        skip_bits(&s->gb, h->sps.cpb_removal_delay_length); /* cpb_removal_delay */
        h->sei_dpb_output_delay = get_bits(&s->gb, h->sps.dpb_output_delay_length);
    }
    if(h->sps.pic_struct_present_flag){
        unsigned int i, num_clock_ts;
        h->sei_pic_struct = get_bits(&s->gb, 4);

        if (!FIELD_PICTURE)
            ff_er_frame_end(s);

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

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