X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fes_out.c;h=c7dac8e5177460848284f14e5f9d84c73b5953ca;hb=10a6bde56813620846826fed6979b2548a6457ea;hp=04dd3f245011d6df4e40b165dff32bd3d2f50255;hpb=51880eb16eed467a21c34b9e4bb962d1bd6a5be7;p=vlc

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 04dd3f2450..c7dac8e517 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -25,10 +25,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 
 #include <stdio.h>
-#include <stdlib.h>
 
 #include <vlc_input.h>
 #include <vlc_es_out.h>
@@ -37,8 +40,7 @@
 
 #include "input_internal.h"
 
-#include "vlc_playlist.h"
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
 /* FIXME we should find a better way than including that */
 #include "../text/iso-639_def.h"
 
@@ -53,7 +55,7 @@ typedef struct
     /* Number of es for this pgrm */
     int i_es;
 
-    vlc_bool_t b_selected;
+    bool b_selected;
 
     /* Clock for this program */
     input_clock_t clock;
@@ -79,7 +81,15 @@ struct es_out_id_t
     es_format_t fmt;
     char        *psz_language;
     char        *psz_language_code;
+
     decoder_t   *p_dec;
+
+    /* Fields for Video with CC */
+    bool  pb_cc_present[4];
+    es_out_id_t  *pp_cc_es[4];
+
+    /* Field for CC track from a master video */
+    es_out_id_t *p_master;
 };
 
 struct es_out_sys_t
@@ -98,7 +108,7 @@ struct es_out_sys_t
     es_out_id_t **es;
 
     /* mode gestion */
-    vlc_bool_t  b_active;
+    bool  b_active;
     int         i_mode;
 
     /* es count */
@@ -109,6 +119,7 @@ struct es_out_sys_t
     /* es to select */
     int         i_audio_last, i_audio_id;
     int         i_sub_last, i_sub_id;
+    int         i_default_sub_id;   /* As specified in container; if applicable */
     char        **ppsz_audio_language;
     char        **ppsz_sub_language;
 
@@ -120,18 +131,22 @@ struct es_out_sys_t
     /* delay */
     int64_t i_audio_delay;
     int64_t i_spu_delay;
+
+    /* Rate used to rescale ES ts */
+    int         i_rate;
 };
 
 static es_out_id_t *EsOutAdd    ( es_out_t *, es_format_t * );
 static int          EsOutSend   ( es_out_t *, es_out_id_t *, block_t * );
 static void         EsOutDel    ( es_out_t *, es_out_id_t * );
-static void         EsOutSelect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_force );
+static void         EsOutSelect( es_out_t *out, es_out_id_t *es, bool b_force );
 static int          EsOutControl( es_out_t *, int i_query, va_list );
 
 static void         EsOutAddInfo( es_out_t *, es_out_id_t *es );
 
+static bool EsIsSelected( es_out_id_t *es );
 static void EsSelect( es_out_t *out, es_out_id_t *es );
-static void EsUnselect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_update );
+static void EsUnselect( es_out_t *out, es_out_id_t *es, bool b_update );
 static char *LanguageGetName( const char *psz_code );
 static char *LanguageGetCode( const char *psz_lang );
 static char **LanguageSplit( const char *psz_langs );
@@ -139,26 +154,52 @@ static int LanguageArrayIndex( char **ppsz_langs, char *psz_lang );
 
 static char *EsOutProgramGetMetaName( es_out_pgrm_t *p_pgrm );
 
+static const vlc_fourcc_t EsOutFourccClosedCaptions[4] = {
+    VLC_FOURCC('c', 'c', '1', ' '),
+    VLC_FOURCC('c', 'c', '2', ' '),
+    VLC_FOURCC('c', 'c', '3', ' '),
+    VLC_FOURCC('c', 'c', '4', ' '),
+};
+static inline int EsOutGetClosedCaptionsChannel( vlc_fourcc_t fcc )
+{
+    int i;
+    for( i = 0; i < 4; i++ )
+    {
+        if( fcc == EsOutFourccClosedCaptions[i] )
+            return i;
+    }
+    return -1;
+}
+
+
 /*****************************************************************************
  * input_EsOutNew:
  *****************************************************************************/
-es_out_t *input_EsOutNew( input_thread_t *p_input )
+es_out_t *input_EsOutNew( input_thread_t *p_input, int i_rate )
 {
-    es_out_t     *out = malloc( sizeof( es_out_t ) );
-    es_out_sys_t *p_sys = malloc( sizeof( es_out_sys_t ) );
     vlc_value_t  val;
     int i;
 
+    es_out_t     *out = malloc( sizeof( es_out_t ) );
+    if( !out ) return NULL;
+
+    es_out_sys_t *p_sys = malloc( sizeof( es_out_sys_t ) );
+    if( !p_sys )
+    {
+        free( out );
+        return NULL;
+    }
+
     out->pf_add     = EsOutAdd;
     out->pf_send    = EsOutSend;
     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);
+    out->b_sout     = p_input->p->p_sout != NULL;
 
     p_sys->p_input = p_input;
 
-    p_sys->b_active = VLC_FALSE;
+    p_sys->b_active = false;
     p_sys->i_mode   = ES_OUT_MODE_AUTO;
 
 
@@ -180,6 +221,8 @@ 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;
 
+    p_sys->i_default_sub_id   = -1;
+
     if( !p_input->b_preparsing )
     {
         var_Get( p_input, "audio-language", &val );
@@ -190,7 +233,7 @@ es_out_t *input_EsOutNew( input_thread_t *p_input )
                 msg_Dbg( p_input, "selected audio language[%d] %s",
                          i, p_sys->ppsz_audio_language[i] );
         }
-        if( val.psz_string ) free( val.psz_string );
+        free( val.psz_string );
 
         var_Get( p_input, "sub-language", &val );
         p_sys->ppsz_sub_language = LanguageSplit(val.psz_string);
@@ -200,7 +243,7 @@ es_out_t *input_EsOutNew( input_thread_t *p_input )
                 msg_Dbg( p_input, "selected subtitle language[%d] %s",
                          i, p_sys->ppsz_sub_language[i] );
         }
-        if( val.psz_string ) free( val.psz_string );
+        free( val.psz_string );
     }
     else
     {
@@ -221,6 +264,8 @@ es_out_t *input_EsOutNew( input_thread_t *p_input )
     p_sys->i_audio_delay= 0;
     p_sys->i_spu_delay  = 0;
 
+    p_sys->i_rate = i_rate;
+
     return out;
 }
 
