Merged ES_OUT_SET_ACTIVE/_MODE.

[vlc] / src / input / es_out.c

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 173345a47f0506c53a4c9190957a2c01d50d3af8..bb94572046ea32b84d4f20a278c3b22c0cc456dd 100644 (file)
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -243,7 +243,7 @@ es_out_t *input_EsOutNew( input_thread_t *p_input, int i_rate )
     p_sys->p_input = p_input;
 
     p_sys->b_active = false;
-    p_sys->i_mode   = ES_OUT_MODE_AUTO;
+    p_sys->i_mode   = ES_OUT_MODE_NONE;
 
 
     TAB_INIT( p_sys->i_pgrm, p_sys->pgrm );
@@ -679,7 +679,8 @@ static void EsOutDecodersStopBuffering( es_out_t *out, bool b_forced )
     const mtime_t i_wakeup_delay = 10*1000; /* FIXME CLEANUP thread wake up time*/
     const mtime_t i_current_date = p_sys->b_paused ? p_sys->i_pause_date : mdate();
 
-    input_clock_ChangeSystemOrigin( p_sys->p_pgrm->p_clock, i_current_date + i_wakeup_delay - i_buffering_duration );
+    input_clock_ChangeSystemOrigin( p_sys->p_pgrm->p_clock, true,
+                                    i_current_date + i_wakeup_delay - i_buffering_duration );
 
     for( int i = 0; i < p_sys->i_es; i++ )
     {
@@ -1214,7 +1215,8 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, const vlc_meta_t *p_me
         {
             input_SendEventProgramDel( p_input, i_group );
             input_SendEventProgramAdd( p_input, i_group, psz_text );
-
+            if( p_sys->p_pgrm == p_pgrm )
+                input_SendEventProgramSelect( p_input, i_group );
             free( psz_text );
         }
     }
@@ -1234,7 +1236,7 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, const vlc_meta_t *p_me
     {
         input_Control( p_input, INPUT_ADD_INFO, psz_cat,
                        vlc_gettext(ppsz_all_keys[i]),
-                       vlc_meta_GetExtra( &p_meta, ppsz_all_keys[i] ) );
+                       vlc_meta_GetExtra( p_meta, ppsz_all_keys[i] ) );
         free( ppsz_all_keys[i] );
     }
     free( ppsz_all_keys );
@@ -2109,10 +2111,13 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
             *pb = EsIsSelected( es );
             return VLC_SUCCESS;
 
-        case ES_OUT_SET_ACTIVE:
+        case ES_OUT_SET_MODE:
         {
-            b = (bool) va_arg( args, int );
-            if( b && !p_sys->b_active && p_sys->i_es > 0 )
+            const int i_mode = va_arg( args, int );
+            assert( i_mode == ES_OUT_MODE_NONE || i_mode == ES_OUT_MODE_ALL ||
+                    i_mode == ES_OUT_MODE_AUTO || i_mode == ES_OUT_MODE_PARTIAL );
+
+            if( i_mode != ES_OUT_MODE_NONE && !p_sys->b_active && p_sys->i_es > 0 )
             {
                 /* XXX Terminate vout if there are tracks but no video one.
                  * This one is not mandatory but is he earliest place where it
@@ -2126,33 +2131,20 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
                 if( i >= p_sys->i_es )
                     input_resource_TerminateVout( p_sys->p_input->p->p_resource );
             }
-            p_sys->b_active = b;
-            return VLC_SUCCESS;
-        }
+            p_sys->b_active = i_mode != ES_OUT_MODE_NONE;
+            p_sys->i_mode = i_mode;
 
-        case ES_OUT_SET_MODE:
-            i = (int) va_arg( args, int );
-            if( i == ES_OUT_MODE_NONE || i == ES_OUT_MODE_ALL ||
-                i == ES_OUT_MODE_AUTO || i == ES_OUT_MODE_PARTIAL )
+            /* Reapply policy mode */
+            for( i = 0; i < p_sys->i_es; i++ )
             {
-                p_sys->i_mode = i;
-
-                /* Reapply policy mode */
-                for( i = 0; i < p_sys->i_es; i++ )
-                {
-                    if( EsIsSelected( p_sys->es[i] ) )
-                    {
-                        EsUnselect( out, p_sys->es[i],
-                                    p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
-                    }
-                }
-                for( i = 0; i < p_sys->i_es; i++ )
-                {
-                    EsOutSelect( out, p_sys->es[i], false );
-                }
-                return VLC_SUCCESS;
+                if( EsIsSelected( p_sys->es[i] ) )
+                    EsUnselect( out, p_sys->es[i],
+                                p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
             }
-            return VLC_EGENERIC;
+            for( i = 0; i < p_sys->i_es; i++ )
+                EsOutSelect( out, p_sys->es[i], false );
+            return VLC_SUCCESS;
+        }
 
         case ES_OUT_SET_ES:
         case ES_OUT_RESTART_ES:
@@ -2457,6 +2449,32 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
             return i_ret;
         }
 
+        case ES_OUT_GET_ES_OBJECTS_BY_ID:
+        {
+            const int i_id = va_arg( args, int );
+            es_out_id_t *p_es = EsOutGetFromID( out, i_id );
+            if( !p_es )
+                return VLC_EGENERIC;
+
+            vlc_object_t    **pp_decoder = va_arg( args, vlc_object_t ** );
+            vout_thread_t   **pp_vout    = va_arg( args, vout_thread_t ** );
+            aout_instance_t **pp_aout    = va_arg( args, aout_instance_t ** );
+            if( es->p_dec )
+            {
+                if( pp_decoder )
+                    *pp_decoder = vlc_object_hold( es->p_dec );
+                input_DecoderGetObjects( es->p_dec, pp_vout, pp_aout );
+            }
+            else
+            {
+                if( pp_vout )
+                    *pp_vout = NULL;
+                if( pp_aout )
+                    *pp_aout = NULL;
+            }
+            return VLC_SUCCESS;
+        }
+
         case ES_OUT_GET_BUFFERING:
             pb = (bool *)va_arg( args, bool* );
             *pb = p_sys->b_buffering;
@@ -2565,6 +2583,35 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
             return VLC_SUCCESS;
         }
 
+        case ES_OUT_GET_PCR_SYSTEM:
+        {
+            if( p_sys->b_buffering )
+                return VLC_EGENERIC;
+
+            es_out_pgrm_t *p_pgrm = p_sys->p_pgrm;
+            if( !p_pgrm )
+                return VLC_EGENERIC;
+
+            mtime_t *pi_system = va_arg( args, mtime_t *);
+            *pi_system = input_clock_GetSystemOrigin( p_pgrm->p_clock );
+            return VLC_SUCCESS;
+        }
+
+        case ES_OUT_MODIFY_PCR_SYSTEM:
+        {
+            if( p_sys->b_buffering )
+                return VLC_EGENERIC;
+
+            es_out_pgrm_t *p_pgrm = p_sys->p_pgrm;
+            if( !p_pgrm )
+                return VLC_EGENERIC;
+
+            const bool    b_absolute = va_arg( args, int );
+            const mtime_t i_system   = va_arg( args, mtime_t );
+            input_clock_ChangeSystemOrigin( p_pgrm->p_clock, b_absolute, i_system );
+            return VLC_SUCCESS;
+        }
+
         default:
             msg_Err( p_sys->p_input, "unknown query in es_out_Control" );
             return VLC_EGENERIC;
@@ -2874,7 +2921,7 @@ static void EsOutUpdateInfo( es_out_t *out, es_out_id_t *es, const es_format_t *
         for( int i = 0; ppsz_all_keys && ppsz_all_keys[i]; i++ )
         {
             char *psz_key = ppsz_all_keys[i];
-            char *psz_value = vlc_meta_GetExtra( p_meta, psz_key );
+            const char *psz_value = vlc_meta_GetExtra( p_meta, psz_key );
 
             if( psz_value )
                 input_Control( p_input, INPUT_ADD_INFO, psz_cat,