Changeset 4551fb33de7234c2ec73f4da2fe4aaa07c7f58f0

Timestamp:

01/10/07 21:33:30 (1 year ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1191267210 +0000

git-parent:

[cc61952dbdc59e0c5cc2ad5080afc52c5c1b2e95]

git-author:

Laurent Aimar <fenrir@videolan.org> 1191267210 +0000

Message:

Clean up/Factorize.

Files:

• src/input/es_out.c (modified) (4 diffs)
• src/input/input.c (modified) (6 diffs)
• src/input/input_internal.h (modified) (1 diff)

src/input/es_out.c

@@ -303 +303 @@
-}
-
-void input_
+static void 
-{
-    es_out_sys_t      *p_sys = out->p_sys;
@@ -323 +323 @@
-    int i;
-
-input_
+
-
-    for( i = 0; i < p_sys->i_pgrm; i++ )
@@ -347 +347 @@
-        /* Send discontinuity to decoders (it will allow them to flush
-         *                  * if implemented */
-input_
+
-    }
-    else
@@ -354 +354 @@
-        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 );
-}
-

src/input/input.c

@@ -1520 +1520 @@
-            if( f_pos > 1.0 ) f_pos = 1.0;
-            /* Reset the decoders states and clock sync (before calling the demuxer */
-
-
+
-            if( demux2_Control( p_input->p->input.p_demux, DEMUX_SET_POSITION,
-                                f_pos ) )
@@ -1558 +1557 @@
-
-            /* Reset the decoders states and clock sync (before calling the demuxer */
-
-
+
-
-            i_ret = demux2_Control( p_input->p->input.p_demux,
@@ -1761 +1759 @@
-                if( i_title >= 0 && i_title < p_input->p->input.i_title )
-                {
-
-
+
-
-                    demux2_Control( p_demux, DEMUX_SET_TITLE, i_title );
@@ -1782 +1779 @@
-                if( i_title >= 0 && i_title < p_input->p->input.i_title )
-                {
-
-
+
-
-                    access2_Control( p_access, ACCESS_SET_TITLE, i_title );
@@ -1823 +1819 @@
-                    p_input->p->input.title[p_demux->info.i_title]->i_seekpoint )
-                {
-
-Discontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE
+
+ChangePosition( p_input->p->p_es_out
-
-                    demux2_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint );
@@ -1859 +1855 @@
-                    p_input->p->input.title[p_access->info.i_title]->i_seekpoint )
-                {
-
-
+
-
-                    access2_Control( p_access, ACCESS_SET_SEEKPOINT,

src/input/input_internal.h

@@ -265 +265 @@
-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 * );
-