RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Do not count skipped/broken frames when using -frames 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15896 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2005-07-03 10:09:09 +00:00
parent eed786ceef
commit a40429d6ce
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mencoder.c
View File

@ -1273,6 +1273,8 @@ default:
if (sh_video->vf_inited < 0) mencoder_exit(1, NULL); if (sh_video->vf_inited < 0) mencoder_exit(1, NULL);
if(!blit_frame){ if(!blit_frame){
if (play_n_frames >= 0)
play_n_frames++;
badframes++; badframes++;
if(skip_flag<=0){ if(skip_flag<=0){
// unwanted skipping of a frame, what to do? // unwanted skipping of a frame, what to do?

10
mplayer.c
View File

@ -2240,11 +2240,6 @@ if(play_n_frames==0){
while(!eof){ while(!eof){
float aq_sleep_time=0; float aq_sleep_time=0;
if(play_n_frames>=0){
--play_n_frames;
if(play_n_frames<0) eof = PT_NEXT_ENTRY;
}
/*========================== PLAY AUDIO ============================*/ /*========================== PLAY AUDIO ============================*/
while(sh_audio){ while(sh_audio){
@ -2521,6 +2516,11 @@ if(time_frame>0.001 && !(vo_flags&256)){
/* printf ("PANIC: too slow frame (%.3f)!\n", j); */ /* printf ("PANIC: too slow frame (%.3f)!\n", j); */
if(vo_config_count) video_out->flip_page(); if(vo_config_count) video_out->flip_page();
if (play_n_frames >= 0) {
--play_n_frames;
if (play_n_frames < 0) eof = PT_NEXT_ENTRY;
}
// usec_sleep(50000); // test only! // usec_sleep(50000); // test only!
t2=GetTimer()-t2; t2=GetTimer()-t2;
tt = t2*0.000001f; tt = t2*0.000001f;