@@ -238,10 +283,8 @@ void input_EsOutDelete( es_out_t *out )
         {
             input_DecoderDelete( p_sys->es[i]->p_dec );
         }
-        if( p_sys->es[i]->psz_language )
-            free( p_sys->es[i]->psz_language );
-        if( p_sys->es[i]->psz_language_code )
-            free( p_sys->es[i]->psz_language_code );
+        free( p_sys->es[i]->psz_language );
+        free( p_sys->es[i]->psz_language_code );
         es_format_Clean( &p_sys->es[i]->fmt );
 
         free( p_sys->es[i] );
@@ -259,19 +302,15 @@ void input_EsOutDelete( es_out_t *out )
         free( p_sys->ppsz_sub_language );
     }
 
-    if( p_sys->es )
-        free( p_sys->es );
+    free( p_sys->es );
 
     /* FIXME duplicate work EsOutProgramDel (but we cannot use it) add a EsOutProgramClean ? */
     for( i = 0; i < p_sys->i_pgrm; i++ )
     {
         es_out_pgrm_t *p_pgrm = p_sys->pgrm[i];
-        if( p_pgrm->psz_now_playing )
-            free( p_pgrm->psz_now_playing );
-        if( p_pgrm->psz_publisher )
-            free( p_pgrm->psz_publisher );
-        if( p_pgrm->psz_name )
-            free( p_pgrm->psz_name );
+        free( p_pgrm->psz_now_playing );
+        free( p_pgrm->psz_publisher );
+        free( p_pgrm->psz_name );
         if( p_pgrm->p_epg )
             vlc_epg_Delete( p_pgrm->p_epg );
 
@@ -300,7 +339,7 @@ es_out_id_t *input_EsOutGetFromID( es_out_t *out, int i_id )
     return NULL;
 }
 
-void input_EsOutDiscontinuity( es_out_t *out, vlc_bool_t b_flush, vlc_bool_t b_audio )
+static void EsOutDiscontinuity( es_out_t *out, bool b_flush, bool b_audio )
 {
     es_out_sys_t      *p_sys = out->p_sys;
     int i;
@@ -315,13 +354,16 @@ void input_EsOutDiscontinuity( es_out_t *out, vlc_bool_t b_flush, vlc_bool_t b_a
             input_DecoderDiscontinuity( es->p_dec, b_flush );
     }
 }
-void input_EsOutSetRate( es_out_t *out )
+void input_EsOutChangeRate( es_out_t *out, int i_rate )
 {
     es_out_sys_t      *p_sys = out->p_sys;
     int i;
 
+    p_sys->i_rate = i_rate;
+    EsOutDiscontinuity( out, false, false );
+
     for( i = 0; i < p_sys->i_pgrm; i++ )
-        input_ClockSetRate( p_sys->p_input, &p_sys->pgrm[i]->clock );
+        input_ClockSetRate( &p_sys->pgrm[i]->clock, i_rate );
 }
 
 void input_EsOutSetDelay( es_out_t *out, int i_cat, int64_t i_delay )
@@ -333,8 +375,32 @@ void input_EsOutSetDelay( es_out_t *out, int i_cat, int64_t i_delay )
     else if( i_cat == SPU_ES )
         p_sys->i_spu_delay = i_delay;
 }
+void input_EsOutChangeState( es_out_t *out )
+{
+    es_out_sys_t *p_sys = out->p_sys;
+    input_thread_t *p_input = p_sys->p_input;
 
-vlc_bool_t input_EsOutDecodersEmpty( es_out_t *out )
+    if( p_input->i_state  == PAUSE_S )
+    {
+        /* Send discontinuity to decoders (it will allow them to flush
+         *                  * if implemented */
+        EsOutDiscontinuity( out, false, false );
+    }
+    else
+    {
+        /* Out of pause, reset pcr */
+        es_out_Control( out, ES_OUT_RESET_PCR );
+    }
+}
+void input_EsOutChangePosition( es_out_t *out )
+{
+    //es_out_sys_t *p_sys = out->p_sys;
+
+    es_out_Control( out, ES_OUT_RESET_PCR );
+    EsOutDiscontinuity( out, true, false );
+}
+
+bool input_EsOutDecodersEmpty( es_out_t *out )
 {
     es_out_sys_t      *p_sys = out->p_sys;
     int i;
@@ -344,37 +410,42 @@ vlc_bool_t input_EsOutDecodersEmpty( es_out_t *out )
         es_out_id_t *es = p_sys->es[i];
 
         if( es->p_dec && !input_DecoderEmpty( es->p_dec ) )
-            return VLC_FALSE;
+            return false;
     }
-    return VLC_TRUE;
+    return true;
 }
 
 /*****************************************************************************
  *
  *****************************************************************************/
