avutil/tests/channel_layout: make printing results part of the tests

Deduplicates a lot of code.

Some minor differences (mostly white space and inconsistent use of quotes) are
expected in the fate tests, there was no point aiming for exactly the same
formatting.

Signed-off-by: Marton Balint <cus@passwd.hu>

1 files changed, 88 insertions, 88 deletions

diff --git a/tests/ref/fate/channel_layout b/tests/ref/fate/channel_layout
index 466fa78d9e..b98ccdb0f0 100644
--- a/tests/ref/fate/channel_layout
+++ b/tests/ref/fate/channel_layout
@@ -60,131 +60,131 @@ With "AMBI1023":                                2047
 ==Native layouts==
 
 Testing av_channel_layout_from_string
-With "0x3f":                                     5.1
-With "63":                                       5.1
-With "6c":                                       5.1
-With "6C":                                6 channels
-With "6 channels":                        6 channels
-With "6 channels (FL+FR+FC+LFE+BL+BR)":          5.1
-With "FL+FR+FC+LFE+BL+BR":                       5.1
-With "5.1":                                      5.1
-With "FL+FR+USR63":         3 channels (FL+FR+USR63)
-With "FL+FR+FC+LFE+SL+SR":                 5.1(side)
-With "5.1(side)":                          5.1(side)
+With "0x3f":                                                          5.1
+With "63":                                                            5.1
+With "6c":                                                            5.1
+With "6C":                                                     6 channels
+With "6 channels":                                             6 channels
+With "6 channels (FL+FR+FC+LFE+BL+BR)":                               5.1
+With "FL+FR+FC+LFE+BL+BR":                                            5.1
+With "5.1":                                                           5.1
+With "FL+FR+USR63":                              3 channels (FL+FR+USR63)
+With "FL+FR+FC+LFE+SL+SR":                                      5.1(side)
+With "5.1(side)":                                               5.1(side)
 
 Testing av_channel_layout_from_mask
 With AV_CH_LAYOUT_5POINT1:                 5.1(side)
 
 Testing av_channel_layout_channel_from_index
-On 5.1(side) layout with 0:                        0
-On 5.1(side) layout with 1:                        1
-On 5.1(side) layout with 2:                        2
-On 5.1(side) layout with 3:                        3
-On 5.1(side) layout with 4:                        9
-On 5.1(side) layout with 5:                       10
-On 5.1(side) layout with 6:                       -1
+On "5.1(side)" layout with  0:        0
+On "5.1(side)" layout with  1:        1
+On "5.1(side)" layout with  2:        2
+On "5.1(side)" layout with  3:        3
+On "5.1(side)" layout with  4:        9
+On "5.1(side)" layout with  5:       10
+On "5.1(side)" layout with  6:       -1
 
 Testing av_channel_layout_index_from_channel
-On 5.1(side) layout with AV_CHAN_FRONT_LEFT:       0
-On 5.1(side) layout with AV_CHAN_FRONT_RIGHT:      1
-On 5.1(side) layout with AV_CHAN_FRONT_CENTER:     2
-On 5.1(side) layout with AV_CHAN_LOW_FREQUENCY:    3
-On 5.1(side) layout with AV_CHAN_SIDE_LEFT:        4
-On 5.1(side) layout with AV_CHAN_SIDE_RIGHT:       5
-On 5.1(side) layout with AV_CHAN_BACK_CENTER:     -1
+On "5.1(side)" layout with AV_CHAN_FRONT_LEFT:       0
+On "5.1(side)" layout with AV_CHAN_FRONT_RIGHT:      1
+On "5.1(side)" layout with AV_CHAN_FRONT_CENTER:     2
+On "5.1(side)" layout with AV_CHAN_LOW_FREQUENCY:    3
+On "5.1(side)" layout with AV_CHAN_SIDE_LEFT:        4
+On "5.1(side)" layout with AV_CHAN_SIDE_RIGHT:       5
+On "5.1(side)" layout with AV_CHAN_BACK_CENTER:     -1
 
 Testing av_channel_layout_channel_from_string
-On 5.1(side) layout with "FL":                     0
-On 5.1(side) layout with "FR":                     1
-On 5.1(side) layout with "FC":                     2
-On 5.1(side) layout with "LFE":                    3
-On 5.1(side) layout with "SL":                     9
-On 5.1(side) layout with "SR":                    10
-On 5.1(side) layout with "BC":                    -1
+On "5.1(side)" layout with "FL":                   0
+On "5.1(side)" layout with "FR":                   1
+On "5.1(side)" layout with "FC":                   2
+On "5.1(side)" layout with "LFE":                  3
+On "5.1(side)" layout with "SL":                   9
+On "5.1(side)" layout with "SR":                  10
+On "5.1(side)" layout with "BC":                  -1
 
 Testing av_channel_layout_index_from_string
