Commit 9cf3ff6b authored by zorglub's avatar zorglub
Browse files

*EXPERIMENTAL* Default to disabling vout_synchro, but not dropping of late...

*EXPERIMENTAL* Default to disabling vout_synchro, but not dropping of late pictures in the video_output thread. (Refs:#593)

Please test heavily against MPEG1/2 streams.

parent 54d75f77
...@@ -335,6 +335,13 @@ static char *ppsz_align_descriptions[] = ...@@ -335,6 +335,13 @@ static char *ppsz_align_descriptions[] =
"This option enables framedropping on MPEG2 stream. Framedropping " \ "This option enables framedropping on MPEG2 stream. Framedropping " \
"occurs when your computer is not powerful enough" ) "occurs when your computer is not powerful enough" )
#define DROP_LATE_FRAMES_TEXT N_("Drop late frames")
#define DROP_LATE_FRAMES_LONGTEXT N_( \
"This drops frames that are late (arrive to the video output after " \
"their intended display date)." )
#define QUIET_SYNCHRO_TEXT N_("Quiet synchro") #define QUIET_SYNCHRO_TEXT N_("Quiet synchro")
#define QUIET_SYNCHRO_LONGTEXT N_( \ #define QUIET_SYNCHRO_LONGTEXT N_( \
"Enable this option to avoid flooding the message log with debug " \ "Enable this option to avoid flooding the message log with debug " \
...@@ -1091,7 +1098,10 @@ vlc_module_begin(); ...@@ -1091,7 +1098,10 @@ vlc_module_begin();
add_bool( "fullscreen", 0, NULL, FULLSCREEN_TEXT, add_bool( "fullscreen", 0, NULL, FULLSCREEN_TEXT,
FULLSCREEN_LONGTEXT, VLC_FALSE ); FULLSCREEN_LONGTEXT, VLC_FALSE );
change_short('f'); change_short('f');
add_bool( "skip-frames", 1, NULL, SKIP_FRAMES_TEXT, add_bool( "drop-late-frames", 1, NULL, DROP_LATE_FRAMES_TEXT,
DROP_LATE_FRAMES_LONGTEXT, VLC_TRUE );
/* Used in vout_synchro */
add_bool( "skip-frames", 0, NULL, SKIP_FRAMES_TEXT,
SKIP_FRAMES_LONGTEXT, VLC_TRUE ); SKIP_FRAMES_LONGTEXT, VLC_TRUE );
add_bool( "quiet-synchro", 0, NULL, QUIET_SYNCHRO_TEXT, add_bool( "quiet-synchro", 0, NULL, QUIET_SYNCHRO_TEXT,
QUIET_SYNCHRO_LONGTEXT, VLC_TRUE ); QUIET_SYNCHRO_LONGTEXT, VLC_TRUE );
......
...@@ -796,7 +796,7 @@ static void RunThread( vout_thread_t *p_vout) ...@@ -796,7 +796,7 @@ static void RunThread( vout_thread_t *p_vout)
if( !p_picture->b_force && if( !p_picture->b_force &&
p_picture != p_last_picture && p_picture != p_last_picture &&
display_date < current_date + p_vout->render_time && display_date < current_date + p_vout->render_time &&
config_GetInt( p_vout, "skip-frames" ) ) config_GetInt( p_vout, "drop-late-frames" ) )
{ {
/* Picture is late: it will be destroyed and the thread /* Picture is late: it will be destroyed and the thread
* will directly choose the next picture */ * will directly choose the next picture */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment