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

 #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

 #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

 #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

 #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

 #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

 #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

 #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

 #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

 #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

 #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

 #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

 #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

 #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

 #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

 #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

 #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

 #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

 #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