use strerror_r() which is guaranteed to be thread safe, using the GNU prototype only...

[vlc] / src / audio_output / dec.c

diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
index e7747953cb5f0b6a422838161232b4ab8cfbc52e..694957e0b7ead9d68b20392923906e87aab54e2f 100644 (file)
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -24,8 +24,9 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                            /* calloc(), malloc(), free() */
-#include <string.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
 
@@ -45,11 +46,26 @@
  * aout_DecNew : create a decoder
  *****************************************************************************/
 static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout,
-                              audio_sample_format_t * p_format )
+                              audio_sample_format_t *p_format,
+                              audio_replay_gain_t *p_replay_gain )
 {
     aout_input_t * p_input;
     input_thread_t * p_input_thread;
-    vlc_value_t val;
+
+    /* Sanitize audio format */
+    if( p_format->i_channels > 32 )
+    {
+        msg_Err( p_aout, "too many audio channels (%u)",
+                 p_format->i_channels );
+        goto error;
+    }
+
+    if( p_format->i_rate > 192000 )
+    {
+        msg_Err( p_aout, "excessive audio sample frequency (%u)",
+                 p_format->i_rate );
+        goto error;
+    }
 
     /* We can only be called by the decoder, so no need to lock
      * p_input->lock. */
@@ -67,14 +83,19 @@ static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout,
         msg_Err( p_aout, "out of memory" );
         goto error;
     }
+    memset( p_input, 0, sizeof(aout_input_t) );
 
     vlc_mutex_init( p_aout, &p_input->lock );
 
     p_input->b_changed = 0;
     p_input->b_error = 1;
+
     aout_FormatPrepare( p_format );
+
     memcpy( &p_input->input, p_format,
             sizeof(audio_sample_format_t) );
+    if( p_replay_gain )
+        p_input->replay_gain = *p_replay_gain;
 
     p_aout->pp_inputs[p_aout->i_nb_inputs] = p_input;
     p_aout->i_nb_inputs++;
@@ -122,9 +143,7 @@ static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout,
     aout_InputNew( p_aout, p_input );
 
     vlc_mutex_unlock( &p_aout->mixer_lock );
-    var_Create( p_this, "audio-desync", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-    var_Get( p_this, "audio-desync", &val );
-    p_input->i_desync = val.i_int * 1000;
+    p_input->i_desync = var_CreateGetInteger( p_this, "audio-desync" ) * 1000;
 
     p_input_thread = (input_thread_t *)vlc_object_find( p_this,
                                            VLC_OBJECT_INPUT, FIND_PARENT );
@@ -151,7 +170,8 @@ error:
 
 aout_input_t * __aout_DecNew( vlc_object_t * p_this,
                               aout_instance_t ** pp_aout,
-                              audio_sample_format_t * p_format )
+                              audio_sample_format_t * p_format,
+                              audio_replay_gain_t *p_replay_gain )
 {
     if ( *pp_aout == NULL )
     {
@@ -176,7 +196,7 @@ aout_input_t * __aout_DecNew( vlc_object_t * p_this,
         }
     }
 
-    return DecNew( p_this, *pp_aout, p_format );
+    return DecNew( p_this, *pp_aout, p_format, p_replay_gain );
 }
 
 /*****************************************************************************
@@ -241,8 +261,7 @@ int aout_DecDelete( aout_instance_t * p_aout, aout_input_t * p_input )
 /*****************************************************************************
  * aout_DecNewBuffer : ask for a new empty buffer
  *****************************************************************************/
-aout_buffer_t * aout_DecNewBuffer( aout_instance_t * p_aout,
-                                   aout_input_t * p_input,
+aout_buffer_t * aout_DecNewBuffer( aout_input_t * p_input,
                                    size_t i_nb_samples )
 {
     aout_buffer_t * p_buffer;
@@ -260,24 +279,20 @@ aout_buffer_t * aout_DecNewBuffer( aout_instance_t * p_aout,
 
     /* This necessarily allocates in the heap. */
     aout_BufferAlloc( &p_input->input_alloc, duration, NULL, p_buffer );
-    p_buffer->i_nb_samples = i_nb_samples;
-    p_buffer->i_nb_bytes = i_nb_samples * p_input->input.i_bytes_per_frame
-                              / p_input->input.i_frame_length;
+    if( p_buffer != NULL )
+        p_buffer->i_nb_bytes = i_nb_samples * p_input->input.i_bytes_per_frame
+                                  / p_input->input.i_frame_length;
 
     /* Suppose the decoder doesn't have more than one buffered buffer */
     p_input->b_changed = 0;
 
     vlc_mutex_unlock( &p_input->lock );
 
-    if ( p_buffer == NULL )
-    {
-        msg_Err( p_aout, "NULL buffer !" );
-    }
-    else
-    {
-        p_buffer->start_date = p_buffer->end_date = 0;
-    }
+    if( p_buffer == NULL )
+        return NULL;
 
+    p_buffer->i_nb_samples = i_nb_samples;
+    p_buffer->start_date = p_buffer->end_date = 0;
     return p_buffer;
 }
 
@@ -295,7 +310,7 @@ void aout_DecDeleteBuffer( aout_instance_t * p_aout, aout_input_t * p_input,
  * aout_DecPlay : filter & mix the decoded buffer
  *****************************************************************************/
 int aout_DecPlay( aout_instance_t * p_aout, aout_input_t * p_input,
-                  aout_buffer_t * p_buffer )
+                  aout_buffer_t * p_buffer, int i_input_rate )
 {
     if ( p_buffer->start_date == 0 )
     {
@@ -304,6 +319,13 @@ int aout_DecPlay( aout_instance_t * p_aout, aout_input_t * p_input,
         return -1;
     }
 
+    if( i_input_rate > INPUT_RATE_DEFAULT * AOUT_MAX_INPUT_RATE ||
+        i_input_rate < INPUT_RATE_DEFAULT / AOUT_MAX_INPUT_RATE )
+    {
+        aout_BufferFree( p_buffer );
+        return 0;
+    }
+
     /* Apply the desynchronisation requested by the user */
     p_buffer->start_date += p_input->i_desync;
     p_buffer->end_date += p_input->i_desync;
@@ -326,7 +348,7 @@ int aout_DecPlay( aout_instance_t * p_aout, aout_input_t * p_input,
     }
 
     p_buffer->end_date = p_buffer->start_date
-                            + (mtime_t)(p_buffer->i_nb_samples * 1000000)
+                            + (mtime_t)p_buffer->i_nb_samples * 1000000
                                 / p_input->input.i_rate;
 
     vlc_mutex_lock( &p_input->lock );
@@ -360,7 +382,7 @@ int aout_DecPlay( aout_instance_t * p_aout, aout_input_t * p_input,
     /* If the buffer is too early, wait a while. */
     mwait( p_buffer->start_date - AOUT_MAX_PREPARE_TIME );
 
-    if ( aout_InputPlay( p_aout, p_input, p_buffer ) == -1 )
+    if ( aout_InputPlay( p_aout, p_input, p_buffer, i_input_rate ) == -1 )
     {
         vlc_mutex_unlock( &p_input->lock );
         return -1;