[FFmpeg-devel] [PATCH 4/4] fate: use 'c' for setting the channel_layout

[Ronald S. Bultje]

Hi,

On Sun, Aug 30, 2015 at 5:56 PM, Andreas Cadhalpun <
andreas.cadhalpun at googlemail.com> wrote:

> On 22.08.2015 19:58, Andreas Cadhalpun wrote:
> > Without this fate-filter-join fails with
> > FF_API_GET_CHANNEL_LAYOUT_COMPAT disabled.
> >
> > Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> > ---
> >
> > The filter-formats reference needs to be updated, when
> > FF_API_GET_CHANNEL_LAYOUT_COMPAT gets disabled:
> >
> > --- a/tests/ref/fate/filter-formats
> > +++ b/tests/ref/fate/filter-formats
> > @@ -67,11 +67,11 @@ quad(side)
> >  8 channels (FL+FR+LFE+BC+SL+SR+DL+DR)
> >  8 channels (FL+FR+FC+BC+SL+SR+DL+DR)
> >  -1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, blah);
> > -0 = ff_parse_channel_layout(0000000000000004,  1, 1);
> > -0 = ff_parse_channel_layout(0000000000000003,  2, 2);
> > +0 = ff_parse_channel_layout(0000000000000001,  1, 1);
> > +0 = ff_parse_channel_layout(0000000000000002,  1, 2);
> >  -1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, -1);
> > -0 = ff_parse_channel_layout(0000000000000000, 60, 60);
> > --1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, 65);
> > +0 = ff_parse_channel_layout(000000000000003C,  4, 60);
> > +0 = ff_parse_channel_layout(0000000000000041,  2, 65);
> >  0 = ff_parse_channel_layout(0000000000000004,  1, 1c);
> >  0 = ff_parse_channel_layout(0000000000000003,  2, 2c);
> >  -1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, -1c);
> > @@ -79,7 +79,7 @@ quad(side)
> >  -1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, 65c);
> >  0 = ff_parse_channel_layout(000000000000003F,  6, 5.1);
> >  0 = ff_parse_channel_layout(0000000000000003,  2, stereo);
> > -0 = ff_parse_channel_layout(0000000000000004,  1, 1+1+1+1);
> > +0 = ff_parse_channel_layout(0000000000000001,  1, 1+1+1+1);
> >  0 = ff_parse_channel_layout(0000000000000004,  1, 1c+1c+1c+1c);
> >  0 = ff_parse_channel_layout(0000000000000007,  3, 2c+1c);
> >  0 = ff_parse_channel_layout(0000000000000003,  2, 0x3);
>

This is because %d used to be "number of channels", and now it's "channel
layout enum id", right? So this is OK upon api bump.

> diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak
> > index 2669498..85a36d2 100644
> > --- a/tests/fate/filter-audio.mak
> > +++ b/tests/fate/filter-audio.mak
> > @@ -81,7 +81,7 @@ FATE_AFILTER-$(call FILTERDEMDECENCMUX, JOIN, WAV,
> PCM_S16LE, PCM_S16LE, PCM_S16
> >  fate-filter-join: SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
> >  fate-filter-join: SRC2 = $(TARGET_PATH)/tests/data/asynth-44100-3.wav
> >  fate-filter-join: tests/data/asynth-44100-2.wav
> tests/data/asynth-44100-3.wav
> > -fate-filter-join: CMD = md5 -i $(SRC1) -i $(SRC2) -filter_complex
> join=channel_layout=5 -f s16le
> > +fate-filter-join: CMD = md5 -i $(SRC1) -i $(SRC2) -filter_complex
> join=channel_layout=5c -f s16le
> >  fate-filter-join: CMP = oneline
> >  fate-filter-join: REF = 88b0d24a64717ba8635b29e8dac6ecd8
>

This is OK now.

Ronald