* modules/demux/ts.c: Fixed stream output mode detection.

[vlc] / src / input / es_out.c

diff --git a/src/input/es_out.c b/src/input/es_out.c
index f59ca7b80e73281f73b9a8a4dc9a26b315701312..98f4fa0656cbdb227b1ad760e598c71b0ed3829c 100644 (file)
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -25,18 +25,21 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include <vlc/vlc.h>
+
+#include <stdio.h>
 #include <stdlib.h>
 
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/decoder.h>
+#include <vlc_input.h>
+#include <vlc_es_out.h>
+#include <vlc_block.h>
 
 #include "input_internal.h"
 
 #include "vlc_playlist.h"
 #include "iso_lang.h"
 /* FIXME we should find a better way than including that */
-#include "../misc/iso-639_def.h"
+#include "../text/iso-639_def.h"
 
 /*****************************************************************************
  * Local prototypes
@@ -148,6 +151,7 @@ es_out_t *input_EsOutNew( input_thread_t *p_input )
     out->pf_del     = EsOutDel;
     out->pf_control = EsOutControl;
     out->p_sys      = p_sys;
+    out->b_sout     = (p_input->p->p_sout != NULL ? VLC_TRUE : VLC_FALSE);
 
     p_sys->p_input = p_input;
 
@@ -174,25 +178,33 @@ es_out_t *input_EsOutNew( input_thread_t *p_input )
     var_Get( p_input, "sub-track", &val );
     p_sys->i_sub_last = val.i_int;
 
-    var_Get( p_input, "audio-language", &val );
-    p_sys->ppsz_audio_language = LanguageSplit(val.psz_string);
-    if( p_sys->ppsz_audio_language )
+    if( !p_input->b_preparsing )
     {
-        for( i = 0; p_sys->ppsz_audio_language[i]; i++ )
-            msg_Dbg( p_input, "selected audio language[%d] %s",
-                     i, p_sys->ppsz_audio_language[i] );
-    }
-    if( val.psz_string ) free( val.psz_string );
+        var_Get( p_input, "audio-language", &val );
+        p_sys->ppsz_audio_language = LanguageSplit(val.psz_string);
+        if( p_sys->ppsz_audio_language )
+        {
+            for( i = 0; p_sys->ppsz_audio_language[i]; i++ )
+                msg_Dbg( p_input, "selected audio language[%d] %s",
+                         i, p_sys->ppsz_audio_language[i] );
+        }
+        if( val.psz_string ) free( val.psz_string );
 
-    var_Get( p_input, "sub-language", &val );
-    p_sys->ppsz_sub_language = LanguageSplit(val.psz_string);
-    if( p_sys->ppsz_sub_language )
+        var_Get( p_input, "sub-language", &val );
+        p_sys->ppsz_sub_language = LanguageSplit(val.psz_string);
+        if( p_sys->ppsz_sub_language )
+        {
+            for( i = 0; p_sys->ppsz_sub_language[i]; i++ )
+                msg_Dbg( p_input, "selected subtitle language[%d] %s",
+                         i, p_sys->ppsz_sub_language[i] );
+        }
+        if( val.psz_string ) free( val.psz_string );
+    }
+    else
     {
-        for( i = 0; p_sys->ppsz_sub_language[i]; i++ )
-            msg_Dbg( p_input, "selected subtitle language[%d] %s",
-                     i, p_sys->ppsz_sub_language[i] );
+        p_sys->ppsz_sub_language = NULL;
+        p_sys->ppsz_audio_language = NULL;
     }
-    if( val.psz_string ) free( val.psz_string );
 
     var_Get( p_input, "audio-track-id", &val );
     p_sys->i_audio_id = val.i_int;
@@ -332,7 +344,7 @@ static void EsOutESVarUpdate( es_out_t *out, es_out_id_t *es,
     input_thread_t    *p_input = p_sys->p_input;
     vlc_value_t       val, text;
 
-    char *psz_var;
+    const char *psz_var;
 
     if( es->fmt.i_cat == AUDIO_ES )
         psz_var = "audio-es";
@@ -490,7 +502,7 @@ static es_out_pgrm_t *EsOutProgramAdd( es_out_t *out, int i_group )
     p_pgrm->i_es = 0;
     p_pgrm->b_selected = VLC_FALSE;
     p_pgrm->psz_now_playing = NULL;
-    input_ClockInit( &p_pgrm->clock, VLC_FALSE, p_input->input.i_cr_average );
+    input_ClockInit( &p_pgrm->clock, VLC_FALSE, p_input->p->input.i_cr_average );
 
     /* Append it */
     TAB_APPEND( p_sys->i_pgrm, p_sys->pgrm, p_pgrm );
