avformat/framecrc: enable new output

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

libavformat/framecrcenc.c

@@ -39,7 +39,7 @@ static int framecrc_write_header(struct AVFormatContext *s)
         }
     }
 
-    return ff_framehash_write_header(s, 1);
+    return ff_framehash_write_header(s, 2);
 }
 
 static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)

libavformat/uncodedframecrcenc.c

@@ -121,7 +121,7 @@ static void audio_frame_cksum(AVBPrint *bp, AVFrame *frame)
 
 static int write_header(struct AVFormatContext *s)
 {
-    return ff_framehash_write_header(s, 1);
+    return ff_framehash_write_header(s, 2);
 }
 
 static int write_frame(struct AVFormatContext *s, int stream_index,

tests/ref/fate/4xm-1

@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
 0,          0,          0,        1,   921600, 0xd82e4d57
 0,          1,          1,        1,   921600, 0x83f2349c
 0,          2,          2,        1,   921600, 0x70d87db0

tests/ref/fate/4xm-2

@@ -1,4 +1,8 @@
 #tb 0: 4/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 240x112
+#sar 0: 0/1
 0,          0,          0,        1,    80640, 0x00000000
 0,          1,          1,        1,    80640, 0x3a942680
 0,          2,          2,        1,    80640, 0x3a942680

tests/ref/fate/8bps

@@ -1,5 +1,13 @@
 #tb 0: 2/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 360x240
+#sar 0: 9/10
 #tb 1: 1/22050
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 22050
+#channel_layout 1: 4
 0,          0,          0,        1,   259200, 0x7e91df07
 1,          0,          0,     1024,     2048, 0x3d042426
 1,       1024,       1024,     1024,     2048, 0x5bcae456

tests/ref/fate/aasc

@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x175
+#sar 0: 0/1
 0,          0,          0,        1,   168000, 0x00000000
 0,          1,          1,        1,   168000, 0x00000000
 0,          2,          2,        1,   168000, 0x00000000

tests/ref/fate/adpcm-4xm

@@ -1,4 +1,8 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 3
 0,          0,          0,     1472,     5888, 0x9086e310
 0,       1476,       1476,     1472,     5888, 0xac8491f5
 0,       2952,       2952,     1472,     5888, 0xc9a08b6b

tests/ref/fate/adpcm-afc

@@ -1,4 +1,8 @@
 #tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
 0,          0,          0,    17920,    71680, 0x52373bc9
 0,      17920,      17920,    17920,    71680, 0x1f854b27
 0,      35840,      35840,    17920,    71680, 0x3d265a6d

tests/ref/fate/adpcm-dtk

@@ -1,4 +1,8 @@
 #tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 48000
+#channel_layout 0: 3
 0,          0,          0,      896,     3584, 0xdae789d5
 0,        896,        896,      896,     3584, 0x168ed9b6
 0,       1792,       1792,      896,     3584, 0x8920c8d5

tests/ref/fate/adpcm-ea-1

@@ -1,4 +1,8 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 3
 0,          0,          0,     1484,     5936, 0x00000000
 0,       1484,       1484,     1456,     5824, 0x00000000
 0,       2940,       2940,     1484,     5936, 0x00000000

tests/ref/fate/adpcm-ea-2

@@ -1,4 +1,8 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 3
 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

@@ -1,4 +1,8 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 3
 0,          0,          0,       28,      112, 0x291d1be4
 0,         28,         28,       28,      112, 0xf08d33cc
 0,         56,         56,       28,      112, 0x5b1521de

tests/ref/fate/adpcm-ea-r1

@@ -1,4 +1,8 @@
 #tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 48000
+#channel_layout 0: 3
 0,          0,          0,     1624,     6496, 0x00000000
 0,       1624,       1624,     1596,     6384, 0x00000000
 0,       3220,       3220,     1596,     6384, 0x00000000

tests/ref/fate/adpcm-ima-amv

@@ -1,4 +1,8 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 4
 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

@@ -1,4 +1,8 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 3
 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

@@ -1,4 +1,8 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 3
 0,          0,          0,      736,     2944, 0x00000000
 0,        736,        736,     1472,     5888, 0x5ae3c2a4
 0,       2208,       2208,     1472,     5888, 0x158fbcb4

tests/ref/fate/adpcm-ima-smjpeg

@@ -1,4 +1,8 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 4
 0,          0,          0,      512,     1024, 0x00000000
 0,        512,        512,      512,     1024, 0x00000000
 0,       1024,       1024,      512,     1024, 0xed2d3f6b

tests/ref/fate/adpcm-ima-ws

@@ -1,4 +1,8 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 4
 0,          0,          0,    11024,    22048, 0x0665d7f4
 0,      11024,      11024,     1470,     2940, 0x0f3c64cb
 0,      12494,      12494,     1470,     2940, 0xc90b9e78

tests/ref/fate/adpcm-ms-mono

@@ -1,4 +1,8 @@
 #tb 0: 1/11025
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 11025
+#channel_layout 0: 4
 0,          0,          0,      500,     1000, 0x64cd9403
 0,        500,        500,      500,     1000, 0xa4ef8a9d
 0,       1000,       1000,      500,     1000, 0x75c19868

tests/ref/fate/adpcm-thp

@@ -1,4 +1,8 @@
 #tb 0: 1/32000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 32000
+#channel_layout 0: 3
 0,          0,          0,     1078,     4312, 0x469714f6
 0,       1078,       1078,     1064,     4256, 0x6ca28f25
 0,       2142,       2142,     1078,     4312, 0xd466f806

tests/ref/fate/adpcm-vima

@@ -1,4 +1,8 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 3
 0,          0,          0,    73500,   294000, 0x37d439ee
 0,      73500,      73500,     1470,     5880, 0xe524b177
 0,      74970,      74970,     1470,     5880, 0x9e784af1

tests/ref/fate/adpcm-xa

@@ -1,4 +1,8 @@
 #tb 0: 1/37800
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 37800
+#channel_layout 0: 3
 0,          0,          0,     2016,     8064, 0xa307ed8c
 0,       2016,       2016,     2016,     8064, 0xd2551927
 0,       4032,       4032,     2016,     8064, 0x3264a799

tests/ref/fate/aic

@@ -1,4 +1,8 @@
 #tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1440x1080
+#sar 0: 4/3
 0,          0,          0,        1,  2332800, 0xd941b42f
 0,          1,          1,        1,  2332800, 0xd941b42f
 0,          2,          2,        1,  2332800, 0xae0f5983

tests/ref/fate/aic-oddsize

@@ -1,4 +1,8 @@
 #tb 0: 1000/14587
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 481x241
+#sar 0: 0/1
 0,          0,          0,        1,   174243, 0xa40491e1
 0,          1,          1,        1,   174243, 0xa12cbb56
 0,          2,          2,        1,   174243, 0xa12cbb56

tests/ref/fate/alg-mm

@@ -1,4 +1,8 @@
 #tb 0: 1/10
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x160
+#sar 0: 0/1
 0,          0,          0,        1,   122880, 0x4ed8123f
 0,          1,          1,        1,   122880, 0xc4c35304
 0,          2,          2,        1,   122880, 0xbd3015fd

tests/ref/fate/aliaspix-bgr

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 201x79
+#sar 0: 0/1
 0,          0,          0,        1,    47637, 0xcb77368f

tests/ref/fate/aliaspix-gray

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 199x81
+#sar 0: 0/1
 0,          0,          0,        1,    16119, 0x3d0785f5

tests/ref/fate/amv

@@ -1,4 +1,8 @@
 #tb 0: 1/16
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 0/1
 0,          0,          0,        1,    28800, 0x026058a9
 0,          1,          1,        1,    28800, 0x5dc728de
 0,          2,          2,        1,    28800, 0x83e19a2c

tests/ref/fate/ansi

@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x400
+#sar 0: 0/1
 0,          0,          0,        1,   768000, 0x772dd3d0
 0,          1,          1,        1,   768000, 0xd7dab1d1
 0,          2,          2,        1,   768000, 0x0e56f2d3

tests/ref/fate/ansi256

@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x400
+#sar 0: 0/1
 0,          0,          0,        1,   768000, 0x4dfbb6d0
 0,          1,          1,        1,   768000, 0x22652a22
 0,          2,          2,        1,   768000, 0x6c613e8c

tests/ref/fate/armovie-escape124

@@ -1,5 +1,13 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 #tb 1: 1/44100
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 44100
+#channel_layout 1: 3
 0,          0,          0,        1,   230400, 0xd133e177
 1,          0,          0,    44100,   176400, 0xdd61578c
 0,          1,          1,        1,   230400, 0xe3501bb2

tests/ref/fate/armovie-escape130

@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x160
+#sar 0: 0/1
 0,          0,          0,        1,    76800, 0x860502ee
 0,          1,          1,        1,    76800, 0x055da755
 0,          2,          2,        1,    76800, 0x67969220

tests/ref/fate/asf-repldata

@@ -1,4 +1,8 @@
 #tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: msmpeg4v3
+#dimensions 0: 640x480
+#sar 0: 0/1
 0,          0,          0,        0,    23374, 0x8725b3b8
 0,        122,        122,        0,    13732, 0x3ac8531a, F=0x0
 0,        245,        245,        0,      615, 0xd31641b4, F=0x0

tests/ref/fate/auravision-v1

@@ -1,4 +1,8 @@
 #tb 0: 33339/500000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 0/1
 0,          0,          0,        1,    28800, 0x4a4efbbc
 0,          1,          1,        1,    28800, 0xc6c7e26a
 0,          2,          2,        1,    28800, 0x6cd40913

tests/ref/fate/auravision-v2

@@ -1,3 +1,7 @@
 #tb 0: 33333/1000000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x180
+#sar 0: 0/1
 0,          0,          0,        1,   115200, 0x2f247f66
 0,          1,          1,        1,   115200, 0xf492929e

tests/ref/fate/avio-direct

@@ -1,4 +1,8 @@
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 288x168
+#sar 0: 0/1
 0,          0,          0,        1,   145152, 0x8458d4cb
 0,          1,          1,        1,   145152, 0xa694d7c7
 0,          2,          2,        1,   145152, 0x2bd4bfc9

tests/ref/fate/bethsoft-vid

@@ -1,5 +1,13 @@
 #tb 0: 1/14
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
 #tb 1: 1/11111
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 11111
+#channel_layout 1: 4
 0,          0,          0,        1,   192000, 0x00000000
 1,          0,          0,      740,     1480, 0x00000000
 1,        740,        740,      740,     1480, 0x20a92bd4

tests/ref/fate/bfi

@@ -1,5 +1,13 @@
 #tb 0: 1/9
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x140
+#sar 0: 0/1
 #tb 1: 1/11025
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 11025
+#channel_layout 1: 4
 0,          0,          0,        1,   134400, 0xc218b00c
 1,          0,          0,     8884,    17768, 0x07df135c
 0,          1,          1,        1,   134400, 0x114daf7c

tests/ref/fate/bink-video-b

@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 200x116
+#sar 0: 0/1
 0,          0,          0,        1,    34800, 0x4fd0a8e4
 0,          1,          1,        1,    34800, 0xd381a7b7
 0,          2,          2,        1,    34800, 0x688ca315

tests/ref/fate/bink-video-f

@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
 0,          0,          0,        1,   460800, 0xb06f7841
 0,          1,          1,        1,   460800, 0x7ed06412
 0,          2,          2,        1,   460800, 0xe82b5c3d

tests/ref/fate/bink-video-i

@@ -1,4 +1,8 @@
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
 0,          0,          0,        1,   460800, 0xaef133d9
 0,          1,          1,        1,   460800, 0x2da1248b
 0,          2,          2,        1,   460800, 0x3d7945b4

tests/ref/fate/bmp-15bit

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    16256, 0xdbcf881d

tests/ref/fate/bmp-15bit-mask

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    16256, 0xdbcf881d

tests/ref/fate/bmp-16bit-mask

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    16256, 0x44675948

tests/ref/fate/bmp-1bit

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    24384, 0x4c968301

tests/ref/fate/bmp-24bit

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    24384, 0x325dd8d9

tests/ref/fate/bmp-32bit

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    24384, 0x325dd8d9

tests/ref/fate/bmp-32bit-mask

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    24384, 0x325dd8d9

tests/ref/fate/bmp-4bit

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    24384, 0x322d81f4

tests/ref/fate/bmp-4bit-os2

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 300x22
+#sar 0: 0/1
 0,          0,          0,        1,    19800, 0x563b599a

tests/ref/fate/bmp-8bit

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    24384, 0xa7aa6b9b

tests/ref/fate/bmp-8bit-os2

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    24384, 0xa7aa6b9b

tests/ref/fate/bmp-rle4

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    24384, 0x322d81f4

tests/ref/fate/bmp-rle8

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    24384, 0xa7aa6b9b

tests/ref/fate/bmpparser

@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 40x30
+#sar 0: 0/1
 0,          0,          0,        1,     3600, 0xd3a7c583
 0,          1,          1,        1,     3600, 0x4602bbf9
 0,          2,          2,        1,     3600, 0x3a96b8f8

tests/ref/fate/bmv-audio

@@ -1,4 +1,8 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 3
 0,          0,          0,     1856,     7424, 0x18540b36
 0,       1856,       1856,     1824,     7296, 0x5acd2484
 0,       3680,       3680,     1856,     7424, 0xa1bc5c5a

tests/ref/fate/bmv-video

@@ -1,4 +1,8 @@
 #tb 0: 1/12
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x429
+#sar 0: 0/1
 0,          0,          0,        1,   823680, 0xddb8a306
 0,          1,          1,        1,   823680, 0xa95375c8
 0,          2,          2,        1,   823680, 0xa95375c8

tests/ref/fate/brenderpix-24

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
 0,          0,          0,        1,    32768, 0x18bc6caa

tests/ref/fate/brenderpix-565

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
 0,          0,          0,        1,    32768, 0xfd855dda

tests/ref/fate/brenderpix-defpal

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x256
+#sar 0: 0/1
 0,          0,          0,        1,   196608, 0xada11d14

tests/ref/fate/brenderpix-intpal

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x256
+#sar 0: 0/1
 0,          0,          0,        1,   196608, 0x9662f917

tests/ref/fate/brenderpix-y400a

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 16x96
+#sar 0: 0/1
 0,          0,          0,        1,     3072, 0x48280456

tests/ref/fate/canopus-cllc-argb

@@ -1,4 +1,8 @@
 #tb 0: 1001/24000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 1/1
 0,          0,          0,        1,  3686400, 0xb37a6e69
 0,          1,          1,        1,  3686400, 0x66a45032
 0,          2,          2,        1,  3686400, 0xdf0c861f

tests/ref/fate/canopus-cllc-rgb

@@ -1,4 +1,8 @@
 #tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 1/1
 0,          0,          0,        1,   921600, 0x82e44cb9
 0,          1,          1,        1,   921600, 0x6ecc8a6c
 0,          2,          2,        1,   921600, 0x0dc31839

tests/ref/fate/canopus-cllc-yuy2-noblock

@@ -1,4 +1,8 @@
 #tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 1/1
 0,          0,          0,        1,   614400, 0x088c51de
 0,          1,          1,        1,   614400, 0x93fff662
 0,          2,          2,        1,   614400, 0x90ba6c28

tests/ref/fate/canopus-hq_hqa-hq

@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 64/45
 0,          0,          0,        1,   829440, 0x8b6b2f6d
 0,          1,          1,        1,   829440, 0x70382bf0
 0,          2,          2,        1,   829440, 0xbfdf1f8d

tests/ref/fate/canopus-hq_hqa-hqa

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 1/1
 0,          0,          0,        1,  6220800, 0x2b2b17cc

tests/ref/fate/canopus-hq_hqa-inter

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 1/1
 0,          0,          0,        1,  4147200, 0x418ecfe5

tests/ref/fate/canopus-hqx422

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 64/45
 0,          0,          0,        1,  1658880, 0x823fcbac

tests/ref/fate/canopus-hqx422a

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 1/1
 0,          0,          0,        1,  8294400, 0x9a22bebf

tests/ref/fate/cavs

@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 0/1
 0,          0,          0,        1,   622080, 0x2276bc78
 0,          1,          1,        1,   622080, 0xda1f698a
 0,          2,          2,        1,   622080, 0xb9907023

tests/ref/fate/cdgraphics

@@ -1,4 +1,8 @@
 #tb 0: 1/300
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 300x216
+#sar 0: 0/1
 0,          0,          0,        1,   259200, 0x29aeb27e
 0,          1,          1,        1,   259200, 0x29aeb27e
 0,          2,          2,        1,   259200, 0x6779f55d

tests/ref/fate/cdxl-bitline-ham6

@@ -1,4 +1,8 @@
 #tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 162x130
+#sar 0: 0/1
 0,          0,          0,        1,    63180, 0xcda82c16
 0,          1,          1,        1,    63180, 0xa6097bf9
 0,          2,          2,        1,    63180, 0x4c2fb091

tests/ref/fate/cdxl-demux

@@ -1,5 +1,13 @@
 #tb 0: 1/11025
+#media_type 0: video
+#codec_id 0: cdxl
+#dimensions 0: 176x128
+#sar 0: 0/1
 #tb 1: 1/11025
+#media_type 1: audio
+#codec_id 1: pcm_s8
+#sample_rate 1: 11025
+#channel_layout 1: 4
 0,          0,          0,     1884,    22688, 0xc954a244
 1,          0,          0,     1884,     1884, 0x06925e3e
 0,       1884,       1884,     1884,    22688, 0x3ee4a304

tests/ref/fate/cdxl-ham6

@@ -1,4 +1,8 @@
 #tb 0: 52/525
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 0/1
 0,          0,          0,        1,    57600, 0x87887a7b
 0,          1,          1,        1,    57600, 0x10c301d2
 0,          2,          2,        1,    57600, 0xd1a6f910

tests/ref/fate/cdxl-ham8

@@ -1,2 +1,6 @@
 #tb 0: 12/281
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x128
+#sar 0: 0/1
 0,          0,          0,        1,    67584, 0xce0cade5

tests/ref/fate/cdxl-pal8

@@ -1,4 +1,8 @@
 #tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x128
+#sar 0: 0/1
 0,          0,          0,        1,    67584, 0x5eae629b
 0,          1,          1,        1,    67584, 0x32591227
 0,          2,          2,        1,    67584, 0x4e4424c7

tests/ref/fate/cdxl-pal8-small

@@ -1,4 +1,8 @@
 #tb 0: 368/11025
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x80
+#sar 0: 0/1
 0,          0,          0,        1,    30720, 0x0d552cfd
 0,          1,          1,        1,    30720, 0x3cf93291
 0,          2,          2,        1,    30720, 0xe45b2868

tests/ref/fate/cljr

@@ -1,4 +1,8 @@
 #tb 0: 3521/100000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 240x180
+#sar 0: 0/1
 0,          0,          0,        1,    64800, 0x63132a60
 0,          1,          1,        1,    64800, 0xb3c729a3
 0,          2,          2,        1,    64800, 0xa27b1e0e

tests/ref/fate/corepng

@@ -1,5 +1,13 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 #tb 1: 1/11025
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 11025
+#channel_layout 1: 4
 0,          0,          0,        1,   230400, 0x03e25ead
 1,          0,          0,     5513,    11026, 0x27ad637c
 0,          1,          1,        1,   230400, 0x0a520ffd

tests/ref/fate/creatureshock-avs

@@ -1,5 +1,13 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 318x198
+#sar 0: 0/1
 #tb 1: 1/22222
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 22222
+#channel_layout 1: 4
 0,          0,          0,        1,   188892, 0x9f47a5ec
 1,          0,          0,     8186,    16372, 0xfaaab59d
 0,          1,          1,        1,   188892, 0xdece0269

tests/ref/fate/cscd

@@ -1,4 +1,8 @@
 #tb 0: 1/200
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 300x300
+#sar 0: 0/1
 0,          0,          0,        1,   270000, 0xf90015d8
 0,          9,          9,        1,   270000, 0xf90015d8
 0,         15,         15,        1,   270000, 0xf90015d8

tests/ref/fate/cvid-grayscale

@@ -1,4 +1,8 @@
 #tb 0: 99561/500000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 100x75
+#sar 0: 0/1
 0,          0,          0,        1,    22500, 0x0f8e562e
 0,          1,          1,        1,    22500, 0x507aef06
 0,          2,          2,        1,    22500, 0x059d6137

tests/ref/fate/cvid-palette

@@ -1,4 +1,8 @@
 #tb 0: 200/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 0/1
 0,          0,          0,        1,    57600, 0x1f5c89b7
 0,          1,          1,        1,    57600, 0xd2055aaf
 0,          2,          2,        1,    57600, 0x22336052

tests/ref/fate/cvid-partial

@@ -1,4 +1,8 @@
 #tb 0: 1/12
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 400x187
+#sar 0: 0/1
 0,          0,          0,        1,   224400, 0xd8f2f310
 0,          1,          1,        1,   224400, 0xe38676c2
 0,          2,          2,        1,   224400, 0x7163b6ad

tests/ref/fate/cyberia-c93

@@ -1,5 +1,13 @@
 #tb 0: 2/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x192
+#sar 0: 5/6
 #tb 1: 1/16129
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 16129
+#channel_layout 1: 4
 0,          0,          0,        1,   184320, 0x8433f0f8
 1,          0,          0,    14184,    28368, 0xaacc96a5
 0,          1,          1,        1,   184320, 0xd0d480f7

tests/ref/fate/cyuv

@@ -1,4 +1,8 @@
 #tb 0: 33333/1000000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x501e6abe
 0,          1,          1,        1,    38016, 0x84976f13
 0,          2,          2,        1,    38016, 0x8c487acb

tests/ref/fate/d-cinema-demux

@@ -1,4 +1,8 @@
 #tb 0: 1/90000
+#media_type 0: audio
+#codec_id 0: pcm_s24daud
+#sample_rate 0: 96000
+#channel_layout 0: 60f
 0,          0,          0,     1875,    36000, 0xd592781d
 0,       1875,       1875,     1875,    36000, 0xd592781d
 0,       3750,       3750,     1875,    36000, 0xd592781d

tests/ref/fate/d-eavp6-demux

@@ -1,5 +1,13 @@
 #tb 0: 32767/982027
+#media_type 0: video
+#codec_id 0: vp6
+#dimensions 0: 64x64
+#sar 0: 0/1
 #tb 1: 32767/982027
+#media_type 1: video
+#codec_id 1: vp6
+#dimensions 1: 64x64
+#sar 1: 0/1
 0,          0,          0,        1,     1860, 0xbd548c4c
 1,          0,          0,        1,     1748, 0x96046284
 0,          1,          1,        1,     1044, 0x814efc86, F=0x0

tests/ref/fate/dds-argb

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 220x64
+#sar 0: 0/1
 0,          0,          0,        1,    56320, 0xfcaa920b

tests/ref/fate/dds-argb-aexp

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xfdd37c43

tests/ref/fate/dds-dx10-bc1

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xed2f850f

tests/ref/fate/dds-dx10-bc1a

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x473b484b

tests/ref/fate/dds-dx10-bc2

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x2bce3baa

tests/ref/fate/dds-dx10-bc3

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xb91d3c62

tests/ref/fate/dds-dx10-bc4

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xfdfd1751

tests/ref/fate/dds-dx10-bc5

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x79bd207e

tests/ref/fate/dds-dxt1

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x64
+#sar 0: 0/1
 0,          0,          0,        1,    32768, 0xf52adc80

tests/ref/fate/dds-dxt1-normalmap

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x2b411855

tests/ref/fate/dds-dxt1a

@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xcabb50ea