[vlc-devel] [RFC v2 2/2] audio: let VLC decode more than 9 audio channels

[Jean-Baptiste Kempf]

On 12 Oct, Emeric Grange wrote :
> ---
>  include/vlc_aout.h                    | 14 +++++++++++++-
>  include/vlc_es.h                      | 17 +++++++++++++++--
>  modules/codec/araw.c                  |  3 +++
>  modules/demux/windows_audio_commons.h | 17 +++++++++++++++--
>  4 files changed, 46 insertions(+), 5 deletions(-)
> 
> diff --git a/include/vlc_aout.h b/include/vlc_aout.h
> index 630be72..df16254 100644
> --- a/include/vlc_aout.h
> +++ b/include/vlc_aout.h
> @@ -177,7 +177,19 @@ static const uint32_t pi_vlc_chan_order_wg4[] =
>      AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
>      AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
>      AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_REARCENTER,
> -    AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0
> +    AOUT_CHAN_CENTER, AOUT_CHAN_LFE,
> +
> +    AOUT_CHAN_SIDE_LEFT,
> +    AOUT_CHAN_SIDE_RIGHT,
> +    AOUT_CHAN_TOP_CENTER,
> +    AOUT_CHAN_TOP_FRONT_CENTER,
> +    AOUT_CHAN_TOP_FRONT_LEFT,
> +    AOUT_CHAN_TOP_FRONT_RIGHT,
> +    AOUT_CHAN_TOP_REAR_CENTER,
> +    AOUT_CHAN_TOP_REAR_LEFT,
> +    AOUT_CHAN_TOP_REAR_RIGHT,

Are you sure this is the correct wg4 order?

> diff --git a/include/vlc_es.h b/include/vlc_es.h
> index 97cdb78..1ce8b7e 100644
> --- a/include/vlc_es.h
> +++ b/include/vlc_es.h
> @@ -108,12 +108,24 @@ struct audio_format_t
>  #define AOUT_CHAN_REARRIGHT         0x40
>  #define AOUT_CHAN_MIDDLELEFT        0x100
>  #define AOUT_CHAN_MIDDLERIGHT       0x200
> +#define AOUT_CHAN_SIDE_LEFT         0x400
> +#define AOUT_CHAN_SIDE_RIGHT        0x800

I still don't understand what this AOUT_CHAN_SIDE_RIGHT and
AOUT_CHAN_SIDE_LEFT are.

AOUT_CHAN_MIDDLE* corresponds to SPEAKER_SIDE_LEFT and
SPEAKER_SIDE_RIGHT, since AOUT_CHANS_7_1 should correspond to
KSAUDIO_SPEAKER_7POINT1_SURROUND


With my kindest regards,

-- 
Jean-Baptiste Kempf
http://www.jbkempf.com/ - +33 672 704 734
Sent from my Electronic Device