Fixed audio-desync support and simplified (close #3253).

[vlc] / src / input / input.c

diff --git a/src/input/input.c b/src/input/input.c
index 86a8b2c062672aa7465bad1976ff99d36b3c62d5..9b737f4de8f7fa1ea46277def7cac7af2756ecf4 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -51,6 +51,7 @@
 #include <vlc_dialog.h>
 #include <vlc_url.h>
 #include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_strings.h>
 
 #ifdef HAVE_SYS_STAT_H
@@ -112,6 +113,7 @@ static void input_ChangeState( input_thread_t *p_input, int i_state ); /* TODO f
 /* Do not let a pts_delay from access/demux go beyong 60s */
 #define INPUT_PTS_DELAY_MAX INT64_C(60000000)
 
+#undef input_Create
 /**
  * Create a new input_thread_t.
  *
@@ -124,15 +126,14 @@ static void input_ChangeState( input_thread_t *p_input, int i_state ); /* TODO f
  * \param p_resource an optional input ressource
  * \return a pointer to the spawned input thread
  */
-
-input_thread_t *__input_Create( vlc_object_t *p_parent,
-                                input_item_t *p_item,
-                                const char *psz_log, input_resource_t *p_resource )
+input_thread_t *input_Create( vlc_object_t *p_parent,
+                              input_item_t *p_item,
+                              const char *psz_log, input_resource_t *p_resource )
 {
-
     return Create( p_parent, p_item, psz_log, false, p_resource );
 }
 
+#undef input_CreateAndStart
 /**
  * Create a new input_thread_t and start it.
  *
@@ -140,10 +141,10 @@ input_thread_t *__input_Create( vlc_object_t *p_parent,
  *
  * \see input_Create
  */
-input_thread_t *__input_CreateAndStart( vlc_object_t *p_parent,
-                                        input_item_t *p_item, const char *psz_log )
+input_thread_t *input_CreateAndStart( vlc_object_t *p_parent,
+                                      input_item_t *p_item, const char *psz_log )
 {
-    input_thread_t *p_input = __input_Create( p_parent, p_item, psz_log, NULL );
+    input_thread_t *p_input = input_Create( p_parent, p_item, psz_log, NULL );
 
     if( input_Start( p_input ) )
     {
@@ -153,6 +154,7 @@ input_thread_t *__input_CreateAndStart( vlc_object_t *p_parent,
     return p_input;
 }
 
+#undef input_Read
 /**
  * Initialize an input thread and run it until it stops by itself.
  *
@@ -160,7 +162,7 @@ input_thread_t *__input_CreateAndStart( vlc_object_t *p_parent,
  * \param p_item an input item
  * \return an error code, VLC_SUCCESS on success
  */
-int __input_Read( vlc_object_t *p_parent, input_item_t *p_item )
+int input_Read( vlc_object_t *p_parent, input_item_t *p_item )
 {
     input_thread_t *p_input = Create( p_parent, p_item, NULL, false, NULL );
     if( !p_input )
@@ -356,8 +358,6 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
     memset( &p_input->p->bookmark, 0, sizeof(p_input->p->bookmark) );
     TAB_INIT( p_input->p->i_bookmark, p_input->p->pp_bookmark );
     TAB_INIT( p_input->p->i_attachment, p_input->p->attachment );
-    p_input->p->p_es_out_display = NULL;
-    p_input->p->p_es_out = NULL;
     p_input->p->p_sout   = NULL;
     p_input->p->b_out_pace_control = false;
 
@@ -473,10 +473,17 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
     if( p_input->b_preparsing )
         p_input->i_flags |= OBJECT_FLAGS_QUIET | OBJECT_FLAGS_NOINTERACT;
 
+    /* Make sure the interaction option is honored */
+    if( !var_InheritBool( p_input, "interact" ) )
+        p_input->i_flags |= OBJECT_FLAGS_NOINTERACT;
+
     /* */
     memset( &p_input->p->counters, 0, sizeof( p_input->p->counters ) );
     vlc_mutex_init( &p_input->p->counters.counters_lock );
 
+    p_input->p->p_es_out_display = input_EsOutNew( p_input, p_input->p->i_rate );
+    p_input->p->p_es_out = NULL;
+
     /* Set the destructor when we are sure we are initialized */
     vlc_object_set_destructor( p_input, (vlc_destructor_t)Destructor );
 
@@ -497,6 +504,9 @@ static void Destructor( input_thread_t * p_input )
     stats_TimerDump( p_input, STATS_TIMER_INPUT_LAUNCHING );
     stats_TimerClean( p_input, STATS_TIMER_INPUT_LAUNCHING );
 
+    if( p_input->p->p_es_out_display )
+        es_out_Delete( p_input->p->p_es_out_display );
+
     if( p_input->p->p_resource )
         input_resource_Delete( p_input->p->p_resource );
 
@@ -1128,6 +1138,8 @@ static void UpdatePtsDelay( input_thread_t *p_input )
     const int i_cr_average = var_GetInteger( p_input, "cr-average" ) * i_pts_delay / DEFAULT_PTS_DELAY;
 
     /* */
+    es_out_SetDelay( p_input->p->p_es_out_display, AUDIO_ES, i_audio_delay );
+    es_out_SetDelay( p_input->p->p_es_out_display, SPU_ES, i_spu_delay );
     es_out_SetJitter( p_input->p->p_es_out, i_pts_delay, i_cr_average );
 }
 
@@ -1183,7 +1195,7 @@ static void InitPrograms( input_thread_t * p_input )
 static int Init( input_thread_t * p_input )
 {
     vlc_meta_t *p_meta;
-    int i, ret;
+    int i;
 
     for( i = 0; i < p_input->p->p_item->i_options; i++ )
     {
@@ -1201,14 +1213,12 @@ static int Init( input_thread_t * p_input )
 
     InitStatistics( p_input );
 #ifdef ENABLE_SOUT
-    ret = InitSout( p_input );
-    if( ret != VLC_SUCCESS )
-        goto error_stats;
+    if( InitSout( p_input ) )
+        goto error;
 #endif
 
     /* Create es out */
-    p_input->p->p_es_out_display = input_EsOutNew( p_input, p_input->p->i_rate );
-    p_input->p->p_es_out         = input_EsOutTimeshiftNew( p_input, p_input->p->p_es_out_display, p_input->p->i_rate );
+    p_input->p->p_es_out = input_EsOutTimeshiftNew( p_input, p_input->p->p_es_out_display, p_input->p->i_rate );
 
     /* */
     input_ChangeState( p_input, OPENING_S );
@@ -1288,8 +1298,7 @@ error:
 
     if( p_input->p->p_es_out )
         es_out_Delete( p_input->p->p_es_out );
-    if( p_input->p->p_es_out_display )
-        es_out_Delete( p_input->p->p_es_out_display );
+    es_out_SetMode( p_input->p->p_es_out_display, ES_OUT_MODE_END );
     if( p_input->p->p_resource )
     {
         if( p_input->p->p_sout )
@@ -1298,9 +1307,6 @@ error:
         input_resource_SetInput( p_input->p->p_resource, NULL );
     }
 
-#ifdef ENABLE_SOUT
-error_stats:
-#endif
     if( !p_input->b_preparsing && libvlc_stats( p_input ) )
     {
 #define EXIT_COUNTER( c ) do { if( p_input->p->counters.p_##c ) \
@@ -1335,7 +1341,6 @@ error_stats:
     p_input->p->input.p_stream = NULL;
     p_input->p->input.p_access = NULL;
     p_input->p->p_es_out = NULL;
-    p_input->p->p_es_out_display = NULL;
     p_input->p->p_sout = NULL;
 
     return VLC_EGENERIC;
@@ -1371,8 +1376,7 @@ static void End( input_thread_t * p_input )
     /* Unload all modules */
     if( p_input->p->p_es_out )
         es_out_Delete( p_input->p->p_es_out );
-    if( p_input->p->p_es_out_display )
-        es_out_Delete( p_input->p->p_es_out_display );
+    es_out_SetMode( p_input->p->p_es_out_display, ES_OUT_MODE_END );
 
     if( !p_input->b_preparsing )
     {
@@ -1918,19 +1922,13 @@ static bool Control( input_thread_t *p_input,
             break;
 
         case INPUT_CONTROL_SET_AUDIO_DELAY:
-            if( !es_out_SetDelay( p_input->p->p_es_out_display, AUDIO_ES, val.i_time ) )
-            {
-                input_SendEventAudioDelay( p_input, val.i_time );
-                UpdatePtsDelay( p_input );
-            }
+            input_SendEventAudioDelay( p_input, val.i_time );
+            UpdatePtsDelay( p_input );
             break;
 
         case INPUT_CONTROL_SET_SPU_DELAY:
-            if( !es_out_SetDelay( p_input->p->p_es_out_display, SPU_ES, val.i_time ) )
-            {
-                input_SendEventSubtitleDelay( p_input, val.i_time );
-                UpdatePtsDelay( p_input );
-            }
+            input_SendEventSubtitleDelay( p_input, val.i_time );
+            UpdatePtsDelay( p_input );
             break;
 
         case INPUT_CONTROL_SET_TITLE:
@@ -3011,7 +3009,7 @@ static void InputGetExtraFilesPattern( input_thread_t *p_input,
         if( asprintf( &psz_file, psz_format, psz_base, i ) < 0 )
             break;
 
-        if( utf8_stat( psz_file, &st ) || !S_ISREG( st.st_mode ) || !st.st_size )
+        if( vlc_stat( psz_file, &st ) || !S_ISREG( st.st_mode ) || !st.st_size )
         {
             free( psz_file );
             break;
@@ -3243,7 +3241,7 @@ static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, bool b_for
 
             strcpy( psz_extension, ".idx" );
 
-            if( !utf8_stat( psz_path, &st ) && S_ISREG( st.st_mode ) )
+            if( !vlc_stat( psz_path, &st ) && S_ISREG( st.st_mode ) )
             {
                 msg_Dbg( p_input, "using %s subtitles file instead of %s",
                          psz_path, psz_subtitle );
@@ -3328,7 +3326,7 @@ char *input_CreateFilename( vlc_object_t *p_obj, const char *psz_path, const cha
     char *psz_file;
     DIR *path;
 
-    path = utf8_opendir( psz_path );
+    path = vlc_opendir( psz_path );
     if( path )
     {
         closedir( path );
@@ -3337,16 +3335,14 @@ char *input_CreateFilename( vlc_object_t *p_obj, const char *psz_path, const cha
         if( !psz_tmp )
             return NULL;
 
-        char *psz_tmp2 = filename_sanitize( psz_tmp );
-        free( psz_tmp );
+        filename_sanitize( psz_tmp );
 
-        if( !psz_tmp2 ||
-            asprintf( &psz_file, "%s"DIR_SEP"%s%s%s",
-                      psz_path, psz_tmp2,
+        if( asprintf( &psz_file, "%s"DIR_SEP"%s%s%s",
+                      psz_path, psz_tmp,
                       psz_extension ? "." : "",
                       psz_extension ? psz_extension : "" ) < 0 )
             psz_file = NULL;
-        free( psz_tmp2 );
+        free( psz_tmp );
         return psz_file;
     }
     else