comparison mplayer.c @ 20897:b85131ecee3d

Move -frames check out of frame flip code (like -endpos earlier)

20896:52811235ee24

         if(blit_frame){
	   unsigned int t2=GetTimer();
	   double tt;

	   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!
	   t2=GetTimer()-t2;
	   tt = t2*0.000001f;
	   vout_time_usage+=tt;

  if(output_quality>0 && aq_sleep_time<-0.050f) // 50ms
      output_quality=0;
//  printf("total: %8.6f  sleep: %8.6f  q: %d\n",(0.000001f*aq_total_time),aq_sleep_time,output_quality);
  set_video_quality(sh_video,output_quality);
}

// FIXME: add size based support for -endpos
 if (end_at.type == END_AT_TIME &&
         !frame_time_remaining && end_at.pos <= sh_video->pts)
     eof = PT_NEXT_ENTRY;

20897:b85131ecee3d

         if(blit_frame){
	   unsigned int t2=GetTimer();
	   double tt;

	   if(vo_config_count) video_out->flip_page();

//        usec_sleep(50000); // test only!
	   t2=GetTimer()-t2;
	   tt = t2*0.000001f;
	   vout_time_usage+=tt;

  if(output_quality>0 && aq_sleep_time<-0.050f) // 50ms
      output_quality=0;
//  printf("total: %8.6f  sleep: %8.6f  q: %d\n",(0.000001f*aq_total_time),aq_sleep_time,output_quality);
  set_video_quality(sh_video,output_quality);
}

 if (play_n_frames >= 0 && !frame_time_remaining && blit_frame) {
     --play_n_frames;
     if (play_n_frames <= 0) eof = PT_NEXT_ENTRY;
 }


// FIXME: add size based support for -endpos
 if (end_at.type == END_AT_TIME &&
         !frame_time_remaining && end_at.pos <= sh_video->pts)
     eof = PT_NEXT_ENTRY;