-static void EsOutESVarUpdate( es_out_t *out, es_out_id_t *es,
-                              vlc_bool_t b_delete )
+static void EsOutESVarUpdateGeneric( es_out_t *out, int i_id, es_format_t *fmt, const char *psz_language,
+                                     bool b_delete )
 {
     es_out_sys_t      *p_sys = out->p_sys;
     input_thread_t    *p_input = p_sys->p_input;
+    const  bool b_teletext = fmt->i_cat == SPU_ES && fmt->i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' );
     vlc_value_t       val, text;
 
     const char *psz_var;
 
-    if( es->fmt.i_cat == AUDIO_ES )
+    if( fmt->i_cat == AUDIO_ES )
         psz_var = "audio-es";
-    else if( es->fmt.i_cat == VIDEO_ES )
+    else if( fmt->i_cat == VIDEO_ES )
         psz_var = "video-es";
-    else if( es->fmt.i_cat == SPU_ES )
+    else if( fmt->i_cat == SPU_ES )
         psz_var = "spu-es";
     else
         return;
 
     if( b_delete )
     {
-        val.i_int = es->i_id;
+        if( b_teletext )
+            var_SetInteger( p_sys->p_input, "teletext-es", -1 );
+
+        val.i_int = i_id;
         var_Change( p_input, psz_var, VLC_VAR_DELCHOICE, &val, NULL );
-        var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
+
+        var_SetBool( p_sys->p_input, "intf-change", true );
         return;
     }
 
@@ -391,41 +462,46 @@ static void EsOutESVarUpdate( es_out_t *out, es_out_id_t *es,
     }
 
     /* Take care of the ES description */
-    if( es->fmt.psz_description && *es->fmt.psz_description )
+    if( fmt->psz_description && *fmt->psz_description )
     {
-        if( es->psz_language && *es->psz_language )
+        if( psz_language && *psz_language )
         {
-            text.psz_string = malloc( strlen( es->fmt.psz_description) +
-                                      strlen( es->psz_language ) + 10 );
-            sprintf( text.psz_string, "%s - [%s]", es->fmt.psz_description,
-                                                   es->psz_language );
+            text.psz_string = malloc( strlen( fmt->psz_description) +
+                                      strlen( psz_language ) + 10 );
+            sprintf( text.psz_string, "%s - [%s]", fmt->psz_description,
+                                                   psz_language );
         }
-        else text.psz_string = strdup( es->fmt.psz_description );
+        else text.psz_string = strdup( fmt->psz_description );
     }
     else
     {
-        if( es->psz_language && *es->psz_language )
+        if( psz_language && *psz_language )
         {
-            char *temp;
-            text.psz_string = malloc( strlen( _("Track %i") )+
-                                      strlen( es->psz_language ) + 30 );
-            asprintf( &temp,  _("Track %i"), val.i_int );
-            sprintf( text.psz_string, "%s - [%s]", temp, es->psz_language );
-            free( temp );
+            if( asprintf( &text.psz_string, "%s %i - [%s]", _( "Track" ), val.i_int, psz_language ) == -1 )
+                text.psz_string = NULL;
         }
         else
         {
-            text.psz_string = malloc( strlen( _("Track %i") ) + 20 );
-            sprintf( text.psz_string, _("Track %i"), val.i_int );
+            if( asprintf( &text.psz_string, "%s %i", _( "Track" ), val.i_int ) == -1 )
+                text.psz_string = NULL;
         }
     }
 
-    val.i_int = es->i_id;
+    val.i_int = i_id;
     var_Change( p_input, psz_var, VLC_VAR_ADDCHOICE, &val, &text );
 
     free( text.psz_string );
 
-    var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
+    if( b_teletext )
+        var_SetInteger( p_sys->p_input, "teletext-es", i_id );
+
+    var_SetBool( p_sys->p_input, "intf-change", true );
+}
+
+static void EsOutESVarUpdate( es_out_t *out, es_out_id_t *es,
+                              bool b_delete )
+{
+    EsOutESVarUpdateGeneric( out, es->i_id, &es->fmt, es->psz_language, b_delete );
 }
 
 /* EsOutProgramSelect:
@@ -448,9 +524,9 @@ static void EsOutProgramSelect( es_out_t *out, es_out_pgrm_t *p_pgrm )
 
         for( i = 0; i < p_sys->i_es; i++ )
         {
-            if( p_sys->es[i]->p_pgrm == old && p_sys->es[i]->p_dec &&
+            if( p_sys->es[i]->p_pgrm == old && EsIsSelected( p_sys->es[i] ) &&
                 p_sys->i_mode != ES_OUT_MODE_ALL )
-                EsUnselect( out, p_sys->es[i], VLC_TRUE );
+                EsUnselect( out, p_sys->es[i], true );
         }
 
         p_sys->p_es_audio = NULL;
@@ -461,14 +537,14 @@ static void EsOutProgramSelect( es_out_t *out, es_out_pgrm_t *p_pgrm )
     msg_Dbg( p_input, "selecting program id=%d", p_pgrm->i_id );
 
     /* Mark it selected */
-    p_pgrm->b_selected = VLC_TRUE;
+    p_pgrm->b_selected = true;
 
     /* Switch master stream */
     if( p_sys->p_pgrm && p_sys->p_pgrm->clock.b_master )
     {
-        p_sys->p_pgrm->clock.b_master = VLC_FALSE;
+        p_sys->p_pgrm->clock.b_master = false;
     }
-    p_pgrm->clock.b_master = VLC_TRUE;
+    p_pgrm->clock.b_master = true;
     p_sys->p_pgrm = p_pgrm;
 
     /* Update "program" */
@@ -479,22 +555,21 @@ static void EsOutProgramSelect( es_out_t *out, es_out_pgrm_t *p_pgrm )
     var_Change( p_input, "audio-es", VLC_VAR_CLEARCHOICES, NULL, NULL );
     var_Change( p_input, "video-es", VLC_VAR_CLEARCHOICES, NULL, NULL );
     var_Change( p_input, "spu-es",   VLC_VAR_CLEARCHOICES, NULL, NULL );
+    var_SetInteger( p_input, "teletext-es", -1 );
     for( i = 0; i < p_sys->i_es; i++ )
     {
         if( p_sys->es[i]->p_pgrm == p_sys->p_pgrm )
-            EsOutESVarUpdate( out, p_sys->es[i], VLC_FALSE );
-        EsOutSelect( out, p_sys->es[i], VLC_FALSE );
+            EsOutESVarUpdate( out, p_sys->es[i], false );
+        EsOutSelect( out, p_sys->es[i], false );
     }
 
     /* Update now playing */
-    vlc_mutex_lock( &p_input->p->input.p_item->lock );
     input_item_SetNowPlaying( p_input->p->input.p_item,
                               p_pgrm->psz_now_playing );
     input_item_SetPublisher( p_input->p->input.p_item,
                              p_pgrm->psz_publisher );
-    vlc_mutex_unlock( &p_input->p->input.p_item->lock );
 
-    var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
+    var_SetBool( p_sys->p_input, "intf-change", true );
 }
 
 /* EsOutAddProgram:
@@ -507,16 +582,17 @@ static es_out_pgrm_t *EsOutProgramAdd( es_out_t *out, int i_group )
     vlc_value_t       val;
 
     es_out_pgrm_t *p_pgrm = malloc( sizeof( es_out_pgrm_t ) );
+    if( !p_pgrm ) return NULL;
 
     /* Init */
     p_pgrm->i_id = i_group;
     p_pgrm->i_es = 0;
-    p_pgrm->b_selected = VLC_FALSE;
+    p_pgrm->b_selected = false;
     p_pgrm->psz_name = NULL;
     p_pgrm->psz_now_playing = NULL;
     p_pgrm->psz_publisher = NULL;
     p_pgrm->p_epg = NULL;
-    input_ClockInit( p_input, &p_pgrm->clock, VLC_FALSE, p_input->p->input.i_cr_average );
+    input_ClockInit( &p_pgrm->clock, false, p_input->p->input.i_cr_average, p_sys->i_rate );
 
     /* Append it */
     TAB_APPEND( p_sys->i_pgrm, p_sys->pgrm, p_pgrm );
@@ -531,7 +607,7 @@ static es_out_pgrm_t *EsOutProgramAdd( es_out_t *out, int i_group )
     }
     else
     {
-        var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
+        var_SetBool( p_sys->p_input, "intf-change", true );
     }
     return p_pgrm;
 }
@@ -571,9 +647,9 @@ static int EsOutProgramDel( es_out_t *out, int i_group )
     /* If program is selected we need to unselect it */
     if( p_sys->p_pgrm == p_pgrm ) p_sys->p_pgrm = NULL;
 
-    if( p_pgrm->psz_name ) free( p_pgrm->psz_name );
-    if( p_pgrm->psz_now_playing ) free( p_pgrm->psz_now_playing );
-    if( p_pgrm->psz_publisher ) free( p_pgrm->psz_publisher );
+    free( p_pgrm->psz_name );
+    free( p_pgrm->psz_now_playing );
+    free( p_pgrm->psz_publisher );
     if( p_pgrm->p_epg )
         vlc_epg_Delete( p_pgrm->p_epg );
     free( p_pgrm );
@@ -582,7 +658,7 @@ static int EsOutProgramDel( es_out_t *out, int i_group )
     val.i_int = i_group;
     var_Change( p_input, "program", VLC_VAR_DELCHOICE, &val, NULL );
 
-    var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
+    var_SetBool( p_sys->p_input, "intf-change", true );
 
     return VLC_SUCCESS;
 }
@@ -616,7 +692,9 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, vlc_meta_t *p_meta )
         !vlc_meta_Get( p_meta, vlc_meta_NowPlaying) &&
         !vlc_meta_Get( p_meta, vlc_meta_Publisher) &&
         vlc_dictionary_keys_count( &p_meta->extra_tags ) <= 0 )
-            return;
+    {
+        return;
+    }
     /* Find program */
     for( i = 0; i < p_sys->i_pgrm; i++ )
     {
@@ -648,7 +726,7 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, vlc_meta_t *p_meta )
             /* TODO update epg name */
             free( psz_cat );
         }
-        if( p_pgrm->psz_name ) free( p_pgrm->psz_name );
+        free( p_pgrm->psz_name );
         p_pgrm->psz_name = strdup( psz_title );
 
         /* ugly but it works */
@@ -672,11 +750,7 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, vlc_meta_t *p_meta )
     if( psz_provider )
     {
         if( p_sys->p_pgrm == p_pgrm )
-        {
-            vlc_mutex_lock( &p_input->p->input.p_item->lock );
             input_item_SetPublisher( p_input->p->input.p_item, psz_provider );
-            vlc_mutex_unlock( &p_input->p->input.p_item->lock );
-        }
         input_Control( p_input, INPUT_ADD_INFO, psz_cat, input_MetaTypeToLocalizedString(vlc_meta_Publisher), psz_provider );
     }
     char ** ppsz_all_keys = vlc_dictionary_all_keys( &p_meta->extra_tags );
@@ -699,14 +773,14 @@ static void vlc_epg_Merge( vlc_epg_t *p_dst, const vlc_epg_t *p_src )
     for( i = 0; i < p_src->i_event; i++ )
     {
         vlc_epg_event_t *p_evt = p_src->pp_event[i];
-        vlc_bool_t b_add = VLC_TRUE;
+        bool b_add = true;
         int j;
 
         for( j = 0; j < p_dst->i_event; j++ )
         {
             if( p_dst->pp_event[j]->i_start == p_evt->i_start && p_dst->pp_event[j]->i_duration == p_evt->i_duration )
             {
-                b_add = VLC_FALSE;
+                b_add = false;
                 break;
             }
             if( p_dst->pp_event[j]->i_start > p_evt->i_start )
@@ -743,7 +817,6 @@ static void EsOutProgramEpg( es_out_t *out, int i_group, vlc_epg_t *p_epg )
     input_thread_t    *p_input = p_sys->p_input;
     es_out_pgrm_t     *p_pgrm = NULL;
     char *psz_cat;
-    char *psz_epg;
     int i;
 
     /* Find program */
@@ -766,7 +839,9 @@ static void EsOutProgramEpg( es_out_t *out, int i_group, vlc_epg_t *p_epg )
     /* Update info */
     psz_cat = EsOutProgramGetMetaName( p_pgrm );
 #ifdef HAVE_LOCALTIME_R
-    asprintf( &psz_epg, "EPG %s", psz_cat );
+    char *psz_epg;
+    if( asprintf( &psz_epg, "EPG %s", psz_cat ) == -1 )
+        psz_epg = NULL;
     input_Control( p_input, INPUT_DEL_INFO, psz_epg, NULL );
     msg_Dbg( p_input, "EsOutProgramEpg: number=%d name=%s", i_group, p_pgrm->p_epg->psz_name );
     for( i = 0; i < p_pgrm->p_epg->i_event; i++ )
@@ -792,16 +867,13 @@ static void EsOutProgramEpg( es_out_t *out, int i_group, vlc_epg_t *p_epg )
     free( psz_epg );
 #endif
     /* Update now playing */
-    if( p_pgrm->psz_now_playing )
-        free( p_pgrm->psz_now_playing );
+    free( p_pgrm->psz_now_playing );
     p_pgrm->psz_now_playing = NULL;
     if( p_epg->p_current && p_epg->p_current->psz_name && *p_epg->p_current->psz_name )
         p_pgrm->psz_now_playing = strdup( p_epg->p_current->psz_name );
 
-    vlc_mutex_lock( &p_input->p->input.p_item->lock );
     if( p_pgrm == p_sys->p_pgrm )
         input_item_SetNowPlaying( p_input->p->input.p_item, p_pgrm->psz_now_playing );
-    vlc_mutex_unlock( &p_input->p->input.p_item->lock );
 
     if( p_pgrm->psz_now_playing )
     {
@@ -830,9 +902,12 @@ static es_out_id_t *EsOutAdd( es_out_t *out, es_format_t *fmt )
     es_out_pgrm_t     *p_pgrm = NULL;
     int i;
 
+    if( !es ) return NULL;
+
     if( fmt->i_group < 0 )
     {
         msg_Err( p_input, "invalid group number" );
+        free( es );
         return NULL;
     }
 
@@ -865,8 +940,31 @@ static es_out_id_t *EsOutAdd( es_out_t *out, es_format_t *fmt )
     switch( fmt->i_cat )
     {
     case AUDIO_ES:
+    {
+        audio_replay_gain_t rg;
+
         es->i_channel = p_sys->i_audio;
+
+        vlc_mutex_lock( &p_input->p->input.p_item->lock );
+        memset( &rg, 0, sizeof(rg) );
+        vlc_audio_replay_gain_MergeFromMeta( &rg, p_input->p->input.p_item->p_meta );
+        vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+
+        for( i = 0; i < AUDIO_REPLAY_GAIN_MAX; i++ )
+        {
+            if( !es->fmt.audio_replay_gain.pb_peak[i] )
+            {
+                es->fmt.audio_replay_gain.pb_peak[i] = rg.pb_peak[i];
+                es->fmt.audio_replay_gain.pf_peak[i] = rg.pf_peak[i];
+            }
+            if( !es->fmt.audio_replay_gain.pb_gain[i] )
+            {
+                es->fmt.audio_replay_gain.pb_gain[i] = rg.pb_gain[i];
+                es->fmt.audio_replay_gain.pf_gain[i] = rg.pf_gain[i];
+            }
+        }
         break;
+    }
 
     case VIDEO_ES:
         es->i_channel = p_sys->i_video;
@@ -888,12 +986,15 @@ static es_out_id_t *EsOutAdd( es_out_t *out, es_format_t *fmt )
     es->psz_language = LanguageGetName( fmt->psz_language ); /* remember so we only need to do it once */
     es->psz_language_code = LanguageGetCode( fmt->psz_language );
     es->p_dec = NULL;
+    for( i = 0; i < 4; i++ )
+        es->pb_cc_present[i] = false;
+    es->p_master = false;
 
     if( es->p_pgrm == p_sys->p_pgrm )
-        EsOutESVarUpdate( out, es, VLC_FALSE );
+        EsOutESVarUpdate( out, es, false );
 
     /* Select it if needed */
-    EsOutSelect( out, es, VLC_FALSE );
+    EsOutSelect( out, es, false );
 
 
     TAB_APPEND( out->p_sys->i_es, out->p_sys->es, es );
@@ -916,6 +1017,24 @@ static es_out_id_t *EsOutAdd( es_out_t *out, es_format_t *fmt )
     return es;
 }
 
+static bool EsIsSelected( es_out_id_t *es )
+{
+    if( es->p_master )
+    {
+        bool b_decode = false;
+        if( es->p_master->p_dec )
+        {
+            int i_channel = EsOutGetClosedCaptionsChannel( es->fmt.i_codec );
+            if( i_channel != -1 )
+                input_DecoderGetCcState( es->p_master->p_dec, &b_decode, i_channel );
+        }
+        return b_decode;
+    }
+    else
+    {
+        return es->p_dec != NULL;
+    }
+}
 static void EsSelect( es_out_t *out, es_out_id_t *es )
 {
     es_out_sys_t   *p_sys = out->p_sys;
@@ -923,49 +1042,59 @@ static void EsSelect( es_out_t *out, es_out_id_t *es )
     vlc_value_t    val;
     const char     *psz_var;
 
-    if( es->p_dec )
+    if( EsIsSelected( es ) )
     {
         msg_Warn( p_input, "ES 0x%x is already selected", es->i_id );
         return;
     }
 
-    if( es->fmt.i_cat == VIDEO_ES || es->fmt.i_cat == SPU_ES )
+    if( es->p_master )
     {
-        if( !var_GetBool( p_input, "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 );
+        int i_channel;
+        if( !es->p_master->p_dec )
+            return;
+
+        i_channel = EsOutGetClosedCaptionsChannel( es->fmt.i_codec );
+        if( i_channel == -1 || input_DecoderSetCcState( es->p_master->p_dec, true, i_channel ) )
             return;
-        }
     }
-    else if( es->fmt.i_cat == AUDIO_ES )
+    else
     {
-        var_Get( p_input, "audio", &val );
-        if( !var_GetBool( p_input, "audio" ) ||
-            ( p_input->p->p_sout && !var_GetBool( p_input, "sout-audio" ) ) )
+        if( es->fmt.i_cat == VIDEO_ES || es->fmt.i_cat == SPU_ES )
         {
-            msg_Dbg( p_input, "audio is disabled, not selecting ES 0x%x",
-                     es->i_id );
-            return;
+            if( !var_GetBool( p_input, out->b_sout ? "sout-video" : "video" ) )
+            {
+                msg_Dbg( p_input, "video is disabled, not selecting ES 0x%x",
+                         es->i_id );
+                return;
+            }
         }
-    }
-    if( es->fmt.i_cat == SPU_ES )
-    {
-        var_Get( p_input, "spu", &val );
-        if( !var_GetBool( p_input, "spu" ) ||
-            ( p_input->p->p_sout && !var_GetBool( p_input, "sout-spu" ) ) )
+        else if( es->fmt.i_cat == AUDIO_ES )
         {
-            msg_Dbg( p_input, "spu is disabled, not selecting ES 0x%x",
-                     es->i_id );
-            return;
+            var_Get( p_input, "audio", &val );
+            if( !var_GetBool( p_input, out->b_sout ? "sout-audio" : "audio" ) )
+            {
+                msg_Dbg( p_input, "audio is disabled, not selecting ES 0x%x",
+                         es->i_id );
+                return;
+            }
+        }
+        if( es->fmt.i_cat == SPU_ES )
+        {
+            var_Get( p_input, "spu", &val );
+            if( !var_GetBool( p_input, out->b_sout ? "sout-spu" : "spu" ) )
+            {
+                msg_Dbg( p_input, "spu is disabled, not selecting ES 0x%x",
+                         es->i_id );
+                return;
+            }
         }
-    }
 
-    es->i_preroll_end = -1;
-    es->p_dec = input_DecoderNew( p_input, &es->fmt, VLC_FALSE );
-    if( es->p_dec == NULL || es->p_pgrm != p_sys->p_pgrm )
-        return;
+        es->i_preroll_end = -1;
+        es->p_dec = input_DecoderNew( p_input, &es->fmt, false );
+        if( es->p_dec == NULL || es->p_pgrm != p_sys->p_pgrm )
+            return;
+    }
 
     if( es->fmt.i_cat == VIDEO_ES )
         psz_var = "video-es";
@@ -980,25 +1109,55 @@ static void EsSelect( es_out_t *out, es_out_id_t *es )
     val.i_int = es->i_id;
     var_Change( p_input, psz_var, VLC_VAR_SETVALUE, &val, NULL );
 
-
-    var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
+    var_SetBool( p_sys->p_input, "intf-change", true );
 }
 
-static void EsUnselect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_update )
+static void EsUnselect( es_out_t *out, es_out_id_t *es, bool b_update )
 {
     es_out_sys_t   *p_sys = out->p_sys;
     input_thread_t *p_input = p_sys->p_input;
     vlc_value_t    val;
     const char     *psz_var;
 
-    if( es->p_dec == NULL )
+    if( !EsIsSelected( es ) )
     {
         msg_Warn( p_input, "ES 0x%x is already unselected", es->i_id );
         return;
     }
 
-    input_DecoderDelete( es->p_dec );
-    es->p_dec = NULL;
+    if( es->p_master )
+    {
+        if( es->p_master->p_dec )
+        {
+            int i_channel = EsOutGetClosedCaptionsChannel( es->fmt.i_codec );
+            if( i_channel != -1 )
+                input_DecoderSetCcState( es->p_master->p_dec, false, i_channel );
+        }
+    }
+    else
+    {
+        const int i_spu_id = var_GetInteger( p_input, "spu-es");
+        int i;
+        for( i = 0; i < 4; i++ )
+        {
+            if( !es->pb_cc_present[i] || !es->pp_cc_es[i] )
+                continue;
+
+            if( i_spu_id == es->pp_cc_es[i]->i_id )
+            {
+                /* Force unselection of the CC */
+                val.i_int = -1;
+                var_Change( p_input, "spu-es", VLC_VAR_SETVALUE, &val, NULL );
+                if( !b_update )
+                    var_SetBool( p_sys->p_input, "intf-change", true );
+            }
+            EsOutDel( out, es->pp_cc_es[i] );
+
+            es->pb_cc_present[i] = false;
+        }
+        input_DecoderDelete( es->p_dec );
+        es->p_dec = NULL;
+    }
 
     if( !b_update )
         return;
@@ -1015,11 +1174,11 @@ static void EsUnselect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_update )
     else
         return;
 
-    /* Mark it as selected */
+    /* Mark it as unselected */
     val.i_int = -1;
     var_Change( p_input, psz_var, VLC_VAR_SETVALUE, &val, NULL );
 
-    var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
+    var_SetBool( p_sys->p_input, "intf-change", true );
 }
 
 /**
@@ -1031,7 +1190,7 @@ static void EsUnselect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_update )
  * \param b_force ...
  * \return nothing
  */
-static void EsOutSelect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_force )
+static void EsOutSelect( es_out_t *out, es_out_id_t *es, bool b_force )
 {
     es_out_sys_t      *p_sys = out->p_sys;
 
@@ -1045,7 +1204,7 @@ static void EsOutSelect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_force )
 
     if( p_sys->i_mode == ES_OUT_MODE_ALL || b_force )
     {
-        if( !es->p_dec )
+        if( !EsIsSelected( es ) )
             EsSelect( out, es );
     }
     else if( p_sys->i_mode == ES_OUT_MODE_PARTIAL )
@@ -1057,7 +1216,7 @@ static void EsOutSelect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_force )
         {
             if ( val.p_list->p_values[i].i_int == es->p_pgrm->i_id || b_force )
             {
-                if( !es->p_dec )
+                if( !EsIsSelected( es ) )
                     EsSelect( out, es );
                 break;
             }
@@ -1136,6 +1295,12 @@ static void EsOutSelect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_force )
 
                 i_wanted  = es->i_channel;
             }
+            else if( p_sys->i_default_sub_id >= 0 )
+            {
+                if( es->i_id == p_sys->i_default_sub_id )
+                    i_wanted = es->i_channel;
+            }
+
             if( p_sys->i_sub_last >= 0 )
                 i_wanted  = p_sys->i_sub_last;
 
@@ -1152,21 +1317,21 @@ static void EsOutSelect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_force )
             i_wanted  = es->i_channel;
         }
 
-        if( i_wanted == es->i_channel && es->p_dec == NULL )
+        if( i_wanted == es->i_channel && !EsIsSelected( es ) )
             EsSelect( out, es );
     }
 
     /* FIXME TODO handle priority here */
-    if( es->p_dec )
+    if( EsIsSelected( es ) )
     {
         if( i_cat == AUDIO_ES )
         {
             if( p_sys->i_mode == ES_OUT_MODE_AUTO &&
                 p_sys->p_es_audio &&
                 p_sys->p_es_audio != es &&
-                p_sys->p_es_audio->p_dec )
+                EsIsSelected( p_sys->p_es_audio ) )
             {
-                EsUnselect( out, p_sys->p_es_audio, VLC_FALSE );
+                EsUnselect( out, p_sys->p_es_audio, false );
             }
             p_sys->p_es_audio = es;
         }
@@ -1175,9 +1340,9 @@ static void EsOutSelect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_force )
             if( p_sys->i_mode == ES_OUT_MODE_AUTO &&
                 p_sys->p_es_sub &&
                 p_sys->p_es_sub != es &&
-                p_sys->p_es_sub->p_dec )
+                EsIsSelected( p_sys->p_es_sub ) )
             {
-                EsUnselect( out, p_sys->p_es_sub, VLC_FALSE );
+                EsUnselect( out, p_sys->p_es_sub, false );
             }
             p_sys->p_es_sub = es;
         }
@@ -1210,7 +1375,7 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
     else
         i_delay = 0;
 
-    if( p_input->p_libvlc->b_stats )
+    if( libvlc_stats (p_input) )
     {
         vlc_mutex_lock( &p_input->p->counters.counters_lock );
         stats_UpdateInteger( p_input, p_input->p->counters.p_demux_read,
@@ -1251,7 +1416,8 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
         p_block->i_pts =
             input_ClockGetTS( p_input, &p_pgrm->clock, p_block->i_pts ) + i_delay;
     }
-    if ( es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) )
+    if ( p_block->i_rate == INPUT_RATE_DEFAULT &&
+         es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) )
     {
         mtime_t current_date = mdate();
         if( !p_block->i_pts
@@ -1265,15 +1431,54 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
         }
     }
 
-    p_block->i_rate = p_input->p->i_rate;
+    p_block->i_rate = p_sys->i_rate;
 
     /* TODO handle mute */
     if( es->p_dec &&
         ( es->fmt.i_cat != AUDIO_ES ||
-          ( p_input->p->i_rate >= INPUT_RATE_DEFAULT/AOUT_MAX_INPUT_RATE &&
-            p_input->p->i_rate <= INPUT_RATE_DEFAULT*AOUT_MAX_INPUT_RATE ) ) )
+          ( p_sys->i_rate >= INPUT_RATE_DEFAULT/AOUT_MAX_INPUT_RATE &&
+            p_sys->i_rate <= INPUT_RATE_DEFAULT*AOUT_MAX_INPUT_RATE ) ) )
     {
+        bool pb_cc[4];
+        bool b_cc_new = false;
+        int i;
         input_DecoderDecode( es->p_dec, p_block );
+
+        /* Check CC status */
+        input_DecoderIsCcPresent( es->p_dec, pb_cc );
+        for( i = 0; i < 4; i++ )
+        {
+            static const vlc_fourcc_t fcc[4] = {
+                VLC_FOURCC('c', 'c', '1', ' '),
+                VLC_FOURCC('c', 'c', '2', ' '),
+                VLC_FOURCC('c', 'c', '3', ' '),
+                VLC_FOURCC('c', 'c', '4', ' '),
+            };
+            static const char ppsz_description[4][18] = {
+                N_("Closed captions 1"),
+                N_("Closed captions 2"),
+                N_("Closed captions 3"),
+                N_("Closed captions 4"),
+            };
+            es_format_t fmt;
+
+            if(  es->pb_cc_present[i] || !pb_cc[i] )
+                continue;
+            msg_Dbg( p_input, "Adding CC track %d for es[%d]", 1+i, es->i_id );
+
+            es_format_Init( &fmt, SPU_ES, fcc[i] );
+            fmt.i_group = es->fmt.i_group;
+            fmt.psz_description = strdup( _(ppsz_description[i] ) );
+            es->pp_cc_es[i] = EsOutAdd( out, &fmt );
+            es->pp_cc_es[i]->p_master = es;
+            es_format_Clean( &fmt );
+
+            /* */
+            es->pb_cc_present[i] = true;
+            b_cc_new = true;
+        }
+        if( b_cc_new )
+            var_SetBool( p_sys->p_input, "intf-change", true );
     }
     else
     {
@@ -1289,7 +1494,7 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
 static void EsOutDel( es_out_t *out, es_out_id_t *es )
 {
     es_out_sys_t *p_sys = out->p_sys;
-    vlc_bool_t b_reselect = VLC_FALSE;
+    bool b_reselect = false;
     int i;
 
     /* We don't try to reselect */
@@ -1305,7 +1510,7 @@ static void EsOutDel( es_out_t *out, es_out_id_t *es )
     }
 
     if( es->p_pgrm == p_sys->p_pgrm )
-        EsOutESVarUpdate( out, es, VLC_TRUE );
+        EsOutESVarUpdate( out, es, true );
 
     TAB_REMOVE( p_sys->i_es, p_sys->es, es );
 
@@ -1316,7 +1521,7 @@ static void EsOutDel( es_out_t *out, es_out_id_t *es )
     }
 
     if( p_sys->p_es_audio == es || p_sys->p_es_video == es ||
-        p_sys->p_es_sub == es ) b_reselect = VLC_TRUE;
+        p_sys->p_es_sub == es ) b_reselect = true;
 
     if( p_sys->p_es_audio == es ) p_sys->p_es_audio = NULL;
     if( p_sys->p_es_video == es ) p_sys->p_es_video = NULL;
@@ -1340,13 +1545,11 @@ static void EsOutDel( es_out_t *out, es_out_id_t *es )
         for( i = 0; i < p_sys->i_es; i++ )
         {
             if( es->fmt.i_cat == p_sys->es[i]->fmt.i_cat )
-                EsOutSelect( out, p_sys->es[i], VLC_FALSE );
+                EsOutSelect( out, p_sys->es[i], false );
         }
 
-    if( es->psz_language )
-        free( es->psz_language );
-    if( es->psz_language_code )
-        free( es->psz_language_code );
+    free( es->psz_language );
+    free( es->psz_language_code );
 
     es_format_Clean( &es->fmt );
 
@@ -1364,7 +1567,7 @@ static void EsOutDel( es_out_t *out, es_out_id_t *es )
 static int EsOutControl( es_out_t *out, int i_query, va_list args )
 {
     es_out_sys_t *p_sys = out->p_sys;
-    vlc_bool_t  b, *pb;
+    bool  b, *pb;
     int         i, *pi;
 
     es_out_id_t *es;
@@ -1373,13 +1576,13 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args )
     {
         case ES_OUT_SET_ES_STATE:
             es = (es_out_id_t*) va_arg( args, es_out_id_t * );
-            b = (vlc_bool_t) va_arg( args, vlc_bool_t );
-            if( b && es->p_dec == NULL )
+            b = (bool) va_arg( args, int );
+            if( b && !EsIsSelected( es ) )
             {
                 EsSelect( out, es );
-                return es->p_dec ? VLC_SUCCESS : VLC_EGENERIC;
+                return EsIsSelected( es ) ? VLC_SUCCESS : VLC_EGENERIC;
             }
-            else if( !b && es->p_dec )
+            else if( !b && EsIsSelected( es ) )
             {
                 EsUnselect( out, es, es->p_pgrm == p_sys->p_pgrm );
                 return VLC_SUCCESS;
@@ -1388,23 +1591,23 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args )
 
         case ES_OUT_GET_ES_STATE:
             es = (es_out_id_t*) va_arg( args, es_out_id_t * );
-            pb = (vlc_bool_t*) va_arg( args, vlc_bool_t * );
+            pb = (bool*) va_arg( args, bool * );
 
-            *pb = es->p_dec ? VLC_TRUE : VLC_FALSE;
+            *pb = EsIsSelected( es );
             return VLC_SUCCESS;
 
         case ES_OUT_SET_ACTIVE:
         {
-            b = (vlc_bool_t) va_arg( args, vlc_bool_t );
+            b = (bool) va_arg( args, int );
             p_sys->b_active = b;
             /* Needed ? */
             if( b )
-                var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
+                var_SetBool( p_sys->p_input, "intf-change", true );
             return VLC_SUCCESS;
         }
 
         case ES_OUT_GET_ACTIVE:
-            pb = (vlc_bool_t*) va_arg( args, vlc_bool_t * );
+            pb = (bool*) va_arg( args, bool * );
             *pb = p_sys->b_active;
             return VLC_SUCCESS;
 
@@ -1418,7 +1621,7 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args )
                 /* Reapply policy mode */
                 for( i = 0; i < p_sys->i_es; i++ )
                 {
-                    if( p_sys->es[i]->p_dec )
+                    if( EsIsSelected( p_sys->es[i] ) )
                     {
                         EsUnselect( out, p_sys->es[i],
                                     p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
@@ -1426,7 +1629,7 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args )
                 }
                 for( i = 0; i < p_sys->i_es; i++ )
                 {
-                    EsOutSelect( out, p_sys->es[i], VLC_FALSE );
+                    EsOutSelect( out, p_sys->es[i], false );
                 }
                 return VLC_SUCCESS;
             }
@@ -1444,7 +1647,7 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args )
             {
                 for( i = 0; i < p_sys->i_es; i++ )
                 {
-                    if( p_sys->es[i]->p_dec )
+                    if( EsIsSelected( p_sys->es[i] ) )
                         EsUnselect( out, p_sys->es[i],
                                     p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
                 }
@@ -1453,8 +1656,8 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args )
             {
                 for( i = 0; i < p_sys->i_es; i++ )
                 {
-                    if( p_sys->es[i]->p_dec &&
-                        p_sys->es[i]->fmt.i_cat == AUDIO_ES )
+                    if( p_sys->es[i]->fmt.i_cat == AUDIO_ES &&
+                        EsIsSelected( p_sys->es[i] ) )
                         EsUnselect( out, p_sys->es[i],
                                     p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
                 }
@@ -1463,8 +1666,8 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args )
             {
                 for( i = 0; i < p_sys->i_es; i++ )
                 {
-                    if( p_sys->es[i]->p_dec &&
-                        p_sys->es[i]->fmt.i_cat == VIDEO_ES )
+                    if( p_sys->es[i]->fmt.i_cat == VIDEO_ES &&
+                        EsIsSelected( p_sys->es[i] ) )
                         EsUnselect( out, p_sys->es[i],
                                     p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
                 }
@@ -1473,8 +1676,8 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args )
             {
                 for( i = 0; i < p_sys->i_es; i++ )
                 {
-                    if( p_sys->es[i]->p_dec &&
-                        p_sys->es[i]->fmt.i_cat == SPU_ES )
+                    if( p_sys->es[i]->fmt.i_cat == SPU_ES &&
+                        EsIsSelected( p_sys->es[i] ) )
                         EsUnselect( out, p_sys->es[i],
                                     p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
                 }
@@ -1485,20 +1688,53 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args )
                 {
                     if( es == p_sys->es[i] )
                     {
-                        EsOutSelect( out, es, VLC_TRUE );
+                        EsOutSelect( out, es, true );
                         break;
                     }
                 }
             }
             {
-                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 );
+                vlc_event_t event;
+                event.type = vlc_InputSelectedStreamChanged;
+                vlc_event_send( &p_sys->p_input->p->event_manager, &event );
+            }
+            return VLC_SUCCESS;
+ 
+        case ES_OUT_SET_DEFAULT:
+        {
+            es = (es_out_id_t*) va_arg( args, es_out_id_t * );
+
+            if( es == NULL )
+            {
+                /*p_sys->i_default_video_id = -1;*/
+                /*p_sys->i_default_audio_id = -1;*/
+                p_sys->i_default_sub_id = -1;
+            }
+            else if( es == (es_out_id_t*)((uint8_t*)NULL+AUDIO_ES) )
+            {
+                /*p_sys->i_default_video_id = -1;*/
+            }
+            else if( es == (es_out_id_t*)((uint8_t*)NULL+VIDEO_ES) )
+            {
+                /*p_sys->i_default_audio_id = -1;*/
+            }
+            else if( es == (es_out_id_t*)((uint8_t*)NULL+SPU_ES) )
+            {
+                p_sys->i_default_sub_id = -1;
+            }
+            else
+            {
+                /*if( es->fmt.i_cat == VIDEO_ES )
+                    p_sys->i_default_video_id = es->i_id;
+                else
+                if( es->fmt.i_cat == AUDIO_ES )
+                    p_sys->i_default_audio_id = es->i_id;
+                else*/
+                if( es->fmt.i_cat == SPU_ES )
+                    p_sys->i_default_sub_id = es->i_id;
             }
             return VLC_SUCCESS;
+        }
 
         case ES_OUT_SET_PCR:
         case ES_OUT_SET_GROUP_PCR:
@@ -1535,10 +1771,7 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args )
 
         case ES_OUT_RESET_PCR:
             for( i = 0; i < p_sys->i_pgrm; i++ )
-            {
-                p_sys->pgrm[i]->clock.i_synchro_state =  SYNCHRO_REINIT;
-                p_sys->pgrm[i]->clock.last_pts = 0;
-            }
+                input_ClockResetPCR( &p_sys->pgrm[i]->clock );
             return VLC_SUCCESS;
 
         case ES_OUT_GET_TS:
@@ -1596,7 +1829,7 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args )
 #if 1
                 input_DecoderDelete( es->p_dec );
                 es->p_dec = input_DecoderNew( p_sys->p_input,
-                                              &es->fmt, VLC_FALSE );
+                                              &es->fmt, false );
 
 #else
                 es->p_dec->fmt_in.i_extra = p_fmt->i_extra;
@@ -1742,10 +1975,21 @@ static char **LanguageSplit( const char *psz_langs )
         psz = strchr(psz_parser, ',' );
         if( psz ) *psz++ = '\0';
 
-        psz_code = LanguageGetCode( psz_parser );
-        if( strcmp( psz_code, "??" ) )
+        if( !strcmp( psz_parser, "any" ) )
         {
-            TAB_APPEND( i_psz, ppsz, psz_code );
+            TAB_APPEND( i_psz, ppsz, strdup("any") );
+        }
+        else
+        {
+            psz_code = LanguageGetCode( psz_parser );
+            if( strcmp( psz_code, "??" ) )
+            {
+                TAB_APPEND( i_psz, ppsz, psz_code );
+            }
+            else
+            {
+                free( psz_code );
+            }
         }
 
         psz_parser = psz;
@@ -1767,7 +2011,13 @@ static int LanguageArrayIndex( char **ppsz_langs, char *psz_lang )
     if( !ppsz_langs || !psz_lang ) return -1;
 
     for( i = 0; ppsz_langs[i]; i++ )
-        if( !strcasecmp( ppsz_langs[i], psz_lang ) ) return i;
+    {
+        if( !strcasecmp( ppsz_langs[i], psz_lang ) ||
+            !strcasecmp( ppsz_langs[i], "any" ) )
+        {
+            return i;
+        }
+    }
 
     return -1;
 }
@@ -1846,7 +2096,7 @@ static void EsOutAddInfo( es_out_t *out, es_out_id_t *es )
                                fmt->video.i_frame_rate_base * 1000000,
                                1000000 );
            input_Control( p_input, INPUT_ADD_INFO, psz_cat,
-                          _("Frame rate"), I64Fd".%06u",
+                          _("Frame rate"), "%"PRId64".%06u",
                           div.quot, (unsigned int )div.rem );
        }
        break;