comparison h263.c @ 1586:3d1d0490e5a6 libavcodec

pts fix and related fixes

1585:6b224ca24033

/* must be called before writing the header */
void ff_set_mpeg4_time(MpegEncContext * s, int picture_number){
    int time_div, time_mod;

    if(s->current_picture.pts)
        s->time= (s->current_picture.pts*s->time_increment_resolution + 500*1000)/(1000*1000);
    else
        s->time= av_rescale(picture_number*(int64_t)s->avctx->frame_rate_base, s->time_increment_resolution, s->avctx->frame_rate);
    time_div= s->time/s->time_increment_resolution;
    time_mod= s->time%s->time_increment_resolution;

                           - ROUNDED_DIV(s->last_non_b_time - s->pp_time, s->t_frame))*2;
        s->pb_field_time= (  ROUNDED_DIV(s->time, s->t_frame) 
                           - ROUNDED_DIV(s->last_non_b_time - s->pp_time, s->t_frame))*2;
    }
    
    s->current_picture.pts= s->time*1000LL*1000LL / s->time_increment_resolution;
    if(s->avctx->debug&FF_DEBUG_PTS)
        printf("MPEG4 PTS: %f\n", s->current_picture.pts/(1000.0*1000.0));
    
    check_marker(gb, "before vop_coded");
    
    /* vop coded */
    if (get_bits1(gb) != 1){

1586:3d1d0490e5a6

/* must be called before writing the header */
void ff_set_mpeg4_time(MpegEncContext * s, int picture_number){
    int time_div, time_mod;

    if(s->current_picture_ptr->pts)
        s->time= (s->current_picture_ptr->pts*s->time_increment_resolution + 500*1000)/(1000*1000);
    else
        s->time= av_rescale(picture_number*(int64_t)s->avctx->frame_rate_base, s->time_increment_resolution, s->avctx->frame_rate);
    time_div= s->time/s->time_increment_resolution;
    time_mod= s->time%s->time_increment_resolution;

                           - ROUNDED_DIV(s->last_non_b_time - s->pp_time, s->t_frame))*2;
        s->pb_field_time= (  ROUNDED_DIV(s->time, s->t_frame) 
                           - ROUNDED_DIV(s->last_non_b_time - s->pp_time, s->t_frame))*2;
    }
    
    s->current_picture_ptr->pts= s->time*1000LL*1000LL / s->time_increment_resolution;
    if(s->avctx->debug&FF_DEBUG_PTS)
        printf("MPEG4 PTS: %f\n", s->current_picture_ptr->pts/(1000.0*1000.0));
    
    check_marker(gb, "before vop_coded");
    
    /* vop coded */
    if (get_bits1(gb) != 1){