-On 5.1(side) layout with "FL":                     0
-On 5.1(side) layout with "FR":                     1
-On 5.1(side) layout with "FC":                     2
-On 5.1(side) layout with "LFE":                    3
-On 5.1(side) layout with "SL":                     4
-On 5.1(side) layout with "SR":                     5
-On 5.1(side) layout with "BC":                    -1
+On "5.1(side)" layout with "FL":                  0
+On "5.1(side)" layout with "FR":                  1
+On "5.1(side)" layout with "FC":                  2
+On "5.1(side)" layout with "LFE":                 3
+On "5.1(side)" layout with "SL":                  4
+On "5.1(side)" layout with "SR":                  5
+On "5.1(side)" layout with "BC":                 -1
 
 Testing av_channel_layout_subset
-On 5.1(side) layout with AV_CH_LAYOUT_STEREO:    0x3
-On 5.1(side) layout with AV_CH_LAYOUT_2POINT1:   0xb
-On 5.1(side) layout with AV_CH_LAYOUT_4POINT1:   0xf
+On "5.1(side)" layout with AV_CH_LAYOUT_STEREO:   0x3
+On "5.1(side)" layout with AV_CH_LAYOUT_2POINT1:  0xb
+On "5.1(side)" layout with AV_CH_LAYOUT_4POINT1:  0xf
 
 ==Custom layouts==
 
 Testing av_channel_layout_from_string
-With "FL+FR+FC+BL+BR+LFE":    6 channels (FL+FR+FC+BL+BR+LFE)
-With "2 channels (FR+FL)":                 2 channels (FR+FL)
-With "ambisonic 1+FR+FL":      ambisonic 1+2 channels (FR+FL)
-With "ambisonic 2+FC@Foo":    ambisonic 2+1 channels (FC@Foo)
-With "FL@Foo+FR@Bar":              2 channels (FL@Foo+FR@Bar)
-With "FR+FL@Foo+USR63@Foo":  3 channels (FR+FL@Foo+USR63@Foo)
+With "FL+FR+FC+BL+BR+LFE":                6 channels (FL+FR+FC+BL+BR+LFE)
+With "2 channels (FR+FL)":                             2 channels (FR+FL)
+With "ambisonic 1+FR+FL":                  ambisonic 1+2 channels (FR+FL)
+With "ambisonic 2+FC@Foo":                ambisonic 2+1 channels (FC@Foo)
+With "FL@Foo+FR@Bar":                          2 channels (FL@Foo+FR@Bar)
+With "FR+FL@Foo+USR63@Foo":              3 channels (FR+FL@Foo+USR63@Foo)
 
 Testing av_channel_layout_index_from_string
-On "FR+FL@Foo+USR63@Foo" layout with "FR":                  0
-On "FR+FL@Foo+USR63@Foo" layout with "FL":                  1
-On "FR+FL@Foo+USR63@Foo" layout with "USR63":               2
-On "FR+FL@Foo+USR63@Foo" layout with "Foo":                -1
-On "FR+FL@Foo+USR63@Foo" layout with "@Foo":                1
-On "FR+FL@Foo+USR63@Foo" layout with "FR@Foo":             -1
-On "FR+FL@Foo+USR63@Foo" layout with "FL@Foo":              1
-On "FR+FL@Foo+USR63@Foo" layout with "USR63@Foo":           2
-On "FR+FL@Foo+USR63@Foo" layout with "BC":                 -1
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with "FR":                  0
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with "FL":                  1
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with "USR63":               2
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with "Foo":                -1
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with "@Foo":                1
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with "FR@Foo":             -1
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with "FL@Foo":              1
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with "USR63@Foo":           2
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with "BC":                 -1
 
 Testing av_channel_layout_channel_from_string
