Mercurial > mplayer.hg
comparison mplayer.c @ 20897:b85131ecee3d
Move -frames check out of frame flip code (like -endpos earlier)
author | uau |
---|---|
date | Tue, 14 Nov 2006 06:49:37 +0000 |
parents | 52811235ee24 |
children | 7c5be93b619b |
comparison
equal
deleted
inserted
replaced
20896:52811235ee24 | 20897:b85131ecee3d |
---|---|
4458 if(blit_frame){ | 4458 if(blit_frame){ |
4459 unsigned int t2=GetTimer(); | 4459 unsigned int t2=GetTimer(); |
4460 double tt; | 4460 double tt; |
4461 | 4461 |
4462 if(vo_config_count) video_out->flip_page(); | 4462 if(vo_config_count) video_out->flip_page(); |
4463 if (play_n_frames >= 0) { | |
4464 --play_n_frames; | |
4465 if (play_n_frames <= 0) eof = PT_NEXT_ENTRY; | |
4466 } | |
4467 | 4463 |
4468 // usec_sleep(50000); // test only! | 4464 // usec_sleep(50000); // test only! |
4469 t2=GetTimer()-t2; | 4465 t2=GetTimer()-t2; |
4470 tt = t2*0.000001f; | 4466 tt = t2*0.000001f; |
4471 vout_time_usage+=tt; | 4467 vout_time_usage+=tt; |
4492 if(output_quality>0 && aq_sleep_time<-0.050f) // 50ms | 4488 if(output_quality>0 && aq_sleep_time<-0.050f) // 50ms |
4493 output_quality=0; | 4489 output_quality=0; |
4494 // printf("total: %8.6f sleep: %8.6f q: %d\n",(0.000001f*aq_total_time),aq_sleep_time,output_quality); | 4490 // printf("total: %8.6f sleep: %8.6f q: %d\n",(0.000001f*aq_total_time),aq_sleep_time,output_quality); |
4495 set_video_quality(sh_video,output_quality); | 4491 set_video_quality(sh_video,output_quality); |
4496 } | 4492 } |
4493 | |
4494 if (play_n_frames >= 0 && !frame_time_remaining && blit_frame) { | |
4495 --play_n_frames; | |
4496 if (play_n_frames <= 0) eof = PT_NEXT_ENTRY; | |
4497 } | |
4498 | |
4497 | 4499 |
4498 // FIXME: add size based support for -endpos | 4500 // FIXME: add size based support for -endpos |
4499 if (end_at.type == END_AT_TIME && | 4501 if (end_at.type == END_AT_TIME && |
4500 !frame_time_remaining && end_at.pos <= sh_video->pts) | 4502 !frame_time_remaining && end_at.pos <= sh_video->pts) |
4501 eof = PT_NEXT_ENTRY; | 4503 eof = PT_NEXT_ENTRY; |