On 02/14/2012 05:55 PM, Tim W. wrote:
> Allows to determine the channel arrangement quicker than analyzing a
> list of channel names.
>
> The layout names used here are merely a suggestion.
>
> Tim W.
>
> ---
> libavutil/audioconvert.c | 18 ++++++++++++++++++
> 1 files changed, 18 insertions(+), 0 deletions(-)
>
> diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c
> index e9f9e41..2da64e2 100644
> --- a/libavutil/audioconvert.c
> +++ b/libavutil/audioconvert.c
> @@ -64,16 +64,34 @@ static const struct {
> } channel_layout_map[] = {
> { "mono", 1, AV_CH_LAYOUT_MONO },
> { "stereo", 2, AV_CH_LAYOUT_STEREO },
> + { "stereo", 2, AV_CH_LAYOUT_STEREO_DOWNMIX },
> + { "2.1", 3, AV_CH_LAYOUT_2POINT1 },
> + { "3.0", 3, AV_CH_LAYOUT_SURROUND },
> + { "3.0(back)", 3, AV_CH_LAYOUT_2_1 },
> + { "3.1", 4, AV_CH_LAYOUT_3POINT1 },
> { "4.0", 4, AV_CH_LAYOUT_4POINT0 },
> { "quad", 4, AV_CH_LAYOUT_QUAD },
> + { "quad(front)", 4, AV_CH_LAYOUT_2_2 },
that's really more like "quad(side)"
> + { "4.1", 5, AV_CH_LAYOUT_4POINT1 },
> { "5.0", 5, AV_CH_LAYOUT_5POINT0 },
> { "5.0", 5, AV_CH_LAYOUT_5POINT0_BACK },
> { "5.1", 6, AV_CH_LAYOUT_5POINT1 },
> { "5.1", 6, AV_CH_LAYOUT_5POINT1_BACK },
> { "5.1+downmix", 8,
> AV_CH_LAYOUT_5POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, },
> + { "6.0", 6, AV_CH_LAYOUT_6POINT0 },
> + { "6.0(front)", 6, AV_CH_LAYOUT_6POINT0_FRONT },
> + { "hexagonal", 6, AV_CH_LAYOUT_HEXAGONAL },
> + { "6.1", 7, AV_CH_LAYOUT_6POINT1 },
> + { "6.1", 7, AV_CH_LAYOUT_6POINT1_BACK },
> + { "6.1(front)", 7, AV_CH_LAYOUT_6POINT1_FRONT },
> + { "6.1+downmix", 9,
> AV_CH_LAYOUT_6POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, },
> + { "7.0", 7, AV_CH_LAYOUT_7POINT0 },
> + { "7.0(front)", 7, AV_CH_LAYOUT_7POINT0_FRONT },
> { "7.1", 8, AV_CH_LAYOUT_7POINT1 },
> { "7.1(wide)", 8, AV_CH_LAYOUT_7POINT1_WIDE },
> + { "7.1(wide)", 8, AV_CH_LAYOUT_7POINT1_WIDE_BACK },
duplicate
> { "7.1+downmix", 10,
> AV_CH_LAYOUT_7POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, },
> + { "octagonal", 8, AV_CH_LAYOUT_OCTAGONAL },
> { 0 }
> };
the rest looks ok.
-Justin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
