November 2006 - MPlayer-cvslog - lists.mplayerhq.hu

r20918 - in trunk: libmpcodecs/dec_video.c libmpcodecs/dec_video.h mencoder.c mplayer.c
by uau 14 Nov '06

14 Nov '06

Author: uau Date: Tue Nov 14 13:29:20 2006 New Revision: 20918 Modified: trunk/libmpcodecs/dec_video.c trunk/libmpcodecs/dec_video.h trunk/mencoder.c trunk/mplayer.c Log: 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). Modified: trunk/libmpcodecs/dec_video.c ============================================================================== --- trunk/libmpcodecs/dec_video.c (original) +++ trunk/libmpcodecs/dec_video.c Tue Nov 14 13:29:20 2006 @@ -315,13 +315,11 @@ extern int vo_directrendering; -int decode_video(sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame, double pts){ -vf_instance_t* vf; +void *decode_video(sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame, double pts){ mp_image_t *mpi=NULL; unsigned int t=GetTimer(); unsigned int t2; double tt; -int ret; if (correct_pts) { int delay = get_current_video_decoder_lag(sh_video); @@ -373,16 +371,21 @@ tt = t*0.000001f; 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) { 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); -vf=sh_video->vfilter; -ret = vf->put_image(vf,mpi, pts); // apply video filters and call the leaf vo/ve +int filter_video(sh_video_t *sh_video, void *frame, double pts) { +mp_image_t *mpi = frame; +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) { vf->control(vf,VFCTRL_DRAW_OSD,NULL); #ifdef USE_ASS @@ -391,8 +394,7 @@ } t2=GetTimer()-t2; - tt=t2*0.000001f; - vout_time_usage+=tt; + vout_time_usage += t2*0.000001; return ret; } Modified: trunk/libmpcodecs/dec_video.h ============================================================================== --- trunk/libmpcodecs/dec_video.h (original) +++ trunk/libmpcodecs/dec_video.h Tue Nov 14 13:29:20 2006 @@ -10,7 +10,8 @@ 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 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 void set_video_quality(sh_video_t *sh_video,int quality); Modified: trunk/mencoder.c ============================================================================== --- trunk/mencoder.c (original) +++ trunk/mencoder.c Tue Nov 14 13:29:20 2006 @@ -1322,8 +1322,9 @@ break; default: // 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); + blit_frame = decoded_frame && filter_video(sh_video, decoded_frame, MP_NOPTS_VALUE);} if (sh_video->vf_inited < 0) mencoder_exit(1, NULL); @@ -1696,7 +1697,9 @@ if (vfilter) { 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, Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c (original) +++ trunk/mplayer.c Tue Nov 14 13:29:20 2006 @@ -2762,7 +2762,7 @@ while (1) { current_module = "decode video"; // 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)) break; current_module = "video_read_frame"; @@ -2777,8 +2777,13 @@ 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; + 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; } @@ -4324,6 +4329,7 @@ if(end_at.type == END_AT_TIME && end_at.pos < a_pos) eof = PT_NEXT_ENTRY; + update_osd_msg(); } else { @@ -4370,7 +4376,10 @@ // 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); + 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) { @@ -5409,8 +5418,6 @@ //================= Update OSD ==================== - update_osd_msg(); - #ifdef USE_SUB // find sub if(subdata && sh_video && sh_video->pts>0){

1 0

r20909 - in trunk: configure libmpdemux/demux_nut.c
by ods15 14 Nov '06

14 Nov '06

Author: ods15 Date: Tue Nov 14 07:01:54 2006 New Revision: 20909 Modified: trunk/configure trunk/libmpdemux/demux_nut.c Log: update to libnut, rename nut.h->libnut.h Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Tue Nov 14 07:01:54 2006 @@ -6519,7 +6519,7 @@ #include <stdio.h> #include <stdlib.h> #include <inttypes.h> -#include <nut.h> +#include <libnut.h> int main(void) { (void)nut_error(0); return 0; } EOF _ld_nut="-lnut" Modified: trunk/libmpdemux/demux_nut.c ============================================================================== --- trunk/libmpdemux/demux_nut.c (original) +++ trunk/libmpdemux/demux_nut.c Tue Nov 14 07:01:54 2006 @@ -11,7 +11,7 @@ #define USE_LIBNUT #ifdef USE_LIBNUT -#include <nut.h> +#include <libnut.h> typedef struct { int last_pts; // FIXME

2 1

r20907 - trunk/DOCS/tech/libao2.txt
by uau 14 Nov '06

14 Nov '06

Author: uau Date: Tue Nov 14 06:03:47 2006 New Revision: 20907 Modified: trunk/DOCS/tech/libao2.txt Log: Update libao2 description, delete completely outdated "audio plugins" part Modified: trunk/DOCS/tech/libao2.txt ============================================================================== --- trunk/DOCS/tech/libao2.txt (original) +++ trunk/DOCS/tech/libao2.txt Tue Nov 14 06:03:47 2006 @@ -23,16 +23,23 @@ static int get_space(); Returns how many bytes can be written into the audio buffer without - blocking (making caller process wait). If the buffer is (nearly) full, - has to return 0! - If it never gives 0, MPlayer won't work! + blocking (making caller process wait). MPlayer occasionally checks the + remaining space and tries to fill the buffer with play() if there's free + space. The buffer size used should be sane; a buffer that is too small + could run empty before MPlayer tries filling it again (normally once per + video frame), a buffer that is too big would force MPlayer decode the file + far ahead trying to find enough audio data to fill it. static int play(void* data,int len,int flags); Plays a bit of audio, which is received throught the "data" memory area, with - a size of "len". The "flags" isn't used yet. It has to copy the data, because - they can be overwritten after the call is made. Doesn't really have to use - all the bytes, it has to give back how many have been used (copied to - buffer). + a size of "len". It has to copy the data, because they can be overwritten + after the call is made. Doesn't have to use all the bytes; it has to + return the number of bytes used used (copied to buffer). If + flags|AOPLAY_FINAL_CHUNK is true then this is the last audio in the file. + The purpose of this flag is to tell aos that round down the audio played + from "len" to a multiple of some chunksize that this "len" should not be + rounded down to 0 or the data will never be played (as MPlayer will never + call play() with a larger len). static float get_delay(); Returns how long time it will take to play the data currently in the @@ -40,58 +47,10 @@ on this! In the worst case, return the maximum delay. !!! Because the video is synchronized to the audio (card), it's very important -!!! that the get_space and get_delay functions are correctly implemented! +!!! that the get_delay function is correctly implemented! -6.a audio plugins - Audio plugins are used for processing the audio data before it - reaches the soundcard driver. A plugin can change the following - aspects of the audio data stream: - 1. Sample format - 2. Sample rate - 3. Number of channels - 4. The data itself (i.e. filtering and other sound effects) - 5. The delay (almost all plugins does this) - The plugin interface is implemented as a pseudo device driver with - the catchy name "plugin". The plugins are executed sequentially - ordered by the "-aop list=plugin1,plugin2,..." command line switch. - To add plugins add an entry in audio_plugin.h the makefile and - create a source file named "pl_whatever.c". Input parameters are - added to audio_plugin.h and to cfg-mplayer.h. A good starting point - for writing plugins is pl_delay.c. Below is a description of what - the functions does: - -static int control(int cmd, int arg); - This is for reading/setting plugin-specific and other special - parameters and can be used for keyboard input for example. All - plugins must respond to cmd=AOCONTROL_PLUGIN_SET_LEN which is part - of the initialization of the plugin. When this command is received - the parameter pl_delay.len will contain the maximum size of data the - plugin can produce. This can be used for calculating and allocating - buffer space for the plugin. Before the function exits the parameter - pl_delay.len must be set to the maximum data size the plugin can - receive. Return CONTROL_OK for success and CONTROL_ERROR for fail, - other control codes are found in audio_out.h. - -static int init(); - This function is for initializing the plugin, it is called once - before the playing is started. In this function the plugin can read - AND write to the ao_plugin_data struct to determine and set input - and output parameters. It is important to write to the - ao_plugin_data.sz_mult and ao_plugin_data.delay_fix parameters if - the plugin changes the data size or adds delay. Return 0 for fail - and 1 for success. - -static void uninit() - Called before mplayer exits. Used for deallocating dynamic buffers. - -static void reset() - Called during reset can be used to empty buffers. MPlayer calls this - function when pause is pressed. - -static int play() - Called for every block of audio data sent through the plugin. This - function should be optimized for speed. The incoming data is found - in ao_plugin_data.data having length ao_plugin_data.len. These two - parameters should be changed by the plugin. Return 1 for success and - 0 for fail. +static void audio_pause(void); + Pause playing but do not delete buffered data if possible. +static void audio_resume(void); + Continue playing after audio_pause().

2 1

r20916 - trunk/mplayer.c
by uau 14 Nov '06

14 Nov '06

Author: uau Date: Tue Nov 14 10:52:49 2006 New Revision: 20916 Modified: trunk/mplayer.c Log: Move xscreensaver_heartbeat call next to vo check_events Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c (original) +++ trunk/mplayer.c Tue Nov 14 10:52:49 2006 @@ -4423,6 +4423,13 @@ current_module="vo_check_events"; if (vo_config_count) video_out->check_events(); +#ifdef HAVE_X11 + if (stop_xscreensaver) { + current_module = "stop_xscreensaver"; + xscreensaver_heartbeat(); + } +#endif + frame_time_remaining = sleep_until_update(&time_frame, &aq_sleep_time); //====================== FLIP PAGE (VIDEO BLT): ========================= @@ -5421,14 +5428,6 @@ } #endif -#ifdef HAVE_X11 -if (stop_xscreensaver && sh_video) { - current_module="stop_xscreensaver"; - xscreensaver_heartbeat(); - current_module=NULL; -} -#endif - // DVD sub: if(vo_config_count && vo_spudec) { unsigned char* packet=NULL;

1 0

r20915 - trunk/mplayer.c
by uau 14 Nov '06

14 Nov '06

Author: uau Date: Tue Nov 14 10:29:03 2006 New Revision: 20915 Modified: trunk/mplayer.c Log: Replace sleep time calculation in main() with a separate function. Fixes some problems with playback_speed!=1: sleep limits which were supposed to be real time were calculated in scaled time, timing inaccuracies in nosound mode affected next frame by err*(1-1/playback_speed), auto quality code used scaled time. Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c (original) +++ trunk/mplayer.c Tue Nov 14 10:29:03 2006 @@ -3002,6 +3002,63 @@ return 1; } +int sleep_until_update(float *time_frame, float *aq_sleep_time) +{ + current_module="calc_sleep_time"; + + int frame_time_remaining = 0; + *time_frame -= GetRelativeTime(); // reset timer + + if (sh_audio && !d_audio->eof) { + float delay = audio_out->get_delay(); + mp_dbg(MSGT_AVSYNC, MSGL_DBG2, "delay=%f\n", delay); + + if (autosync) { + /* + * Adjust this raw delay value by calculating the expected + * delay for this frame and generating a new value which is + * weighted between the two. The higher autosync is, the + * closer to the delay value gets to that which "-nosound" + * would have used, and the longer it will take for A/V + * sync to settle at the right value (but it eventually will.) + * This settling time is very short for values below 100. + */ + float predicted = sh_audio->delay / playback_speed + *time_frame; + float difference = delay - predicted; + delay = predicted + difference / (float)autosync; + } + + *time_frame = delay - sh_audio->delay / playback_speed; + + // delay = amount of audio buffered in soundcard/driver + if (delay > 0.25) delay=0.25; else + if (delay < 0.10) delay=0.10; + if (*time_frame > delay*0.6) { + // sleep time too big - may cause audio drops (buffer underrun) + frame_time_remaining = 1; + *time_frame = delay*0.5; + } + } else { + // If we're lagging more than 200 ms behind the right playback rate, + // don't try to "catch up". + // If benchmark is set always output frames as fast as possible + // without sleeping. + if (*time_frame < -0.2 || benchmark) + *time_frame = 0; + } + + *aq_sleep_time += *time_frame; + + + //============================== SLEEP: =================================== + + // flag 256 means: libvo driver does its timing (dvb card) + if (*time_frame > 0.001 && !(vo_flags&256)) + *time_frame = timing_sleep(*time_frame); + return frame_time_remaining; +} + + int main(int argc,char* argv[]){ @@ -4291,7 +4348,7 @@ if(in_size>max_framesize) max_framesize=in_size; // stats sh_video->timer+=frame_time; if(sh_audio) sh_audio->delay-=frame_time; - time_frame+=frame_time; // for nosound + time_frame += frame_time / playback_speed; // for nosound // video_read_frame can change fps (e.g. for ASF video) vo_fps = sh_video->fps; // check for frame-drop: @@ -4335,7 +4392,7 @@ frame_time = sh_video->pts - last_pts; last_pts = sh_video->pts; sh_video->timer += frame_time; - time_frame += frame_time; // for nosound + time_frame += frame_time / playback_speed; // for nosound if(sh_audio) sh_audio->delay -= frame_time; blit_frame = 1; @@ -4366,90 +4423,7 @@ current_module="vo_check_events"; if (vo_config_count) video_out->check_events(); - current_module="calc_sleep_time"; - -#if 0 -{ // debug frame dropping code - float delay=audio_out->get_delay(); - mp_msg(MSGT_AVSYNC,MSGL_V,"\r[V] %5.3f [A] %5.3f => {%5.3f} (%5.3f) [%d] \n", - sh_video->timer,sh_audio->timer-delay, - sh_video->timer-(sh_audio->timer-delay), - delay,drop_frame); -} -#endif - - if(drop_frame && !frame_time_remaining && !autosync){ - /* - * Note: time_frame should not be forced to 0 in autosync mode. - * It is used as a cumulative counter to predict and correct the - * delay measurements from the audio driver. time_frame is already - * < 0, so the "time to sleep" code does not actually sleep. Also, - * blit_frame is already 0 because drop_frame was true when - * decode_video was called (which causes it to set blit_frame to 0.) - * When autosync==0, the default behavior is still completely unchanged. - */ - - time_frame=0; // don't sleep! - blit_frame=0; // don't display! - - } else { - - // It's time to sleep... - - frame_time_remaining=0; - time_frame-=GetRelativeTime(); // reset timer - - if(sh_audio && !d_audio->eof){ - float delay=playback_speed*audio_out->get_delay(); - mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"delay=%f\n",delay); - - if (autosync){ - /* - * Adjust this raw delay value by calculating the expected - * delay for this frame and generating a new value which is - * weighted between the two. The higher autosync is, the - * closer to the delay value gets to that which "-nosound" - * would have used, and the longer it will take for A/V - * sync to settle at the right value (but it eventually will.) - * This settling time is very short for values below 100. - */ - float predicted = sh_audio->delay+time_frame; - float difference = delay - predicted; - delay = predicted + difference / (float)autosync; - } - - time_frame=delay-sh_audio->delay; - - // delay = amount of audio buffered in soundcard/driver - if(delay>0.25) delay=0.25; else - if(delay<0.10) delay=0.10; - if(time_frame>delay*0.6){ - // sleep time too big - may cause audio drops (buffer underrun) - frame_time_remaining=1; - time_frame=delay*0.5; - } - - } else { - - // NOSOUND: - if( (time_frame<-3*frame_time || time_frame>3*frame_time) || benchmark) - time_frame=0; - - } - -// if(mp_msg_test(MSGT_CPLAYER,MSGL_DBG2)printf("sleep: %5.3f a:%6.3f v:%6.3f \n",time_frame,sh_audio->timer,sh_video->timer); - - aq_sleep_time+=time_frame; - - } // !drop_frame - -//============================== SLEEP: =================================== - -time_frame/=playback_speed; - -// flag 256 means: libvo driver does its timing (dvb card) -if(time_frame>0.001 && !(vo_flags&256)) - time_frame = timing_sleep(time_frame); + frame_time_remaining = sleep_until_update(&time_frame, &aq_sleep_time); //====================== FLIP PAGE (VIDEO BLT): =========================

1 0

r20914 - trunk/mplayer.c
by uau 14 Nov '06

14 Nov '06

Author: uau Date: Tue Nov 14 07:56:17 2006 New Revision: 20914 Modified: trunk/mplayer.c Log: simplify Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c (original) +++ trunk/mplayer.c Tue Nov 14 07:56:17 2006 @@ -4454,18 +4454,12 @@ //====================== FLIP PAGE (VIDEO BLT): ========================= current_module="flip_page"; - if (!frame_time_remaining) { - if(blit_frame){ + if (!frame_time_remaining && 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; - } + vout_time_usage += (GetTimer() - t2) * 0.000001; } //====================== A-V TIMESTAMP CORRECTION: =========================

1 0

r20913 - trunk/mplayer.c
by uau 14 Nov '06

14 Nov '06

Author: uau Date: Tue Nov 14 07:49:37 2006 New Revision: 20913 Modified: trunk/mplayer.c Log: Move -frames check out of frame flip code (like -endpos earlier) Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c (original) +++ trunk/mplayer.c Tue Nov 14 07:49:37 2006 @@ -4460,10 +4460,6 @@ 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; @@ -4495,6 +4491,12 @@ 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)

1 0

r20912 - trunk/mplayer.c
by uau 14 Nov '06

14 Nov '06

Author: uau Date: Tue Nov 14 07:44:16 2006 New Revision: 20912 Modified: trunk/mplayer.c Log: Remove some unused code. Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c (original) +++ trunk/mplayer.c Tue Nov 14 07:44:16 2006 @@ -4153,11 +4153,8 @@ int grab_frames=0; int drop_frame=0; // current dropping status int dropped_frames=0; // how many frames dropped since last non-dropped frame -int too_slow_frame_cnt=0; -int too_fast_frame_cnt=0; // for auto-quality: double vdecode_time; -unsigned int lastframeout_ts=0; /*float time_frame_corr_avg=0;*/ /* unused */ float next_frame_time=0; @@ -4461,16 +4458,6 @@ if(blit_frame){ unsigned int t2=GetTimer(); double tt; - float j; -#define FRAME_LAG_WARN 0.2 - j = ((float)t2 - lastframeout_ts) / 1000000; - lastframeout_ts = GetTimer(); - if (j < frame_time + frame_time * -FRAME_LAG_WARN) - too_fast_frame_cnt++; - /* printf ("PANIC: too fast frame (%.3f)!\n", j); */ - else if (j > frame_time + frame_time * FRAME_LAG_WARN) - too_slow_frame_cnt++; - /* printf ("PANIC: too slow frame (%.3f)!\n", j); */ if(vo_config_count) video_out->flip_page(); if (play_n_frames >= 0) { @@ -5379,8 +5366,6 @@ osd_visible=(GetTimerMS() + 1000) | 1; // to revert to PLAY pointer after 1 sec audio_time_usage=0; video_time_usage=0; vout_time_usage=0; drop_frame_cnt=0; - too_slow_frame_cnt=0; - too_fast_frame_cnt=0; if(vo_spudec) spudec_reset(vo_spudec); }

1 0

r20911 - trunk/mplayer.c
by uau 14 Nov '06

14 Nov '06

Author: uau Date: Tue Nov 14 07:35:55 2006 New Revision: 20911 Modified: trunk/mplayer.c Log: Move endpos handling from page flip code to a saner location, change < to <= If the shown frame was already at exactly the end pos we don't want to show one more frame after it. Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c (original) +++ trunk/mplayer.c Tue Nov 14 07:35:55 2006 @@ -4458,11 +4458,6 @@ current_module="flip_page"; if (!frame_time_remaining) { - - // FIXME: add size based support for -endpos - if ( end_at.type == END_AT_TIME && end_at.pos < sh_video->pts ) - eof = PT_NEXT_ENTRY; - if(blit_frame){ unsigned int t2=GetTimer(); double tt; @@ -4513,6 +4508,11 @@ 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; + } // end if(sh_video) //============================ Handle PAUSE ===============================

1 0

r20910 - trunk/mplayer.c
by uau 14 Nov '06

14 Nov '06

Author: uau Date: Tue Nov 14 07:25:02 2006 New Revision: 20910 Modified: trunk/mplayer.c Log: move vo event check together with gui event check Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c (original) +++ trunk/mplayer.c Tue Nov 14 07:25:02 2006 @@ -4366,6 +4366,9 @@ if(use_gui) guiEventHandling(); #endif + current_module="vo_check_events"; + if (vo_config_count) video_out->check_events(); + current_module="calc_sleep_time"; #if 0 @@ -4453,9 +4456,6 @@ //====================== FLIP PAGE (VIDEO BLT): ========================= - current_module="vo_check_events"; - if(vo_config_count) video_out->check_events(); - current_module="flip_page"; if (!frame_time_remaining) {

1 0