Merge branch 'master' into lpcm_encoder

[vlc] / src / audio_output / output.c

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index dc6ea31e71b95135ea9f956c4ffc416b04d6f640..1bfb2d92a058ae94c8ef2ee13942acecf99ee563 100644 (file)
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -31,6 +31,7 @@
 #include <vlc_common.h>
 #include <vlc_aout.h>
 #include <vlc_cpu.h>
+#include <vlc_modules.h>
 
 #include "aout_internal.h"
 
@@ -43,7 +44,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
                     audio_sample_format_t * p_format )
 {
     /* Retrieve user defaults. */
-    int i_rate = config_GetInt( p_aout, "aout-rate" );
+    int i_rate = var_InheritInteger( p_aout, "aout-rate" );
     vlc_value_t val, text;
     /* kludge to avoid a fpu error when rate is 0... */
     if( i_rate == 0 ) i_rate = -1;
@@ -53,14 +54,11 @@ int aout_OutputNew( aout_instance_t * p_aout,
         p_aout->output.output.i_rate = i_rate;
     aout_FormatPrepare( &p_aout->output.output );
 
-    aout_lock_output_fifo( p_aout );
-
     /* Find the best output plug-in. */
     p_aout->output.p_module = module_need( p_aout, "audio output", "$aout", false );
     if ( p_aout->output.p_module == NULL )
     {
         msg_Err( p_aout, "no suitable audio output module" );
-        aout_unlock_output_fifo( p_aout );
         return -1;
     }
 
@@ -163,6 +161,8 @@ int aout_OutputNew( aout_instance_t * p_aout,
 
     aout_FormatPrepare( &p_aout->output.output );
 
+    aout_lock_output_fifo( p_aout );
+
     /* Prepare FIFO. */
     aout_FifoInit( p_aout, &p_aout->output.fifo,
                    p_aout->output.output.i_rate );
@@ -177,8 +177,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
     {
         /* Non-S/PDIF mixer only deals with float32 or fixed32. */
         p_aout->mixer_format.i_format
-                     = (vlc_CPU() & CPU_CAPABILITY_FPU) ?
-                        VLC_CODEC_FL32 : VLC_CODEC_FI32;
+                     = HAVE_FPU ? VLC_CODEC_FL32 : VLC_CODEC_FI32;
         aout_FormatPrepare( &p_aout->mixer_format );
     }
     else
@@ -338,6 +337,12 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
 
     p_aout->output.b_starving = 0;
 
+    p_aout->output.fifo.p_first = p_buffer->p_next;
+    if ( p_buffer->p_next == NULL )
+    {
+        p_aout->output.fifo.pp_last = &p_aout->output.fifo.p_first;
+    }
+
     if ( !b_can_sleek &&
           ( (p_buffer->i_pts - start_date > AOUT_PTS_TOLERANCE)
              || (start_date - p_buffer->i_pts > AOUT_PTS_TOLERANCE) ) )
@@ -348,6 +353,9 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
         msg_Warn( p_aout, "output date isn't PTS date, requesting "
                   "resampling (%"PRId64")", difference );
 
+        aout_FifoMoveDates( p_aout, &p_aout->output.fifo, difference );
+        aout_unlock_output_fifo( p_aout );
+
         aout_lock_input_fifos( p_aout );
         for ( i = 0; i < p_aout->i_nb_inputs; i++ )
         {
@@ -355,17 +363,10 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
 
             aout_FifoMoveDates( p_aout, p_fifo, difference );
         }
-
-        aout_FifoMoveDates( p_aout, &p_aout->output.fifo, difference );
         aout_unlock_input_fifos( p_aout );
     }
+    else
+        aout_unlock_output_fifo( p_aout );
 
-    p_aout->output.fifo.p_first = p_buffer->p_next;
-    if ( p_buffer->p_next == NULL )
-    {
-        p_aout->output.fifo.pp_last = &p_aout->output.fifo.p_first;
-    }
-
-    aout_unlock_output_fifo( p_aout );
     return p_buffer;
 }