Changeset e444ba72b207c6d6131a3e9942d4aedbe34fe4fb

Timestamp:

08/06/07 01:05:16 (1 year ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[bf16abda22682951f3aa4c551d48dcd4b8133ef9]

git-author:

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

Message:

clock: clean up/simplify + remove 1/90000 reference.
all: improve input rate (no more out of order/dropped pictures on
rate change).

Files:

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

src/input/clock.c

@@ -73 +73 @@
-
-/* Maximum gap allowed between two CRs. */
-2000000
+(I64C(2000000)*100/9)
-
-/* Latency introduced on DVDs with CR == 0 on chapter change - this is from
@@ -82 +82 @@
- * ClockToSysdate: converts a movie clock to system date
- *****************************************************************************/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-}
-
@@ -105 +96 @@
- * Caution : the synchro state must be SYNCHRO_OK for this to operate.
- *****************************************************************************/
-
-
-
-
-
-
+
+
+
+
-}
-
@@ -127 +116 @@
- *                  discontinuity
- *****************************************************************************/
-
+
+
-{
-    cl->i_synchro_state = SYNCHRO_START;
@@ -138 +128 @@
-    cl->delta_cr = 0;
-    cl->i_delta_cr_residue = 0;
+    cl->i_rate = p_input->p->i_rate;
-
-    cl->i_cr_average = i_cr_average;
@@ -150 +141 @@
-                        input_clock_t *cl, mtime_t i_clock )
-{
+    const vlc_bool_t b_synchronize = p_input->b_can_pace_control && cl->b_master;
+    const mtime_t i_mdate = mdate();
+
-    if( ( cl->i_synchro_state != SYNCHRO_OK ) ||
-        ( i_clock == 0 && cl->last_cr != 0 ) )
@@ -155 +149 @@
-        /* Feed synchro with a new reference point. */
-        ClockNewRef( cl, i_clock,
-
-
+
-        cl->i_synchro_state = SYNCHRO_OK;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        {
-            cl->last_cr = 0;
-            cl->last_sysdate = 0;
-            cl->delta_cr = 0;
-            cl->i_delta_cr_residue = 0;
+            cl->last_sysdate = 0;
+            cl->last_update = 0;
-        }
-    }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-
-
-
-
-
+
+
+
+
+
+
+
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}
@@ -242 +216 @@
-        return 0;
-
-p_input, 
+
-    return cl->last_pts + p_input->i_pts_delay;
-}
-
+/*****************************************************************************
+ * input_ClockSetRate:
+ *****************************************************************************/
+void input_ClockSetRate( input_thread_t *p_input, input_clock_t *cl )
+{
+    if( cl->i_synchro_state == SYNCHRO_OK )
+    {
+        /* Move the reference point */
+        cl->cr_ref = cl->last_cr;
+        cl->sysdate_ref = cl->last_sysdate;
+    }
+    cl->i_rate = p_input->p->i_rate;
+}
+

src/input/es_out.c

@@ -315 +315 @@
-    }
-}
+void input_EsOutSetRate( es_out_t *out )
+{
+    es_out_sys_t      *p_sys = out->p_sys;
+    int i;
+
+    for( i = 0; i < p_sys->i_pgrm; i++ )
+        input_ClockSetRate( p_sys->p_input, &p_sys->pgrm[i]->clock );
+}
-
-void input_EsOutSetDelay( es_out_t *out, int i_cat, int64_t i_delay )
@@ -508 +516 @@
-    p_pgrm->psz_publisher = NULL;
-    p_pgrm->p_epg = NULL;
-
+p_input, 
-
-    /* Append it */
@@ -1217 +1225 @@
-    {
-        p_block->i_dts =
-
-
+
-    }
-    if( p_block->i_pts > 0 && (p_block->i_flags&BLOCK_FLAG_PREROLL) )
@@ -1227 +1234 @@
-    {
-        p_block->i_pts =
-
-
+
-    }
-    if ( es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) )
@@ -1507 +1513 @@
-            /* search program */
-            /* 11 is a vodoo trick to avoid non_pcr*9/100 to be null */
-
-
+
-            return VLC_SUCCESS;
-        }
@@ -1526 +1531 @@
-                int64_t *pi_ts = (int64_t *)va_arg( args, int64_t * );
-                *pi_ts = input_ClockGetTS( p_sys->p_input,
-
-
+
-                return VLC_SUCCESS;
-            }

src/input/input.c

@@ -1673 +1673 @@
-                /* We will not send audio data if new rate != default */
-                if( i_rate != INPUT_RATE_DEFAULT && p_input->p->i_rate == INPUT_RATE_DEFAULT )
-TRU
+FALS
-
-                p_input->p->i_rate  = i_rate;
-
-
-
+
-
-                b_force_update = VLC_TRUE;

src/input/input_internal.h

@@ -264 +264 @@
-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_EsOutSetRate( es_out_t * );
-vlc_bool_t input_EsOutDecodersEmpty( es_out_t * );
-
@@ -283 +284 @@
-                                      * discontinuities                      */
-    mtime_t                 last_pts;
+    mtime_t                 last_update;
-    int                     i_synchro_state;
-
-    vlc_bool_t              b_master;
+
+    int                     i_rate;
-
-    /* Config */
@@ -292 +296 @@
-} input_clock_t;
-
-input_ClockInit(
+   input_ClockInit( input_thread_t *,
-void    input_ClockSetPCR( input_thread_t *, input_clock_t *, mtime_t );
-mtime_t input_ClockGetTS( input_thread_t *, input_clock_t *, mtime_t );
+void    input_ClockSetRate( input_thread_t *, input_clock_t *cl );
-
-/* Subtitles */