comparison mplayer.c @ 20902:bfb6eacd9c4a

Update OSD contents only after the correct values for the frame are known. The most visible inaccuracy caused by the previous update location was that the OSD always showed position 0 after seeking with demux_mkv. Split frame decoding and filtering because with -correct-pts the pts value that should be displayed for the frame is only known after decoding but is needed before filtering (during which the OSD is drawn).

20901:b875b84a511e

    double pts;

    while (1) {
	current_module = "decode video";
	// XXX Time used in this call is not counted in any performance
	// timer now
	if (vf_output_queued_frame(sh_video->vfilter))
	    break;
	current_module = "video_read_frame";
	in_size = ds_get_packet_pts(d_video, &start, &pts);
	if (in_size < 0) {

	}
	if (in_size > max_framesize)
	    max_framesize = in_size;
	if (pts == MP_NOPTS_VALUE)
	    mp_msg(MSGT_CPLAYER, MSGL_ERR, "pts value from demuxer MISSING\n");
	if (decode_video(sh_video, start, in_size, 0, pts))
	    break;
	if (hit_eof)
	    return 0;
    }
    return 1;
}

  if(!quiet)
    print_status(a_pos, 0, 0);

  if(end_at.type == END_AT_TIME && end_at.pos < a_pos)
    eof = PT_NEXT_ENTRY;

} else {

/*========================== PLAY VIDEO ============================*/

	    ++total_frame_cnt;
	}
	// decode:
	current_module="decode_video";
//	printf("Decode! %p  %d  \n",start,in_size);
	blit_frame=decode_video(sh_video,start,in_size,drop_frame, sh_video->pts);
	break;
    }
    else while (1) {
	if (!generate_video_frame(sh_video, d_video)) {
	    eof = 1;

#endif /* HAVE_NEW_GUI */


//================= Update OSD ====================
  
  update_osd_msg();
    
#ifdef USE_SUB
  // find sub
  if(subdata &&  sh_video && sh_video->pts>0){
      float pts=sh_video->pts;
      if(sub_fps==0) sub_fps=sh_video->fps;

20902:bfb6eacd9c4a

    double pts;

    while (1) {
	current_module = "decode video";
	// XXX Time used in this call is not counted in any performance
	// timer now, OSD is not updated correctly for filter-added frames
	if (vf_output_queued_frame(sh_video->vfilter))
	    break;
	current_module = "video_read_frame";
	in_size = ds_get_packet_pts(d_video, &start, &pts);
	if (in_size < 0) {

	}
	if (in_size > max_framesize)
	    max_framesize = in_size;
	if (pts == MP_NOPTS_VALUE)
	    mp_msg(MSGT_CPLAYER, MSGL_ERR, "pts value from demuxer MISSING\n");
	current_module = "decode video";
	void *decoded_frame = decode_video(sh_video, start, in_size, 0, pts);
	if (decoded_frame) {
	    update_osd_msg();
	    if (filter_video(sh_video, decoded_frame, sh_video->pts))
		break;
	}
	if (hit_eof)
	    return 0;
    }
    return 1;
}

  if(!quiet)
    print_status(a_pos, 0, 0);

  if(end_at.type == END_AT_TIME && end_at.pos < a_pos)
    eof = PT_NEXT_ENTRY;
  update_osd_msg();

} else {

/*========================== PLAY VIDEO ============================*/

	    ++total_frame_cnt;
	}
	// decode:
	current_module="decode_video";
//	printf("Decode! %p  %d  \n",start,in_size);
	update_osd_msg();
	void *decoded_frame = decode_video(sh_video,start,in_size,drop_frame, sh_video->pts);
	blit_frame = (decoded_frame && filter_video(sh_video, decoded_frame,
						    sh_video->pts));
	break;
    }
    else while (1) {
	if (!generate_video_frame(sh_video, d_video)) {
	    eof = 1;

#endif /* HAVE_NEW_GUI */


//================= Update OSD ====================
  
#ifdef USE_SUB
  // find sub
  if(subdata &&  sh_video && sh_video->pts>0){
      float pts=sh_video->pts;
      if(sub_fps==0) sub_fps=sh_video->fps;