X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_aout.h;h=cfa453c6d6619f0558002ec360a9f26fbd89547d;hb=6d1bdaf0c6161fabf99a00f76e8404823312cf74;hp=d3f20b6cf9eb6628180879ed07122b3c36ff6d42;hpb=fbf4c8060d35617e39b50ae739307152d02ed951;p=vlc

diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index d3f20b6cf9..cfa453c6d6 100644
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -144,6 +144,7 @@ struct aout_buffer_t
     size_t                  i_size, i_nb_bytes;
     unsigned int            i_nb_samples;
     mtime_t                 start_date, end_date;
+    vlc_bool_t              b_discontinuity; /* Set on discontinuity (for non pcm stream) */
 
     struct aout_buffer_t *  p_next;
 
@@ -155,12 +156,12 @@ struct aout_buffer_t
     void (*pf_release)( aout_buffer_t * );
 };
 
-#define aout_BufferFree( p_buffer )                                         \
+#define aout_BufferFree( p_buffer ) do {                                    \
     if( p_buffer != NULL && (p_buffer)->i_alloc_type == AOUT_ALLOC_HEAP )   \
     {                                                                       \
         free( p_buffer );                                                   \
     }                                                                       \
-    p_buffer = NULL;
+    p_buffer = NULL; } while(0)
 
 /* Size of a frame for S/PDIF output. */
 #define AOUT_SPDIF_SIZE 6144
@@ -168,6 +169,9 @@ struct aout_buffer_t
 /* Number of samples in an A/52 frame. */
 #define A52_FRAME_NB 1536
 
+/* Max input rate factor (1/4 -> 4) */
+#define AOUT_MAX_INPUT_RATE (4)
+
 /** date incrementation helper structure without long-term
  * rounding errors
  */
@@ -266,6 +270,8 @@ struct aout_input_t
 
     /* Mixer information */
     byte_t *                p_first_byte_to_mix;
+    audio_replay_gain_t     replay_gain;
+    float                   f_multiplier;
 
     /* If b_restart == 1, the input pipeline will be re-created. */
     vlc_bool_t              b_restart;
@@ -276,6 +282,8 @@ struct aout_input_t
     /* Did we just change the output format? (expect buffer inconsistencies) */
     vlc_bool_t              b_changed;
 
+    /* last rate from input */
+    int                     i_last_input_rate;
     /* internal caching delay from input */
     int                     i_pts_delay;
     /* desynchronisation delay request by the user */
@@ -383,7 +391,6 @@ VLC_EXPORT( int, __aout_VolumeUp, ( vlc_object_t *, int, audio_volume_t * ) );
 VLC_EXPORT( int, __aout_VolumeDown, ( vlc_object_t *, int, audio_volume_t * ) );
 #define aout_VolumeMute(a, b) __aout_VolumeMute(VLC_OBJECT(a), b)
 VLC_EXPORT( int, __aout_VolumeMute, ( vlc_object_t *, audio_volume_t * ) );
-VLC_EXPORT( int, aout_Restart, ( aout_instance_t * p_aout ) );
 VLC_EXPORT( int, aout_FindAndRestart, ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ) );
 VLC_EXPORT( int, aout_ChannelsRestart, ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ) );