fix [0b988497] : initialize volume_vars_lock

[vlc] / src / audio_output / common.c

diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index f71309ab61e64958afa0246b429f6a563ca7d60b..2bdece1d4eec9b2be718ab099021127b87248301 100644 (file)
--- a/src/audio_output/common.c
+++ b/src/audio_output/common.c
@@ -88,6 +88,7 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent )
     /* Initialize members. */
     vlc_mutex_init( &p_aout->input_fifos_lock );
     vlc_mutex_init( &p_aout->mixer_lock );
+    vlc_mutex_init( &p_aout->volume_vars_lock );
     vlc_mutex_init( &p_aout->output_fifo_lock );
     p_aout->i_nb_inputs = 0;
     p_aout->mixer_multiplier = 1.0;
@@ -111,9 +112,64 @@ static void aout_Destructor( vlc_object_t * p_this )
     aout_instance_t * p_aout = (aout_instance_t *)p_this;
     vlc_mutex_destroy( &p_aout->input_fifos_lock );
     vlc_mutex_destroy( &p_aout->mixer_lock );
+    vlc_mutex_destroy( &p_aout->volume_vars_lock );
     vlc_mutex_destroy( &p_aout->output_fifo_lock );
 }
 
+/* Lock ordering rules:
+ *
+ *            Vars Mixer Input IFIFO OFIFO (< Inner lock)
+ * Vars        No!   Yes   Yes   Yes   Yes
+ * Mixer       No!   No!   Yes   Yes   Yes
+ * Input       No!   No!   No!   Yes   Yes
+ * In FIFOs    No!   No!   No!   No!   Yes
+ * Out FIFOs   No!   No!   No!   No!   No!
+ * (^ Outer lock)
+ */
+#ifdef AOUT_DEBUG
+/* Lock debugging */
+static __thread unsigned aout_locks = 0;
+
+void aout_lock (unsigned i)
+{
+    unsigned allowed;
+    switch (i)
+    {
+        case VOLUME_VARS_LOCK:
+            allowed = 0;
+            break;
+        case MIXER_LOCK:
+            allowed = VOLUME_VARS_LOCK;
+            break;
+        case INPUT_LOCK:
+            allowed = VOLUME_VARS_LOCK|MIXER_LOCK;
+            break;
+        case INPUT_FIFO_LOCK:
+            allowed = VOLUME_VARS_LOCK|MIXER_LOCK|INPUT_LOCK;
+            break;
+        case OUTPUT_FIFO_LOCK:
+            allowed = VOLUME_VARS_LOCK|MIXER_LOCK|INPUT_LOCK|INPUT_FIFO_LOCK;
+            break;
+        default:
+            abort ();
+    }
+
+    if (aout_locks & ~allowed)
+    {
+        fprintf (stderr, "Illegal audio lock transition (%x -> %x)\n",
+                 aout_locks, aout_locks|i);
+        vlc_backtrace ();
+        abort ();
+    }
+    aout_locks |= i;
+}
+
+void aout_unlock (unsigned i)
+{
+    assert (aout_locks & i);
+    aout_locks &= ~i;
+}
+#endif
 
 /*
  * Formats management (internal and external)
@@ -370,12 +426,13 @@ void aout_FifoPush( aout_instance_t * p_aout, aout_fifo_t * p_fifo,
     if ( date_Get( &p_fifo->end_date ) )
     {
         p_buffer->i_pts = date_Get( &p_fifo->end_date );
-        p_buffer->end_date = date_Increment( &p_fifo->end_date,
+        p_buffer->i_length = date_Increment( &p_fifo->end_date,
                                              p_buffer->i_nb_samples );
+        p_buffer->i_length -= p_buffer->i_pts;
     }
     else
     {
-        date_Set( &p_fifo->end_date, p_buffer->end_date );
+        date_Set( &p_fifo->end_date, p_buffer->i_pts + p_buffer->i_length );
     }
 }
 
@@ -417,7 +474,6 @@ void aout_FifoMoveDates( aout_instance_t * p_aout, aout_fifo_t * p_fifo,
     while ( p_buffer != NULL )
     {
         p_buffer->i_pts += difference;
-        p_buffer->end_date += difference;
         p_buffer = p_buffer->p_next;
     }
 }
@@ -707,18 +763,8 @@ aout_buffer_t *aout_BufferAlloc(aout_alloc_t *allocation, mtime_t microseconds,
         return old_buffer;
     }
 
-    aout_buffer_t *buffer;
-    int i_alloc_size;
-
-    i_alloc_size = (int)( (uint64_t)allocation->i_bytes_per_sec
+    size_t i_alloc_size = (int)( (uint64_t)allocation->i_bytes_per_sec
                                         * (microseconds) / 1000000 + 1 );
 
-    buffer = malloc( i_alloc_size + sizeof(aout_buffer_t) );
-    if ( !buffer )
-        return NULL;
-
-    buffer->i_size = i_alloc_size;
-    buffer->p_buffer = (uint8_t *)buffer + sizeof(aout_buffer_t);
-    buffer->i_flags = 0;
-    return buffer;
+    return block_Alloc( i_alloc_size );
 }