-On "FR+FL@Foo+USR63@Foo" layout with "FR":                  1
-On "FR+FL@Foo+USR63@Foo" layout with "FL":                  0
-On "FR+FL@Foo+USR63@Foo" layout with "USR63":              63
-On "FR+FL@Foo+USR63@Foo" layout with "Foo":                -1
-On "FR+FL@Foo+USR63@Foo" layout with "@Foo":                0
-On "FR+FL@Foo+USR63@Foo" layout with "FR@Foo":             -1
-On "FR+FL@Foo+USR63@Foo" layout with "FL@Foo":              0
-On "FR+FL@Foo+USR63@Foo" layout with "USR63@Foo":          63
-On "FR+FL@Foo+USR63@Foo" layout with "BC":                 -1
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with "FR":                   1
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with "FL":                   0
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with "USR63":               63
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with "Foo":                 -1
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with "@Foo":                 0
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with "FR@Foo":              -1
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with "FL@Foo":               0
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with "USR63@Foo":           63
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with "BC":                  -1
 
 Testing av_channel_layout_index_from_channel
-On "FR+FL@Foo+USR63@Foo" layout with AV_CHAN_FRONT_RIGHT:   0
-On "FR+FL@Foo+USR63@Foo" layout with AV_CHAN_FRONT_LEFT:    1
-On "FR+FL@Foo+USR63@Foo" layout with 63:                    2
-On "FR+FL@Foo+USR63@Foo" layout with AV_CHAN_BACK_CENTER:  -1
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with AV_CHAN_FRONT_RIGHT:      0
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with AV_CHAN_FRONT_LEFT:       1
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with 63:                       2
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with AV_CHAN_BACK_CENTER:     -1
 
 Testing av_channel_layout_channel_from_index
-On "FR+FL@Foo+USR63@Foo" layout with 0:                     1
-On "FR+FL@Foo+USR63@Foo" layout with 1:                     0
-On "FR+FL@Foo+USR63@Foo" layout with 2:                    63
-On "FR+FL@Foo+USR63@Foo" layout with 3:                    -1
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with  0:        1
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with  1:        0
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with  2:       63
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with  3:       -1
 
 Testing av_channel_layout_subset
-On "FR+FL@Foo+USR63@Foo" layout with AV_CH_LAYOUT_STEREO: 0x3
-On "FR+FL@Foo+USR63@Foo" layout with AV_CH_LAYOUT_QUAD:   0x3
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with AV_CH_LAYOUT_STEREO:   0x3
+On "3 channels (FR+FL@Foo+USR63@Foo)" layout with AV_CH_LAYOUT_QUAD:     0x3
 
 ==Ambisonic layouts==
 
 Testing av_channel_layout_from_string
-With "ambisonic 1":                               ambisonic 1
-With "ambisonic 2+stereo":                 ambisonic 2+stereo
+With "ambisonic 1":                                           ambisonic 1
+With "ambisonic 2+stereo":                             ambisonic 2+stereo
 
 Testing av_channel_layout_index_from_channel
-On "ambisonic 2+stereo" layout with AV_CHAN_AMBISONIC_BASE: 0
-On "ambisonic 2+stereo" layout with AV_CHAN_FRONT_LEFT:     9
-On "ambisonic 2+stereo" layout with AV_CHAN_FRONT_RIGHT:   10
-On "ambisonic 2+stereo" layout with AV_CHAN_BACK_CENTER:   -1
+On "ambisonic 2+stereo" layout with AV_CHAN_AMBISONIC_BASE:   0
+On "ambisonic 2+stereo" layout with AV_CHAN_FRONT_LEFT:       9
+On "ambisonic 2+stereo" layout with AV_CHAN_FRONT_RIGHT:     10
+On "ambisonic 2+stereo" layout with AV_CHAN_BACK_CENTER:     -1
 
 Testing av_channel_layout_channel_from_index
-On "ambisonic 2+stereo" layout with 0:                   1024
-On "ambisonic 2+stereo" layout with 9:                      0
-On "ambisonic 2+stereo" layout with 10:                     1
-On "ambisonic 2+stereo" layout with 11:                    -1
+On "ambisonic 2+stereo" layout with  0:     1024
+On "ambisonic 2+stereo" layout with  9:        0
+On "ambisonic 2+stereo" layout with 10:        1
+On "ambisonic 2+stereo" layout with 11:       -1
 
 Testing av_channel_layout_subset
-On "ambisonic 2+stereo" layout with AV_CH_LAYOUT_STEREO:  0x3
-On "ambisonic 2+stereo" layout with AV_CH_LAYOUT_QUAD:    0x3
+On "ambisonic 2+stereo" layout with AV_CH_LAYOUT_STEREO:   0x3
+On "ambisonic 2+stereo" layout with AV_CH_LAYOUT_QUAD:     0x3
 
 Testing av_channel_layout_retype
 With "FL@Boo": CUSTOM (1 channels (FL@Boo))