Check asprintf return value.

[vlc] / src / audio_output / aout_internal.h

diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index 2c046b2d646d89470049870f7c344d21636a2284..b0b8449f0f9a0339ba80277f9e96c279d728e050 100644 (file)
--- a/src/audio_output/aout_internal.h
+++ b/src/audio_output/aout_internal.h
@@ -21,6 +21,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#if defined(__PLUGIN__) || defined(__BUILTIN__) || !defined(__LIBVLC__)
+# error This header file can only be included from LibVLC.
+#endif
+
+#ifndef __LIBVLC_AOUT_INTERNAL_H
+# define __LIBVLC_AOUT_INTERNAL_H 1
+
 #if defined( __APPLE__ ) || defined( SYS_BSD )
 #undef HAVE_ALLOCA
 #endif
@@ -57,8 +64,9 @@
         {                                                                   \
             (p_new_buffer)->i_alloc_type = i_alloc_type;                    \
             (p_new_buffer)->i_size = i_alloc_size;                          \
-            (p_new_buffer)->p_buffer = (byte_t *)(p_new_buffer)             \
+            (p_new_buffer)->p_buffer = (uint8_t *)(p_new_buffer)            \
                                          + sizeof(aout_buffer_t);           \
+            (p_new_buffer)->b_discontinuity = false;                        \
             if ( (p_previous_buffer) != NULL )                              \
             {                                                               \
                 (p_new_buffer)->start_date =                                \
@@ -78,7 +86,7 @@
 int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input );
 int aout_InputDelete( aout_instance_t * p_aout, aout_input_t * p_input );
 int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
-                    aout_buffer_t * p_buffer );
+                    aout_buffer_t * p_buffer, int i_input_rate );
 
 /* From filters.c : */
 int aout_FiltersCreatePipeline ( aout_instance_t * p_aout, aout_filter_t ** pp_filters, int * pi_nb_filters, const audio_sample_format_t * p_input_format, const audio_sample_format_t * p_output_format );
@@ -102,8 +110,8 @@ void aout_OutputDelete( aout_instance_t * p_aout );
 
 /* From common.c : */
 #define aout_New(a) __aout_New(VLC_OBJECT(a))
+/* Release with vlc_object_release() */
 aout_instance_t * __aout_New ( vlc_object_t * );
-void aout_Delete ( aout_instance_t * );
 
 void aout_FifoInit( aout_instance_t *, aout_fifo_t *, uint32_t );
 mtime_t aout_FifoNextStart( aout_instance_t *, aout_fifo_t * );
@@ -123,10 +131,87 @@ int aout_VolumeNoneSet( aout_instance_t *, audio_volume_t );
 int aout_VolumeNoneInfos( aout_instance_t *, audio_volume_t * );
 
 /* From dec.c */
-#define aout_DecNew(a, b, c) __aout_DecNew(VLC_OBJECT(a), b, c)
-aout_input_t * __aout_DecNew( vlc_object_t *, aout_instance_t **, audio_sample_format_t * );
+#define aout_DecNew(a, b, c, d) __aout_DecNew(VLC_OBJECT(a), b, c, d)
+aout_input_t * __aout_DecNew( vlc_object_t *, aout_instance_t **, audio_sample_format_t *, audio_replay_gain_t * );
 int aout_DecDelete ( aout_instance_t *, aout_input_t * );
-aout_buffer_t * aout_DecNewBuffer( aout_instance_t *, aout_input_t *, size_t );
+aout_buffer_t * aout_DecNewBuffer( aout_input_t *, size_t );
 void aout_DecDeleteBuffer( aout_instance_t *, aout_input_t *, aout_buffer_t * );
-int aout_DecPlay( aout_instance_t *, aout_input_t *, aout_buffer_t * );
+int aout_DecPlay( aout_instance_t *, aout_input_t *, aout_buffer_t *, int i_input_rate );
+
+/* Helpers */
+
+/**
+ * This function will safely mark aout input to be restarted as soon as
+ * possible to take configuration changes into account */
+static inline void AoutInputsMarkToRestart( aout_instance_t *p_aout )
+{
+    int i;
+    vlc_mutex_lock( &p_aout->mixer_lock );
+    for( i = 0; i < p_aout->i_nb_inputs; i++ )
+        p_aout->pp_inputs[i]->b_restart = true;
+    vlc_mutex_unlock( &p_aout->mixer_lock );
+}
+
+/* This function will add or remove a a module from a string list (comma
+ * separated). It will return true if there is a modification
+ * In case p_aout is NULL, we will use configuration instead of variable */
+static inline bool AoutChangeFilterString( vlc_object_t *p_obj, aout_instance_t * p_aout,
+                                           const char* psz_variable,
+                                           const char *psz_name, bool b_add )
+{
+    vlc_value_t val;
+    char *psz_parser;
+
+    if( *psz_name == '\0' )
+        return false;
+
+    if( p_aout )
+        var_Get( p_aout, psz_variable, &val );
+    else
+        val.psz_string = config_GetPsz( p_obj, "audio-filter" );
+
+    if( !val.psz_string )
+        val.psz_string = strdup("");
+
+    psz_parser = strstr( val.psz_string, psz_name );
+
+    if( ( b_add && psz_parser ) || ( !b_add && !psz_parser ) )
+    {
+        /* Nothing to do */
+        free( val.psz_string );
+        return false;
+    }
+
+    if( b_add )
+    {
+        char *psz_old = val.psz_string;
+        if( *psz_old )
+        {
+            if( asprintf( &val.psz_string, "%s:%s", psz_old, psz_name ) == -1 )
+                val.psz_string = NULL;
+        }
+        else
+            val.psz_string = strdup( psz_name );
+        free( psz_old );
+    }
+    else
+    {
+        const int i_name = strlen( psz_name );
+        const char *psz_next;
+
+        psz_next = &psz_parser[i_name];
+        if( *psz_next == ':' )
+            psz_next++;
+
+        memmove( psz_parser, psz_next, strlen(psz_next)+1 );
+    }
+
+    if( p_aout )
+        var_Set( p_aout, psz_variable, val );
+    else
+        config_PutPsz( p_obj, psz_variable, val.psz_string );
+    free( val.psz_string );
+    return true;
+}
 
+#endif /* !__LIBVLC_AOUT_INTERNAL_H */