[MPlayer-dev-eng] [PATCH] Fix incorrect channel ordering for various codecs

[Reimar Döffinger]

On Mon, Aug 17, 2009 at 01:24:35PM -0400, Jason Tackaberry wrote:
> Index: libaf/reorder_ch.h
> ===================================================================
> --- libaf/reorder_ch.h	(revision 29532)
> +++ libaf/reorder_ch.h	(working copy)
> @@ -53,8 +53,9 @@
>  #define AF_CHANNEL_LAYOUT_5_1_C ((114<<8)|6|AF_LFE)    // L C R Ls Rs LFE
>  #define AF_CHANNEL_LAYOUT_5_1_D ((115<<8)|6|AF_LFE)    // C L R Ls Rs LFE
>  #define AF_CHANNEL_LAYOUT_5_1_E ((116<<8)|6|AF_LFE)    // LFE L C R Ls Rs
> -#define AF_CHANNEL_LAYOUT_6_1_A ((117<<8)|7|AF_LFE)    // L R C LFE Ls Rs Cs
> -#define AF_CHANNEL_LAYOUT_7_1_A ((118<<8)|8|AF_LFE)   // L R C LFE Ls Rs Rls Rrs
> +#define AF_CHANNEL_LAYOUT_5_1_F ((117<<8)|6|AF_LFE)    // C L R LFE Ls Rs
> +#define AF_CHANNEL_LAYOUT_6_1_A ((118<<8)|7|AF_LFE)    // L R C LFE Ls Rs Cs
> +#define AF_CHANNEL_LAYOUT_7_1_A ((119<<8)|8|AF_LFE)   // L R C LFE Ls Rs Rls Rrs

While you're at it align the comment.

> @@ -100,15 +97,13 @@
>  
>  // Channel layout definitions for different audio sources or targets
>  // When specified channel number, they will be map to the specific layouts.
> -#define AF_CHANNEL_LAYOUT_ALSA_DEFAULT        0
> -#define AF_CHANNEL_LAYOUT_AAC_DEFAULT         1
> -#define AF_CHANNEL_LAYOUT_WAVEEX_DEFAULT      2
> -#define AF_CHANNEL_LAYOUT_LAVC_AC3_DEFAULT    3
> -#define AF_CHANNEL_LAYOUT_LAVC_LIBA52_DEFAULT 4
> -#define AF_CHANNEL_LAYOUT_LAVC_DCA_DEFAULT    5
> -#define AF_CHANNEL_LAYOUT_VORBIS_DEFAULT      6
> -#define AF_CHANNEL_LAYOUT_FLAC_DEFAULT        7
> -#define AF_CHANNEL_LAYOUT_SOURCE_NUM          8
> +#define AF_CHANNEL_LAYOUT_ALSA_DEFAULT         0
> +#define AF_CHANNEL_LAYOUT_AAC_DEFAULT          1
> +#define AF_CHANNEL_LAYOUT_WAVEEX_DEFAULT       2
> +#define AF_CHANNEL_LAYOUT_LAVC_DEFAULT         3
> +#define AF_CHANNEL_LAYOUT_VORBIS_DEFAULT       4
> +#define AF_CHANNEL_LAYOUT_LAVC_AAC_DEC_DEFAULT 5
> +#define AF_CHANNEL_LAYOUT_SOURCE_NUM           6
>  #define AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT AF_CHANNEL_LAYOUT_ALSA_DEFAULT

Cosmetics like changing the indentation should be applied in a second
commit.