@@ -565,7 +577,7 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, vlc_meta_t *p_meta )
     es_out_pgrm_t     *p_pgrm = NULL;
     input_thread_t    *p_input = p_sys->p_input;
     char              *psz_cat = malloc( strlen(_("Program")) + 10 );
-    char              *psz_name = NULL;
+    char              *psz_title = NULL;
     char              *psz_now_playing = NULL;
     char              *psz_provider = NULL;
     int i;
@@ -573,10 +585,11 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, vlc_meta_t *p_meta )
     msg_Dbg( p_input, "EsOutProgramMeta: number=%d", i_group );
     sprintf( psz_cat, "%s %d", _("Program"), i_group );
 
-//    if( p_meta->psz_provider) psz_provider = p_meta->psz_provider;
+    if( p_meta->psz_title ) psz_title = p_meta->psz_title;
+    if( p_meta->psz_publisher ) psz_provider = p_meta->psz_publisher;
     if( p_meta->psz_nowplaying ) psz_now_playing = p_meta->psz_nowplaying;
 
-    if( !psz_name && !psz_now_playing )
+    if( !psz_title && !psz_now_playing )
     {
         free( psz_cat );
         return;
@@ -591,11 +604,14 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, vlc_meta_t *p_meta )
         }
     }
 
-    if( p_pgrm == NULL )
-        p_pgrm = EsOutProgramAdd( out, i_group );
+    if( p_pgrm == NULL ) {
+       free( psz_cat );
+       msg_Dbg( p_input, "Trying to add meta for non-existing program" );
+       return;
+    }
 
     /* Update the description text of the program */
-    if( psz_name && *psz_name )
+    if( psz_title && *psz_title )
     {
         vlc_value_t val;
         vlc_value_t text;
@@ -606,13 +622,13 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, vlc_meta_t *p_meta )
 
         if( psz_provider && *psz_provider )
         {
-            asprintf( &text.psz_string, "%s [%s]", psz_name, psz_provider );
+            asprintf( &text.psz_string, "%s [%s]", psz_title, psz_provider );
             var_Change( p_input, "program", VLC_VAR_ADDCHOICE, &val, &text );
             free( text.psz_string );
         }
         else
         {
-            text.psz_string = psz_name;
+            text.psz_string = psz_title;
             var_Change( p_input, "program", VLC_VAR_ADDCHOICE, &val, &text );
         }
     }
@@ -623,8 +639,8 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, vlc_meta_t *p_meta )
 
         if( p_sys->p_pgrm == p_pgrm )
         {
-            input_Control( p_input, INPUT_ADD_INFO, _(VLC_META_INFO_CAT),
-                           _(VLC_META_NOW_PLAYING), "%s", psz_now_playing );
+            vlc_meta_SetNowPlaying( p_input->p->input.p_item->p_meta,
+                                    psz_now_playing );
         }
     }
     free( psz_cat );
@@ -734,7 +750,7 @@ static void EsSelect( es_out_t *out, es_out_id_t *es )
     es_out_sys_t   *p_sys = out->p_sys;
     input_thread_t *p_input = p_sys->p_input;
     vlc_value_t    val;
