X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fcommon.c;h=5d5da1e76db9fa4f297fdcc69d8798eaee91c2a8;hb=a61cb21fd61350444abc09c91b55c16d7a4a64cb;hp=8b8458057769ab226a87513fef617cf414fc36f4;hpb=dec407e71ed6e4b9f41bd9344867a8dfccbfd15c;p=vlc

diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index 8b84580577..5d5da1e76d 100644
--- a/src/audio_output/common.c
+++ b/src/audio_output/common.c
@@ -79,7 +79,8 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent )
     aout_instance_t * p_aout;
 
     /* Allocate descriptor. */
-    p_aout = vlc_object_create( p_parent, VLC_OBJECT_AOUT );
+    p_aout = vlc_custom_create( p_parent, sizeof( *p_aout ), VLC_OBJECT_AOUT,
+                                "audio output" );
     if( p_aout == NULL )
     {
         return NULL;
@@ -88,6 +89,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,16 +113,18 @@ 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:
  *
- *            Mixer Input IFIFO OFIFO (< Inner lock)
- * Mixer       No!   N/A   Yes   Yes
- * Input       N/A   No!   Yes   N/A
- * In FIFOs    No!   No!   No!   Yes
- * Out FIFOs   No!   N/A   No!   No!
+ *            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
@@ -132,18 +136,23 @@ void aout_lock (unsigned i)
     unsigned allowed;
     switch (i)
     {
-        case MIXER_LOCK:
+        case VOLUME_VARS_LOCK:
             allowed = 0;
             break;
+        case MIXER_LOCK:
+            allowed = VOLUME_VARS_LOCK;
+            break;
         case INPUT_LOCK:
-            allowed = 0;
+            allowed = VOLUME_VARS_LOCK|MIXER_LOCK;
             break;
         case INPUT_FIFO_LOCK:
-            allowed = MIXER_LOCK|INPUT_LOCK;
+            allowed = VOLUME_VARS_LOCK|MIXER_LOCK|INPUT_LOCK;
             break;
         case OUTPUT_FIFO_LOCK:
-            allowed = MIXER_LOCK|INPUT_FIFO_LOCK;
+            allowed = VOLUME_VARS_LOCK|MIXER_LOCK|INPUT_LOCK|INPUT_FIFO_LOCK;
             break;
+        default:
+            abort ();
     }
 
     if (aout_locks & ~allowed)
@@ -151,7 +160,7 @@ void aout_lock (unsigned i)
         fprintf (stderr, "Illegal audio lock transition (%x -> %x)\n",
                  aout_locks, aout_locks|i);
         vlc_backtrace ();
-        //abort ();
+        abort ();
     }
     aout_locks |= i;
 }
@@ -191,7 +200,7 @@ unsigned int aout_FormatNbChannels( const audio_sample_format_t * p_format )
  *****************************************************************************/
 unsigned int aout_BitsPerSample( vlc_fourcc_t i_format )
 {
-    switch( i_format )
+    switch( vlc_fourcc_GetCodec( AUDIO_ES, i_format ) )
     {
     case VLC_CODEC_U8:
     case VLC_CODEC_S8:
@@ -211,11 +220,13 @@ unsigned int aout_BitsPerSample( vlc_fourcc_t i_format )
 
     case VLC_CODEC_S32L:
     case VLC_CODEC_S32B:
-    case VLC_CODEC_FL32:
+    case VLC_CODEC_F32L:
+    case VLC_CODEC_F32B:
     case VLC_CODEC_FI32:
         return 32;
 
-    case VLC_CODEC_FL64:
+    case VLC_CODEC_F64L:
+    case VLC_CODEC_F64B:
         return 64;
 
     default:
@@ -230,6 +241,7 @@ unsigned int aout_BitsPerSample( vlc_fourcc_t i_format )
  *****************************************************************************/
 void aout_FormatPrepare( audio_sample_format_t * p_format )
 {
+    p_format->i_channels = aout_FormatNbChannels( p_format );
     p_format->i_bitspersample = aout_BitsPerSample( p_format->i_format );
     if( p_format->i_bitspersample > 0 )
     {