Added planar I420 9/10-bit VLC_CODEC_* definitions and fallbacks.

[vlc] / include / vlc_aout_mixer.h

diff --git a/include/vlc_aout_mixer.h b/include/vlc_aout_mixer.h
index 10d80fe5be7333e1136a3c0f878aa9f3efbef876..a38de406fe667fb29c2bcfd2899cee14adc41d89 100644 (file)
--- a/include/vlc_aout_mixer.h
+++ b/include/vlc_aout_mixer.h
@@ -41,18 +41,9 @@ typedef struct aout_mixer_sys_t aout_mixer_sys_t;
 typedef struct aout_mixer_t aout_mixer_t;
 
 typedef struct {
-    /* Is the input to be ignored while mixing */
-    bool        is_invalid;
-
     /* */
     aout_fifo_t fifo;
 
-    /* Pointer on the first byte of data to mix.
-     *
-     * It points in the first buffer of fifo
-     */
-    uint8_t     *begin;
-
     /* Software multiplier */
     float       multiplier;
 } aout_mixer_input_t;
@@ -72,22 +63,11 @@ struct aout_mixer_t {
      */
     audio_sample_format_t fmt;
 
-    /* Mixer output buffer allocation method.
-     *
-     * You can override it in the open function only.
-     */
-    aout_alloc_t          allocation;
-
-    /* Multiplier used to raise or lower the volume of the sound in
-     * software.
-     */
-    float                 multiplier;
-
     /* Array of mixer inputs */
     aout_mixer_input_t    *input;
 
-    /* Mix input into the given buffer (mandatory) */
-    void (*mix)(aout_mixer_t *, aout_buffer_t *);
+    /* Mix buffer (mandatory) */
+    void (*mix)(aout_mixer_t *, aout_buffer_t *, float);
 
     /* Private place holder for the aout_mixer_t module (optional)
      *