-    char           *psz_var;
+    const char     *psz_var;
 
     if( es->p_dec )
     {
@@ -745,7 +761,7 @@ static void EsSelect( es_out_t *out, es_out_id_t *es )
     if( es->fmt.i_cat == VIDEO_ES || es->fmt.i_cat == SPU_ES )
     {
         if( !var_GetBool( p_input, "video" ) ||
-            ( p_input->p_sout && !var_GetBool( p_input, "sout-video" ) ) )
+            ( p_input->p->p_sout && !var_GetBool( p_input, "sout-video" ) ) )
         {
             msg_Dbg( p_input, "video is disabled, not selecting ES 0x%x",
                      es->i_id );
@@ -756,7 +772,7 @@ static void EsSelect( es_out_t *out, es_out_id_t *es )
     {
         var_Get( p_input, "audio", &val );
         if( !var_GetBool( p_input, "audio" ) ||
-            ( p_input->p_sout && !var_GetBool( p_input, "sout-audio" ) ) )
+            ( p_input->p->p_sout && !var_GetBool( p_input, "sout-audio" ) ) )
         {
             msg_Dbg( p_input, "audio is disabled, not selecting ES 0x%x",
                      es->i_id );
@@ -767,7 +783,7 @@ static void EsSelect( es_out_t *out, es_out_id_t *es )
     {
         var_Get( p_input, "spu", &val );
         if( !var_GetBool( p_input, "spu" ) ||
-            ( p_input->p_sout && !var_GetBool( p_input, "sout-spu" ) ) )
+            ( p_input->p->p_sout && !var_GetBool( p_input, "sout-spu" ) ) )
         {
             msg_Dbg( p_input, "spu is disabled, not selecting ES 0x%x",
                      es->i_id );
@@ -802,7 +818,7 @@ static void EsUnselect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_update )
     es_out_sys_t   *p_sys = out->p_sys;
     input_thread_t *p_input = p_sys->p_input;
     vlc_value_t    val;
-    char           *psz_var;
+    const char     *psz_var;
 
     if( es->p_dec == NULL )
     {
@@ -1025,9 +1041,12 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
 
     if( p_input->p_libvlc->b_stats )
     {
-        stats_UpdateInteger( p_input, STATS_DEMUX_READ, p_block->i_buffer,
-                             &i_total );
-        stats_UpdateFloat( p_input , STATS_DEMUX_BITRATE, (float)i_total, NULL );
+        vlc_mutex_lock( &p_input->p->counters.counters_lock );
+        stats_UpdateInteger( p_input, p_input->p->counters.p_demux_read,
+                             p_block->i_buffer, &i_total );
+        stats_UpdateFloat( p_input , p_input->p->counters.p_demux_bitrate,
+                           (float)i_total, NULL );
+        vlc_mutex_unlock( &p_input->p->counters.counters_lock );
     }
 
     /* Mark preroll blocks */
@@ -1070,11 +1089,11 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
         }
     }
 
-    p_block->i_rate = p_input->i_rate;
+    p_block->i_rate = p_input->p->i_rate;
 
     /* TODO handle mute */
     if( es->p_dec && ( es->fmt.i_cat != AUDIO_ES ||
-        p_input->i_rate == INPUT_RATE_DEFAULT ) )
+        p_input->p->i_rate == INPUT_RATE_DEFAULT ) )
     {
         input_DecoderDecode( es->p_dec, p_block );
     }
@@ -1285,6 +1304,14 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args )
                     }
                 }
             }
+            {
+                playlist_t * p_playlist = pl_Yield( p_sys->p_input );
+                PL_LOCK;
+                p_playlist->gc_date = mdate();
+                vlc_cond_signal( &p_playlist->object_wait );
+                PL_UNLOCK;
+                pl_Release( p_playlist );
+            }
             return VLC_SUCCESS;
 
         case ES_OUT_SET_PCR: