Clean up/Factorize.

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 21f672b8b3297cdb2c123760002e1d885c0b1c93..bb91db3ac5f86787b54ad2f5e1155da55a22658a 100644 (file)
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -302,7 +302,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, vlc_bool_t b_flush, vlc_bool_t b_audio )
 {
     es_out_sys_t      *p_sys = out->p_sys;
     int i;
@@ -322,7 +322,7 @@ void input_EsOutChangeRate( es_out_t *out )
     es_out_sys_t      *p_sys = out->p_sys;
     int i;
 
-    input_EsOutDiscontinuity( out, VLC_FALSE, VLC_FALSE );
+    EsOutDiscontinuity( out, VLC_FALSE, VLC_FALSE );
 
     for( i = 0; i < p_sys->i_pgrm; i++ )
         input_ClockSetRate( p_sys->p_input, &p_sys->pgrm[i]->clock );
@@ -346,7 +346,7 @@ void input_EsOutChangeState( es_out_t *out )
     {
         /* Send discontinuity to decoders (it will allow them to flush
          *                  * if implemented */
-        input_EsOutDiscontinuity( out, VLC_FALSE, VLC_FALSE );
+        EsOutDiscontinuity( out, VLC_FALSE, VLC_FALSE );
     }
     else
     {
@@ -354,6 +354,13 @@ void input_EsOutChangeState( es_out_t *out )
         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, VLC_TRUE, VLC_FALSE );
+}
 
 vlc_bool_t input_EsOutDecodersEmpty( es_out_t *out )
 {

diff --git a/src/input/input.c b/src/input/input.c
index 55fe92c6820dfbc2876679df8510790c4f498c86..06e23143c540d10e2d5ff76bb1fde6feefe35cce 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1519,8 +1519,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type,
             if( f_pos < 0.0 ) f_pos = 0.0;
             if( f_pos > 1.0 ) f_pos = 1.0;
             /* Reset the decoders states and clock sync (before calling the demuxer */
-            es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
-            input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE );
+            input_EsOutChangePosition( p_input->p->p_es_out );
             if( demux2_Control( p_input->p->input.p_demux, DEMUX_SET_POSITION,
                                 f_pos ) )
             {
@@ -1557,8 +1556,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type,
             if( i_time < 0 ) i_time = 0;
 
             /* Reset the decoders states and clock sync (before calling the demuxer */
-            es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
-            input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE );
+            input_EsOutChangePosition( p_input->p->p_es_out );
 
             i_ret = demux2_Control( p_input->p->input.p_demux,
                                     DEMUX_SET_TIME, i_time );
@@ -1760,8 +1758,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type,
 
                 if( i_title >= 0 && i_title < p_input->p->input.i_title )
                 {
-                    es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
-                    input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE );
+                    input_EsOutChangePosition( p_input->p->p_es_out );
 
                     demux2_Control( p_demux, DEMUX_SET_TITLE, i_title );
                     input_ControlVarTitle( p_input, i_title );
@@ -1781,8 +1778,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type,
 
                 if( i_title >= 0 && i_title < p_input->p->input.i_title )
                 {
-                    es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
-                    input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE );
+                    input_EsOutChangePosition( p_input->p->p_es_out );
 
                     access2_Control( p_access, ACCESS_SET_TITLE, i_title );
                     stream_AccessReset( p_input->p->input.p_stream );
@@ -1822,8 +1818,8 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type,
                 if( i_seekpoint >= 0 && i_seekpoint <
                     p_input->p->input.title[p_demux->info.i_title]->i_seekpoint )
                 {
-                    es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
-                    input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE );
+
+                    input_EsOutChangePosition( p_input->p->p_es_out );
 
                     demux2_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint );
                 }
@@ -1858,8 +1854,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type,
                 if( i_seekpoint >= 0 && i_seekpoint <
                     p_input->p->input.title[p_access->info.i_title]->i_seekpoint )
                 {
-                    es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
-                    input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE );
+                    input_EsOutChangePosition( p_input->p->p_es_out );
 
                     access2_Control( p_access, ACCESS_SET_SEEKPOINT,
                                     i_seekpoint );

diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index bae25c5011b38166b3be10fcac19fbc3d76b087d..fe2fc010fba955448a1ca7e96fb69e2979c13497 100644 (file)
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -264,10 +264,10 @@ vlc_bool_t input_DecoderEmpty( decoder_t * p_dec );
 es_out_t  *input_EsOutNew( input_thread_t * );
 void       input_EsOutDelete( es_out_t * );
 es_out_id_t *input_EsOutGetFromID( es_out_t *, int i_id );
-void       input_EsOutDiscontinuity( es_out_t *, vlc_bool_t b_flush, vlc_bool_t b_audio );
 void       input_EsOutSetDelay( es_out_t *, int i_cat, int64_t );
 void       input_EsOutChangeRate( es_out_t * );
 void       input_EsOutChangeState( es_out_t * );
+void       input_EsOutChangePosition( es_out_t * );
 vlc_bool_t input_EsOutDecodersEmpty( es_out_t * );
 
 /* clock.c */