avformat/framehash: also print channel layout as a string

This should be more useful for users since numerical values for channel
layout can be confusing and unintuitive.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

libavformat/framehash.c

@@ -29,13 +29,16 @@ int ff_framehash_write_header(AVFormatContext *s)
     for (i = 0; i < s->nb_streams; i++) {
         AVStream *st = s->streams[i];
         AVCodecParameters *avctx = st->codecpar;
+        char buf[256] = { 0 };
         avio_printf(s->pb, "#tb %d: %d/%d\n", i, st->time_base.num, st->time_base.den);
         avio_printf(s->pb, "#media_type %d: %s\n", i, av_get_media_type_string(avctx->codec_type));
         avio_printf(s->pb, "#codec_id %d: %s\n", i, avcodec_get_name(avctx->codec_id));
         switch (avctx->codec_type) {
         case AVMEDIA_TYPE_AUDIO:
+            av_get_channel_layout_string(buf, sizeof(buf), avctx->channels, avctx->channel_layout);
             avio_printf(s->pb, "#sample_rate %d: %d\n", i,avctx->sample_rate);
             avio_printf(s->pb, "#channel_layout %d: %"PRIx64"\n", i,avctx->channel_layout);
+            avio_printf(s->pb, "#channel_layout_name %d: %s\n", i, buf);
             break;
         case AVMEDIA_TYPE_VIDEO:
             avio_printf(s->pb, "#dimensions %d: %dx%d\n", i, avctx->width, avctx->height);

tests/ref/fate/8bps

@@ -8,6 +8,7 @@
 #codec_id 1: pcm_s16le
 #sample_rate 1: 22050
 #channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        1,   259200, 0x7e91df07
 1,          0,          0,     1024,     2048, 0x3d042426
 1,       1024,       1024,     1024,     2048, 0x5bcae456

tests/ref/fate/adpcm-4xm

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1472,     5888, 0x9086e310
 0,       1476,       1476,     1472,     5888, 0xac8491f5
 0,       2952,       2952,     1472,     5888, 0xc9a08b6b

tests/ref/fate/adpcm-afc

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,    17920,    71680, 0x52373bc9
 0,      17920,      17920,    17920,    71680, 0x1f854b27
 0,      35840,      35840,    17920,    71680, 0x3d265a6d

tests/ref/fate/adpcm-dtk

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 48000
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,      896,     3584, 0xdae789d5
 0,        896,        896,      896,     3584, 0x168ed9b6
 0,       1792,       1792,      896,     3584, 0x8920c8d5

tests/ref/fate/adpcm-ea-1

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1484,     5936, 0x00000000
 0,       1484,       1484,     1456,     5824, 0x00000000
 0,       2940,       2940,     1484,     5936, 0x00000000

tests/ref/fate/adpcm-ea-2

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1484,     5936, 0xea261a29
 0,       1484,       1484,     1456,     5824, 0x253df061
 0,       2940,       2940,     1484,     5936, 0x603a5bd7

tests/ref/fate/adpcm-ea-maxis-xa

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,       28,      112, 0x291d1be4
 0,         28,         28,       28,      112, 0xf08d33cc
 0,         56,         56,       28,      112, 0x5b1521de

tests/ref/fate/adpcm-ea-r1

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 48000
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1624,     6496, 0x00000000
 0,       1624,       1624,     1596,     6384, 0x00000000
 0,       3220,       3220,     1596,     6384, 0x00000000

tests/ref/fate/adpcm-ima-amv

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
 #channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,     1378,     2756, 0x0af35034
 0,       1378,       1378,     1378,     2756, 0x8462443f
 0,       2756,       2756,     1378,     2756, 0x9f493ba6

tests/ref/fate/adpcm-ima-ea-eacs

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1468,     5872, 0x00000000
 0,       1468,       1468,     1468,     5872, 0x00000000
 0,       2936,       2936,     1468,     5872, 0x00000000

tests/ref/fate/adpcm-ima-ea-sead

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,      736,     2944, 0x00000000
 0,        736,        736,     1472,     5888, 0x5ae3c2a4
 0,       2208,       2208,     1472,     5888, 0x158fbcb4

tests/ref/fate/adpcm-ima-smjpeg

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
 #channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,      512,     1024, 0x00000000
 0,        512,        512,      512,     1024, 0x00000000
 0,       1024,       1024,      512,     1024, 0xed2d3f6b

tests/ref/fate/adpcm-ima-ws

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
 #channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,    11024,    22048, 0x0665d7f4
 0,      11024,      11024,     1470,     2940, 0x0f3c64cb
 0,      12494,      12494,     1470,     2940, 0xc90b9e78

tests/ref/fate/adpcm-ms-mono

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 11025
 #channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,      500,     1000, 0x64cd9403
 0,        500,        500,      500,     1000, 0xa4ef8a9d
 0,       1000,       1000,      500,     1000, 0x75c19868

tests/ref/fate/adpcm-thp

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 32000
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1078,     4312, 0x469714f6
 0,       1078,       1078,     1064,     4256, 0x6ca28f25
 0,       2142,       2142,     1078,     4312, 0xd466f806

tests/ref/fate/adpcm-vima

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,    73500,   294000, 0x37d439ee
 0,      73500,      73500,     1470,     5880, 0xe524b177
 0,      74970,      74970,     1470,     5880, 0x9e784af1

tests/ref/fate/adpcm-xa

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 37800
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     2016,     8064, 0xa307ed8c
 0,       2016,       2016,     2016,     8064, 0xd2551927
 0,       4032,       4032,     2016,     8064, 0x3264a799

tests/ref/fate/adtstoasc_ticket3715

@@ -6,6 +6,7 @@ ef8ce3cbd1d86113e7c991a816086068 *tests/data/fate/adtstoasc_ticket3715.mov
 #codec_id 0: aac
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,      371, 0x14b11a4f
 0,       1024,       1024,     1024,      402, 0x2f00c487
 0,       2048,       2048,     1024,      403, 0x1959c0d4

tests/ref/fate/armovie-escape124

@@ -8,6 +8,7 @@
 #codec_id 1: pcm_s16le
 #sample_rate 1: 44100
 #channel_layout 1: 3
+#channel_layout_name 1: stereo
 0,          0,          0,        1,   230400, 0xd133e177
 1,          0,          0,    44100,   176400, 0xdd61578c
 0,          1,          1,        1,   230400, 0xe3501bb2

tests/ref/fate/bethsoft-vid

@@ -8,6 +8,7 @@
 #codec_id 1: pcm_s16le
 #sample_rate 1: 11111
 #channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        1,   192000, 0x00000000
 1,          0,          0,      740,     1480, 0x00000000
 1,        740,        740,      740,     1480, 0x20a92bd4

tests/ref/fate/bfi

@@ -8,6 +8,7 @@
 #codec_id 1: pcm_s16le
 #sample_rate 1: 11025
 #channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        1,   134400, 0xc218b00c
 1,          0,          0,     8884,    17768, 0x07df135c
 0,          1,          1,        1,   134400, 0x114daf7c

tests/ref/fate/bmv-audio

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1856,     7424, 0x18540b36
 0,       1856,       1856,     1824,     7296, 0x5acd2484
 0,       3680,       3680,     1856,     7424, 0xa1bc5c5a

tests/ref/fate/cdxl-demux

@@ -8,6 +8,7 @@
 #codec_id 1: pcm_s8
 #sample_rate 1: 11025
 #channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,     1884,    22688, 0xc954a244
 1,          0,          0,     1884,     1884, 0x06925e3e
 0,       1884,       1884,     1884,    22688, 0x3ee4a304

tests/ref/fate/copy-psp

@@ -12,6 +12,7 @@
 #codec_id 1: aac
 #sample_rate 1: 48000
 #channel_layout 1: 3
+#channel_layout_name 1: stereo
 0,          0,          0,     3003,    37084, 0x021a0d3f
 1,          0,          0,     1024,       10, 0x0e270398
 1,       1024,       1024,     1025,       10, 0x0f4703b8

tests/ref/fate/copy-trac236

@@ -10,6 +10,7 @@ d6e3d97b522ce881ed29c5da74cc7e63 *tests/data/fate/copy-trac236.mov
 #codec_id 1: pcm_s16le
 #sample_rate 1: 48000
 #channel_layout 1: 3
+#channel_layout_name 1: stereo
 0,          0,          0,        1,   518400, 0x81ab2140
 1,          0,          0,     1024,     4096, 0x67dc99a3
 1,       1024,       1024,     1024,     4096, 0xf115a681

tests/ref/fate/copy-trac4914

@@ -10,6 +10,7 @@
 #codec_id 1: pcm_s16le
 #sample_rate 1: 48000
 #channel_layout 1: 3
+#channel_layout_name 1: stereo
 0,          0,          0,        1,   259200, 0xf36957da
 1,          0,          0,     1602,     6408, 0x1dd7b37c
 0,          1,          1,        1,   259200, 0x29a1f586

tests/ref/fate/copy-trac4914-avi

@@ -10,6 +10,7 @@
 #codec_id 1: pcm_s16le
 #sample_rate 1: 48000
 #channel_layout 1: 3
+#channel_layout_name 1: stereo
 1,          0,          0,     1152,     4608, 0xb24f5c9d
 1,       1152,       1152,     1152,     4608, 0xe2da5c32
 1,       2304,       2304,     1152,     4608, 0xd76023d9

tests/ref/fate/corepng

@@ -8,6 +8,7 @@
 #codec_id 1: pcm_s16le
 #sample_rate 1: 11025
 #channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        1,   230400, 0x03e25ead
 1,          0,          0,     5513,    11026, 0x27ad637c
 0,          1,          1,        1,   230400, 0x0a520ffd

tests/ref/fate/creatureshock-avs

@@ -8,6 +8,7 @@
 #codec_id 1: pcm_s16le
 #sample_rate 1: 22222
 #channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        1,   188892, 0x9f47a5ec
 1,          0,          0,     8186,    16372, 0xfaaab59d
 0,          1,          1,        1,   188892, 0xdece0269

tests/ref/fate/cyberia-c93

@@ -8,6 +8,7 @@
 #codec_id 1: pcm_s16le
 #sample_rate 1: 16129
 #channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        1,   184320, 0x8433f0f8
 1,          0,          0,    14184,    28368, 0xaacc96a5
 0,          1,          1,        1,   184320, 0xd0d480f7

tests/ref/fate/d-cinema-demux

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s24daud
 #sample_rate 0: 96000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 0,          0,          0,     1875,    36000, 0xd592781d
 0,       1875,       1875,     1875,    36000, 0xd592781d
 0,       3750,       3750,     1875,    36000, 0xd592781d

tests/ref/fate/dca-xll_51_16_192_768_0

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 192000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
 0,       2048,       2048,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08

tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 192000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
 0,       2048,       2048,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08

tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 192000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
 0,       2048,       2048,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08

tests/ref/fate/dca-xll_51_16_192_768_1

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 192000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
 0,       2048,       2048,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08

tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 192000
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     2048,     8192, 0829f71740aab1ab98b33eae21dee122
 0,       2048,       2048,     2048,     8192, c8ca1cff44674809d464ec39cf1bd1e9

tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 192000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
 0,       2048,       2048,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08

tests/ref/fate/dca-xll_51_24_48_768

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01
 0,        512,        512,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01

tests/ref/fate/dca-xll_51_24_48_768-dmix_2

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,     3072, d2a70550489de356a2cd6bfc40711204
 0,        512,        512,      512,     3072, d2a70550489de356a2cd6bfc40711204

tests/ref/fate/dca-xll_51_24_48_768-dmix_6

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01
 0,        512,        512,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01

tests/ref/fate/dca-xll_51_24_48_none

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
 0,       1024,       1024,     1024,    18432, 6707daa7724fdc552869e522a7936f26

tests/ref/fate/dca-xll_51_24_48_none-dmix_2

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
 0,       1024,       1024,     1024,    18432, 6707daa7724fdc552869e522a7936f26

tests/ref/fate/dca-xll_51_24_48_none-dmix_6

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
 0,       1024,       1024,     1024,    18432, 6707daa7724fdc552869e522a7936f26

tests/ref/fate/dca-xll_71_24_48_768_0

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
 #channel_layout 0: 63f
+#channel_layout_name 0: 7.1
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,    12288, ca9f8c8eb1b9b311cb79999fa376c7f0
 0,        512,        512,      512,    12288, 4072783b8efb99a9e5817067d68f61c6

tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,     9216, a2b724b146069938f0e2cb82490dea54
 0,        512,        512,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01

tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,     9216, a2b724b146069938f0e2cb82490dea54
 0,        512,        512,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01

tests/ref/fate/dca-xll_71_24_48_768_1

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
 #channel_layout 0: 63f
+#channel_layout_name 0: 7.1
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,    12288, ca9f8c8eb1b9b311cb79999fa376c7f0
 0,        512,        512,      512,    12288, 4072783b8efb99a9e5817067d68f61c6

tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,     3072, d2a70550489de356a2cd6bfc40711204
 0,        512,        512,      512,     3072, d2a70550489de356a2cd6bfc40711204

tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,     9216, a2b724b146069938f0e2cb82490dea54
 0,        512,        512,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01

tests/ref/fate/dca-xll_71_24_96_768

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 96000
 #channel_layout 0: 63f
+#channel_layout_name 0: 7.1
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     1024,    24576, 0b24a527d66f2b0cab97f37e4cd79987
 0,       1024,       1024,     1024,    24576, 91ff0dac5df86e798bfef5e573536b08

tests/ref/fate/dca-xll_71_24_96_768-dmix_2

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 96000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     1024,    18432, 0a675f172b0e1a171c46dfaa4f1d0f00
 0,       1024,       1024,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a

tests/ref/fate/dca-xll_71_24_96_768-dmix_6

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 96000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     1024,    18432, 0a675f172b0e1a171c46dfaa4f1d0f00
 0,       1024,       1024,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a

tests/ref/fate/dca-xll_x96_51_24_96_1509

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 96000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
 0,       1024,       1024,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a

tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 96000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
 0,       1024,       1024,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a

tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 96000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
 0,       1024,       1024,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a

tests/ref/fate/dca-xll_xch_61_24_48_768

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
 #channel_layout 0: 70f
+#channel_layout_name 0: 6.1
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,    10752, c3c5b236c266a9090378def1ad497a21
 0,        512,        512,      512,    10752, 36eb6749f8d9ce9f94860dcc447253ac

tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,     9216, 652c4e61f9abe9fba9de792242e2d31d
 0,        512,        512,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01

tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,     9216, 652c4e61f9abe9fba9de792242e2d31d
 0,        512,        512,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01

tests/ref/fate/dcinema-encode

@@ -6,6 +6,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 96000
 #channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      341,     4092, 697cddfcd0e21f24782af0705b7048f3
 0,        341,        341,      341,     4092, a057b18cd493923fed33c18578f61e0b

tests/ref/fate/delphine-cin-audio

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
 #channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,    88224,   176448, 0x541ddc55
 0,      88224,      88224,     1838,     3676, 0xaf455081
 0,      90062,      90062,     1838,     3676, 0x27ef4e91

tests/ref/fate/dpcm-idroq

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     7456,    29824, 0x77e265b7
 0,       7456,       7456,      736,     2944, 0x8dcdf50b
 0,       8192,       8192,      736,     2944, 0xb135cd2a

tests/ref/fate/dpcm-interplay

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1462,     5848, 0xea04292b
 0,       1462,       1462,     1472,     5888, 0x0e59e942
 0,       2934,       2934,     1472,     5888, 0x56d480f6

tests/ref/fate/dss-lp

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 8000
 #channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,      240,      480, 0xf1107658
 0,        240,        240,      240,      480, 0x50dee179
 0,        480,        480,      240,      480, 0x40090802

tests/ref/fate/dss-sp

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 11025
 #channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,      264,      528, 0xa2579e96
 0,        264,        264,      264,      528, 0xf9b23172
 0,        528,        528,      264,      528, 0x5571a0fe

tests/ref/fate/ffmpeg-filter_colorkey

@@ -8,6 +8,7 @@
 #codec_id 1: pcm_s16le
 #sample_rate 1: 48000
 #channel_layout 1: 3
+#channel_layout_name 1: stereo
 0,          0,          0,        1,   622080, 0x4e30accb
 1,          0,          0,     1152,     4608, 0x00000000
 1,       1152,       1152,     1152,     4608, 0xbca29063

tests/ref/fate/filter-acrossfade

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,      888,     3552, 0x592ce6cc
 0,        888,        888,     1024,     4096, 0x20f6f6a9
 0,       1912,       1912,     1024,     4096, 0x3f840122

tests/ref/fate/filter-adelay

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x9d7bf760
 0,       1024,       1024,     1024,     4096, 0xdf42c46b
 0,       2048,       2048,     1024,     4096, 0x2214fd20

tests/ref/fate/filter-aecho

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x3019edd5
 0,       1024,       1024,     1024,     4096, 0x2df2fe2f
 0,       2048,       2048,     1024,     4096, 0xde37ff37

tests/ref/fate/filter-aemphasis-50fm

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0xb9c5fefd
 0,       1024,       1024,     1024,     4096, 0xb2ae0a90
 0,       2048,       2048,     1024,     4096, 0x97e6e9f3

tests/ref/fate/filter-aemphasis-75kf

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x7b2101ec
 0,       1024,       1024,     1024,     4096, 0x5c16fc93
 0,       2048,       2048,     1024,     4096, 0x62bdee5d

tests/ref/fate/filter-afade-esin

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x06e0d68a
 0,       1024,       1024,     1024,     4096, 0xb325d915
 0,       2048,       2048,     1024,     4096, 0xc0a5f1f1

tests/ref/fate/filter-afade-exp

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x00000000
 0,       1024,       1024,     1024,     4096, 0x00000000
 0,       2048,       2048,     1024,     4096, 0x00000000

tests/ref/fate/filter-afade-hsin

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x2042232e
 0,       1024,       1024,     1024,     4096, 0x2c073cf7
 0,       2048,       2048,     1024,     4096, 0x92fecae5

tests/ref/fate/filter-afade-iqsin

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x220e908d
 0,       1024,       1024,     1024,     4096, 0xdd65002e
 0,       2048,       2048,     1024,     4096, 0x8072fb25

tests/ref/fate/filter-afade-log

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0xf01adbd3
 0,       1024,       1024,     1024,     4096, 0xbbe10f8e
 0,       2048,       2048,     1024,     4096, 0xbf04fccf

tests/ref/fate/filter-afade-qsin

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0xd977ce0f
 0,       1024,       1024,     1024,     4096, 0x9333f5b1
 0,       2048,       2048,     1024,     4096, 0xf1a30794

tests/ref/fate/filter-agate

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x1af20090
 0,       1024,       1024,     1024,     4096, 0x0b05ef2d
 0,       2048,       2048,     1024,     4096, 0x574bf11d

tests/ref/fate/filter-alimiter

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0xd4194af4
 0,       1024,       1024,     1024,     4096, 0x686af4ab
 0,       2048,       2048,     1024,     4096, 0xe80cee61

tests/ref/fate/filter-amerge

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     2048,     8192, 0x120efa65
 0,       2048,       2048,     2048,     8192, 0x7b3cebf7
 0,       4096,       4096,     2048,     8192, 0x0fb8ee01

tests/ref/fate/filter-anequalizer

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x8e1bf8e0
 0,       1024,       1024,     1024,     4096, 0xe315f564
 0,       2048,       2048,     1024,     4096, 0x3d0efa98

tests/ref/fate/filter-apad

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x29e3eecf
 0,       1024,       1024,     1024,     4096, 0x18390b96
 0,       2048,       2048,     1024,     4096, 0xc477fa99

tests/ref/fate/filter-asetnsamples

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,      512,     2048, 0xd2dbf701
 0,        512,        512,      512,     2048, 0xdb22f7bf
 0,       1024,       1024,      512,     2048, 0x82a103be

tests/ref/fate/filter-asetrate

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 20000
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x29e3eecf
 0,       1024,       1024,     1024,     4096, 0x18390b96
 0,       2048,       2048,     1024,     4096, 0xc477fa99

tests/ref/fate/filter-atrim-duration

@@ -3,4 +3,5 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,       4410,       4410,      441,     1764, 0x61e374f7

tests/ref/fate/filter-atrim-mixed

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,       1025,       1025,     1023,     4092, 0x78560a4c
 0,       2048,       2048,     1024,     4096, 0xc477fa99
 0,       3072,       3072,     1024,     4096, 0x3bc0f14f

tests/ref/fate/filter-atrim-samples

@@ -3,4 +3,5 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,         26,         26,       54,      216, 0x6b376c6c

tests/ref/fate/filter-atrim-time

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,       4410,       4410,      710,     2840, 0x658982a3
 0,       5120,       5120,     1024,     4096, 0xfd6a0070
 0,       6144,       6144,     1024,     4096, 0x0b01f4cf

tests/ref/fate/filter-chorus

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
 #channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,     2048,     4096, 0x1fc6f1f1
 0,       2048,       2048,     2048,     4096, 0xe5f7f442
 0,       4096,       4096,     2048,     4096, 0x4f14ecb9

tests/ref/fate/filter-compand

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0xfc10e61b
 0,       1024,       1024,     1024,     4096, 0x8801ef13
 0,       2048,       2048,     1024,     4096, 0xba55fc17

tests/ref/fate/filter-concat

@@ -8,6 +8,7 @@
 #codec_id 1: pcm_s16le
 #sample_rate 1: 44100
 #channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        1,   230400, 0x88c4d19a
 1,          0,          0,     1024,     2048, 0xb3f10192
 1,       1024,       1024,     1024,     2048, 0xb340fe4e

tests/ref/fate/filter-dcshift

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x96868842
 0,       1024,       1024,     1024,     4096, 0xeff98700
 0,       2048,       2048,     1024,     4096, 0x6ea28e1e

tests/ref/fate/filter-earwax

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x900af751
 0,       1024,       1024,     1024,     4096, 0xad570065
 0,       2048,       2048,     1024,     4096, 0x93d5f494

tests/ref/fate/filter-extrastereo

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x29e3eecf
 0,       1024,       1024,     1024,     4096, 0x18390b96
 0,       2048,       2048,     1024,     4096, 0xc477fa99

tests/ref/fate/filter-hls

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,     1152,     2304, 0x907cb7fa
 0,       1152,       1152,     1152,     2304, 0xb8dc7525
 0,       2304,       2304,     1152,     2304, 0x3e7d6905

tests/ref/fate/filter-hls-append

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,     1152,     2304, 0x593ea430
 0,       1152,       1152,     1152,     2304, 0xde328304
 0,       2304,       2304,     1152,     2304, 0x12f673c9

tests/ref/fate/filter-meta-4560-rotate0

@@ -8,6 +8,7 @@
 #codec_id 1: pcm_s16le
 #sample_rate 1: 44100
 #channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        1,   195840, 0x0602351d
 1,          0,          0,     1024,     2048, 0x00000000
 1,       1024,       1024,     1024,     2048, 0xe6b00ffc

tests/ref/fate/filter-overlay-dvdsub-2397

@@ -8,6 +8,7 @@
 #codec_id 1: dts
 #sample_rate 1: 48000
 #channel_layout 1: 60f
+#channel_layout_name 1: 5.1(side)
 0,          0,          0,        1,   518400, 0x6b05d48a
 1,         27,         27,       10,     2013, 0x68e7b03a
 0,          1,          1,        1,   518400, 0x2c2219cd

tests/ref/fate/filter-silenceremove

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 192000
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,        1,        4, 0x00200008
 0,          1,          1,        1,        4, 0x00180006
 0,          2,          2,        1,        4, 0x001c0007

tests/ref/fate/filter-stereotools

@@ -3,6 +3,7 @@
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
 #channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x48b6d241
 0,       1024,       1024,     1024,     4096, 0xe0c4ca9a
 0,       2048,       2048,     1024,     4096, 0x6dd8e26c