mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

Update OSD contents only after the correct values for the frame are known.

Browse Source 
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).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20918 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
uau 2006-11-14 12:29:20 +00:00
parent 2d8010498d
commit a703241aa9
4 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libmpcodecs/dec_video.c
View File

@ -315,13 +315,11 @@ return 1; // success
extern int vo_directrendering; extern int vo_directrendering;
int decode_video(sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame, double pts){ void *decode_video(sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame, double pts){
vf_instance_t* vf;
mp_image_t *mpi=NULL; mp_image_t *mpi=NULL;
unsigned int t=GetTimer(); unsigned int t=GetTimer();
unsigned int t2; unsigned int t2;
double tt; double tt;
int ret;
if (correct_pts) { if (correct_pts) {
int delay = get_current_video_decoder_lag(sh_video); int delay = get_current_video_decoder_lag(sh_video);
@ -373,16 +371,21 @@ t2=GetTimer();t=t2-t;
tt = t*0.000001f; tt = t*0.000001f;
video_time_usage+=tt; video_time_usage+=tt;
if(!mpi || drop_frame) return 0; // error / skipped frame if(!mpi || drop_frame) return NULL; // error / skipped frame
if (correct_pts) { if (correct_pts) {
sh_video->num_buffered_pts--; sh_video->num_buffered_pts--;
pts = sh_video->buffered_pts[sh_video->num_buffered_pts]; sh_video->pts = sh_video->buffered_pts[sh_video->num_buffered_pts];
} }
return mpi;
}
//vo_draw_image(video_out,mpi); int filter_video(sh_video_t *sh_video, void *frame, double pts) {
vf=sh_video->vfilter; mp_image_t *mpi = frame;
ret = vf->put_image(vf,mpi, pts); // apply video filters and call the leaf vo/ve unsigned int t2 = GetTimer();
vf_instance_t *vf = sh_video->vfilter;
// apply video filters and call the leaf vo/ve
int ret = vf->put_image(vf,mpi, pts);
if(ret>0) { if(ret>0) {
vf->control(vf,VFCTRL_DRAW_OSD,NULL); vf->control(vf,VFCTRL_DRAW_OSD,NULL);
#ifdef USE_ASS #ifdef USE_ASS
@ -391,8 +394,7 @@ if(ret>0) {
} }
t2=GetTimer()-t2; t2=GetTimer()-t2;
tt=t2*0.000001f; vout_time_usage += t2*0.000001;
vout_time_usage+=tt;
return ret; return ret;
} }

3
libmpcodecs/dec_video.h
View File

@ -10,7 +10,8 @@ extern int init_best_video_codec(sh_video_t *sh_video,char** video_codec_list,ch
extern int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status); extern int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status);
extern void uninit_video(sh_video_t *sh_video); extern void uninit_video(sh_video_t *sh_video);
extern int decode_video(sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame, double pts); extern void *decode_video(sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame, double pts);
extern int filter_video(sh_video_t *sh_video, void *frame, double pts);
extern int get_video_quality_max(sh_video_t *sh_video); extern int get_video_quality_max(sh_video_t *sh_video);
extern void set_video_quality(sh_video_t *sh_video,int quality); extern void set_video_quality(sh_video_t *sh_video,int quality);

7
mencoder.c
View File

@ -1322,8 +1322,9 @@ case VCODEC_FRAMENO:
break; break;
default: default:
// decode_video will callback down to ve_*.c encoders, through the video filters // decode_video will callback down to ve_*.c encoders, through the video filters
blit_frame=decode_video(sh_video,frame_data.start,frame_data.in_size, {void *decoded_frame = decode_video(sh_video,frame_data.start,frame_data.in_size,
skip_flag>0 && (!sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) != CONTROL_TRUE), MP_NOPTS_VALUE); skip_flag>0 && (!sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) != CONTROL_TRUE), MP_NOPTS_VALUE);
blit_frame = decoded_frame && filter_video(sh_video, decoded_frame, MP_NOPTS_VALUE);}
if (sh_video->vf_inited < 0) mencoder_exit(1, NULL); if (sh_video->vf_inited < 0) mencoder_exit(1, NULL);
@ -1696,7 +1697,9 @@ static int slowseek(float end_pts, demux_stream_t *d_video, demux_stream_t *d_au
if (vfilter) { if (vfilter) {
int softskip = (vfilter->control(vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) == CONTROL_TRUE); int softskip = (vfilter->control(vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) == CONTROL_TRUE);
decode_video(sh_video, frame_data->start, frame_data->in_size, !softskip, MP_NOPTS_VALUE); void *decoded_frame = decode_video(sh_video, frame_data->start, frame_data->in_size, !softskip, MP_NOPTS_VALUE);
if (decoded_frame)
filter_video(sh_video, decoded_frame, MP_NOPTS_VALUE);
} }
if (print_info) mp_msg(MSGT_MENCODER, MSGL_STATUS, if (print_info) mp_msg(MSGT_MENCODER, MSGL_STATUS,

19
mplayer.c
View File

@ -2762,7 +2762,7 @@ static int generate_video_frame(sh_video_t *sh_video, demux_stream_t *d_video)
while (1) { while (1) {
current_module = "decode video"; current_module = "decode video";
// XXX Time used in this call is not counted in any performance // XXX Time used in this call is not counted in any performance
// timer now // timer now, OSD is not updated correctly for filter-added frames
if (vf_output_queued_frame(sh_video->vfilter)) if (vf_output_queued_frame(sh_video->vfilter))
break; break;
current_module = "video_read_frame"; current_module = "video_read_frame";
@ -2777,8 +2777,13 @@ static int generate_video_frame(sh_video_t *sh_video, demux_stream_t *d_video)
max_framesize = in_size; max_framesize = in_size;
if (pts == MP_NOPTS_VALUE) if (pts == MP_NOPTS_VALUE)
mp_msg(MSGT_CPLAYER, MSGL_ERR, "pts value from demuxer MISSING\n"); mp_msg(MSGT_CPLAYER, MSGL_ERR, "pts value from demuxer MISSING\n");
if (decode_video(sh_video, start, in_size, 0, pts)) current_module = "decode video";
break; 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) if (hit_eof)
return 0; return 0;
} }
@ -4324,6 +4329,7 @@ if(!sh_video) {
if(end_at.type == END_AT_TIME && end_at.pos < a_pos) if(end_at.type == END_AT_TIME && end_at.pos < a_pos)
eof = PT_NEXT_ENTRY; eof = PT_NEXT_ENTRY;
update_osd_msg();
} else { } else {
@ -4370,7 +4376,10 @@ if(!sh_video) {
// decode: // decode:
current_module="decode_video"; current_module="decode_video";
// printf("Decode! %p %d \n",start,in_size); // printf("Decode! %p %d \n",start,in_size);
blit_frame=decode_video(sh_video,start,in_size,drop_frame, sh_video->pts); 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; break;
} }
else while (1) { else while (1) {
@ -5409,8 +5418,6 @@ if ((user_muted | edl_muted) != mixer.muted) mixer_mute(&mixer);
//================= Update OSD ==================== //================= Update OSD ====================
update_osd_msg();
#ifdef USE_SUB #ifdef USE_SUB
// find sub // find sub
if(subdata && sh_video && sh_video->pts>0){ if(subdata && sh_video && sh_video->pts>0){