Moved i_cr_average from input_source_t to input_thread_private_t.

diff --git a/src/input/es_out.c b/src/input/es_out.c
index feed1765b32e5d80cf06f95064653823de23f371..03bd35fdcef23769945cb2557893eecfdbca256e 100644 (file)
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -1004,7 +1004,7 @@ static es_out_pgrm_t *EsOutProgramAdd( es_out_t *out, int i_group )
     p_pgrm->psz_now_playing = NULL;
     p_pgrm->psz_publisher = NULL;
     p_pgrm->p_epg = NULL;
-    p_pgrm->p_clock = input_clock_New( p_input->p->input.i_cr_average, p_sys->i_rate );
+    p_pgrm->p_clock = input_clock_New( p_input->p->i_cr_average, p_sys->i_rate );
     if( !p_pgrm->p_clock )
     {
         free( p_pgrm );

diff --git a/src/input/input.c b/src/input/input.c
index 5f26d97047b1f03d44d9b3e3001605cb42d84d37..6416dbe5ea12af0c387405534b54bc403821e5e6 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -188,6 +188,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
     p_input->p->p_sout   = NULL;
     p_input->p->b_out_pace_control = false;
     p_input->i_pts_delay = 0;
+    p_input->p->i_cr_average = 0;
 
     vlc_gc_incref( p_item ); /* Released in Destructor() */
     p_input->p->p_item = p_item;
@@ -204,7 +205,6 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
     p_input->p->input.b_can_rate_control = true;
     p_input->p->input.b_rescale_ts = true;
     p_input->p->input.b_eof = false;
-    p_input->p->input.i_cr_average = 0;
 
     vlc_mutex_lock( &p_item->lock );
 
@@ -236,7 +236,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
     input_ControlVarInit( p_input );
 
     /* */
-    p_input->p->input.i_cr_average = var_GetInteger( p_input, "cr-average" );
+    p_input->p->i_cr_average = var_GetInteger( p_input, "cr-average" );
 
     if( !p_input->b_preparsing )
     {
@@ -938,10 +938,10 @@ static void InitTitle( input_thread_t * p_input )
         p_input->i_pts_delay -= i_desynch * 1000;
 
     /* Update cr_average depending on the caching */
-    p_master->i_cr_average *= (10 * p_input->i_pts_delay / 200000);
-    p_master->i_cr_average /= 10;
-    if( p_master->i_cr_average < 10 )
-        p_master->i_cr_average = 10;
+    p_input->p->i_cr_average *= (10 * p_input->i_pts_delay / 200000);
+    p_input->p->i_cr_average /= 10;
+    if( p_input->p->i_cr_average < 10 )
+        p_input->p->i_cr_average = 10;
 }
 
 static void StartTitle( input_thread_t * p_input )

diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index 66a38e0bff2159cd5b7621256f42e7b13c996392..c698737b35b10264f5ebb17c02bcd1c378260df6 100644 (file)
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -71,9 +71,6 @@ typedef struct
     bool       b_eof;   /* eof of demuxer */
     double     f_fps;
 
-    /* Clock average variation */
-    int     i_cr_average;
-
 } input_source_t;
 
 /** Private input fields */
@@ -115,10 +112,14 @@ struct input_thread_private_t
     bool            b_out_pace_control; /*     idem ? */
 
     /* Main input properties */
-    input_item_t *p_item;
 
+    /* Input item */
+    input_item_t   *p_item;
+    /* Clock average variation */
+    int            i_cr_average;
+    /* Main source */
     input_source_t input;
-    /* Slave demuxers (subs, and others) */
+    /* Slave sources (subs, and others) */
     int            i_slave;
     input_source_t **slave;