[FFmpeg-devel] [PATCH]Define AV_CH_LAYOUT_5POINTx_SIDE

[Stefano Sabatini]

On date Sunday 2011-08-28 23:17:21 +0200, Carl Eugen Hoyos encoded:
> Hi!
> 
> I believe Stefano suggested this patch.

Yes, I based my suggesion on your consideration that
AV_CH_LAYOUT_5POINTX should not be considered the default 5.[01]
layout, so it is better to postfix it with _SIDE for clarity.

> Carl Eugen

> diff --git a/libavutil/audioconvert.h b/libavutil/audioconvert.h
> index 134c610..abd268d 100644
> --- a/libavutil/audioconvert.h
> +++ b/libavutil/audioconvert.h
> @@ -64,8 +64,8 @@
>  #define AV_CH_LAYOUT_4POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_CENTER)
>  #define AV_CH_LAYOUT_2_2               (AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
>  #define AV_CH_LAYOUT_QUAD              (AV_CH_LAYOUT_STEREO|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
> -#define AV_CH_LAYOUT_5POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
> -#define AV_CH_LAYOUT_5POINT1           (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY)
> +#define AV_CH_LAYOUT_5POINT0_SIDE      (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
> +#define AV_CH_LAYOUT_5POINT1_SIDE      (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY)
>  #define AV_CH_LAYOUT_5POINT0_BACK      (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
>  #define AV_CH_LAYOUT_5POINT1_BACK      (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY)
>  #define AV_CH_LAYOUT_7POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
> @@ -73,6 +73,10 @@
>  #define AV_CH_LAYOUT_7POINT1_WIDE      (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
>  #define AV_CH_LAYOUT_STEREO_DOWNMIX    (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT)
>  

> +/* Compatibility macros */
> +#define AV_CH_LAYOUT_5POINT0 AV_CH_LAYOUT_5POINT0_SIDE
> +#define AV_CH_LAYOUT_5POINT1 AV_CH_LAYOUT_5POINT1_SIDE

These may be dropped at the next major bump.
-- 
FFmpeg = Fascinating Forgiving Meaningful Philosophical Extreme Glue