comparison h263.c @ 2679:edd8e513376c libavcodec

10l (%f vs. %Ld)
author michael
date Fri, 13 May 2005 23:11:32 +0000
parents 06f0744ffc18
children 2b37bcabe608
comparison
equal deleted inserted replaced
2678:44abbda868c5 2679:edd8e513376c
2423 2423
2424 put_bits(&s->pb, 16, 0); /* vop header */ 2424 put_bits(&s->pb, 16, 0); /* vop header */
2425 put_bits(&s->pb, 16, VOP_STARTCODE); /* vop header */ 2425 put_bits(&s->pb, 16, VOP_STARTCODE); /* vop header */
2426 put_bits(&s->pb, 2, s->pict_type - 1); /* pict type: I = 0 , P = 1 */ 2426 put_bits(&s->pb, 2, s->pict_type - 1); /* pict type: I = 0 , P = 1 */
2427 2427
2428 assert(s->time>=0);
2428 time_div= s->time/s->avctx->time_base.den; 2429 time_div= s->time/s->avctx->time_base.den;
2429 time_mod= s->time%s->avctx->time_base.den; 2430 time_mod= s->time%s->avctx->time_base.den;
2430 time_incr= time_div - s->last_time_base; 2431 time_incr= time_div - s->last_time_base;
2431 assert(time_incr >= 0); 2432 assert(time_incr >= 0);
2432 while(time_incr--) 2433 while(time_incr--)
5854 } 5855 }
5855 //av_log(s->avctx, AV_LOG_DEBUG, "last nonb %Ld last_base %d time %Ld pp %d pb %d t %d ppf %d pbf %d\n", s->last_non_b_time, s->last_time_base, s->time, s->pp_time, s->pb_time, s->t_frame, s->pp_field_time, s->pb_field_time); 5856 //av_log(s->avctx, AV_LOG_DEBUG, "last nonb %Ld last_base %d time %Ld pp %d pb %d t %d ppf %d pbf %d\n", s->last_non_b_time, s->last_time_base, s->time, s->pp_time, s->pb_time, s->t_frame, s->pp_field_time, s->pb_field_time);
5856 5857
5857 s->current_picture_ptr->pts= (s->time + s->avctx->time_base.num/2) / s->avctx->time_base.num; 5858 s->current_picture_ptr->pts= (s->time + s->avctx->time_base.num/2) / s->avctx->time_base.num;
5858 if(s->avctx->debug&FF_DEBUG_PTS) 5859 if(s->avctx->debug&FF_DEBUG_PTS)
5859 av_log(s->avctx, AV_LOG_DEBUG, "MPEG4 PTS: %f\n", s->current_picture_ptr->pts); 5860 av_log(s->avctx, AV_LOG_DEBUG, "MPEG4 PTS: %Ld\n", s->current_picture_ptr->pts);
5860 5861
5861 check_marker(gb, "before vop_coded"); 5862 check_marker(gb, "before vop_coded");
5862 5863
5863 /* vop coded */ 5864 /* vop coded */
5864 if (get_bits1(gb) != 1){ 5865 if (get_bits1(gb) != 1){