From 2c4e08d89327595f7f4be57dda4b3775e1198d5e Mon Sep 17 00:00:00 2001 From: John Brooks Date: Thu, 13 Oct 2011 08:34:20 +0000 Subject: riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header The cbSize field should be included in all cases, even with PCM where its value is ignored. Fixes encoding PCM audio in Matroska for some players which insist on a full WAVEFORMATEX structure for A_MS/ACM audio. Since fate uses wav files for the audio test a larger number of tests has changed checksums or shifted positions due to the 2 byte longer wave header. Signed-off-by: Janne Grunau --- tests/ref/acodec/adpcm_ima_qt | 2 +- tests/ref/acodec/adpcm_ima_wav | 2 +- tests/ref/acodec/adpcm_ms | 2 +- tests/ref/acodec/adpcm_swf | 2 +- tests/ref/acodec/adpcm_yam | 6 ++--- tests/ref/acodec/alac | 2 +- tests/ref/acodec/aref | 4 ++-- tests/ref/acodec/flac | 2 +- tests/ref/acodec/g726 | 6 ++--- tests/ref/acodec/mp2 | 2 +- tests/ref/acodec/pcm | 54 +++++++++++++++++++++--------------------- 11 files changed, 42 insertions(+), 42 deletions(-) (limited to 'tests/ref/acodec') diff --git a/tests/ref/acodec/adpcm_ima_qt b/tests/ref/acodec/adpcm_ima_qt index cdd60e06b9..c1db43f1aa 100644 --- a/tests/ref/acodec/adpcm_ima_qt +++ b/tests/ref/acodec/adpcm_ima_qt @@ -1,4 +1,4 @@ 057d27978b35888776512e4e9669a63b *./tests/data/acodec/adpcm_qt.aiff 281252 ./tests/data/acodec/adpcm_qt.aiff -3890343c0c20934e014d7ac93f5d65bd *./tests/data/adpcm_ima_qt.acodec.out.wav +169c40435c68d50112c9c61fc67e446d *./tests/data/adpcm_ima_qt.acodec.out.wav stddev: 918.61 PSNR: 37.07 MAXDIFF:34029 bytes: 1058560/ 1058400 diff --git a/tests/ref/acodec/adpcm_ima_wav b/tests/ref/acodec/adpcm_ima_wav index 29f5836fd9..f83dbadad9 100644 --- a/tests/ref/acodec/adpcm_ima_wav +++ b/tests/ref/acodec/adpcm_ima_wav @@ -1,4 +1,4 @@ 56b75c3a6dacedcf2ce7b0586aa33594 *./tests/data/acodec/adpcm_ima.wav 267324 ./tests/data/acodec/adpcm_ima.wav -78a2af1c895792d0c221d127bdd48ece *./tests/data/adpcm_ima_wav.acodec.out.wav +ddddfa47302da540abf19224202bef57 *./tests/data/adpcm_ima_wav.acodec.out.wav stddev: 903.51 PSNR: 37.21 MAXDIFF:34026 bytes: 1061748/ 1058400 diff --git a/tests/ref/acodec/adpcm_ms b/tests/ref/acodec/adpcm_ms index 65d2a6ca65..301bc80042 100644 --- a/tests/ref/acodec/adpcm_ms +++ b/tests/ref/acodec/adpcm_ms @@ -1,4 +1,4 @@ a407b87daeef5b25dfb6c5b3f519e9c1 *./tests/data/acodec/adpcm_ms.wav 268378 ./tests/data/acodec/adpcm_ms.wav -7be370f937c51e8a967e6a3d08d5156a *./tests/data/adpcm_ms.acodec.out.wav +22863fb278c4e0ebe9c34cb15db5dd6b *./tests/data/adpcm_ms.acodec.out.wav stddev: 1050.01 PSNR: 35.91 MAXDIFF:29806 bytes: 1060576/ 1058400 diff --git a/tests/ref/acodec/adpcm_swf b/tests/ref/acodec/adpcm_swf index 27a5da518c..5306dc464a 100644 --- a/tests/ref/acodec/adpcm_swf +++ b/tests/ref/acodec/adpcm_swf @@ -1,4 +1,4 @@ 42d4639866ed4d692eaf126228a4fa2a *./tests/data/acodec/adpcm_swf.flv 269166 ./tests/data/acodec/adpcm_swf.flv -628089745a7059ae4055c2515b6d668b *./tests/data/adpcm_swf.acodec.out.wav +f7df69d3fe708303820f2a9d00140a5b *./tests/data/adpcm_swf.acodec.out.wav stddev: 933.58 PSNR: 36.93 MAXDIFF:51119 bytes: 1064960/ 1058400 diff --git a/tests/ref/acodec/adpcm_yam b/tests/ref/acodec/adpcm_yam index d7076e721c..0fd702954e 100644 --- a/tests/ref/acodec/adpcm_yam +++ b/tests/ref/acodec/adpcm_yam @@ -1,4 +1,4 @@ -2546d72df736b5ffa1557e8c9c9ef788 *./tests/data/acodec/adpcm_yam.wav -266296 ./tests/data/acodec/adpcm_yam.wav -c80c847a53a0fee17a88fa889ec34a4e *./tests/data/adpcm_yam.acodec.out.wav +006f8dc92eb4f7bab82eded314ca1124 *./tests/data/acodec/adpcm_yam.wav +266298 ./tests/data/acodec/adpcm_yam.wav +c36a9d5a1e0ad57fbe9665a31373b7c1 *./tests/data/adpcm_yam.acodec.out.wav stddev: 1247.60 PSNR: 34.41 MAXDIFF:39895 bytes: 1064960/ 1058400 diff --git a/tests/ref/acodec/alac b/tests/ref/acodec/alac index 35a1d8e1bf..f03ce893d8 100644 --- a/tests/ref/acodec/alac +++ b/tests/ref/acodec/alac @@ -1,4 +1,4 @@ b25bcc7ec3f5c19cdfc01a6bbd32edb8 *./tests/data/acodec/alac.m4a 389386 ./tests/data/acodec/alac.m4a -95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/alac.acodec.out.wav +64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/alac.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 diff --git a/tests/ref/acodec/aref b/tests/ref/acodec/aref index 8e6773be3b..cd89a632e6 100644 --- a/tests/ref/acodec/aref +++ b/tests/ref/acodec/aref @@ -1,2 +1,2 @@ -95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/acodec.ref.wav -1058444 ./tests/data/acodec.ref.wav +64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/acodec.ref.wav +1058446 ./tests/data/acodec.ref.wav diff --git a/tests/ref/acodec/flac b/tests/ref/acodec/flac index e9d7cfc0a8..992a4e387b 100644 --- a/tests/ref/acodec/flac +++ b/tests/ref/acodec/flac @@ -1,4 +1,4 @@ 151eef9097f944726968bec48649f00a *./tests/data/acodec/flac.flac 361582 ./tests/data/acodec/flac.flac -95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/flac.acodec.out.wav +64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/flac.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 diff --git a/tests/ref/acodec/g726 b/tests/ref/acodec/g726 index d2dbe5048c..9abed4b3bc 100644 --- a/tests/ref/acodec/g726 +++ b/tests/ref/acodec/g726 @@ -1,4 +1,4 @@ -fd090ddf05cc3401cc75c4a5ace1d05a *./tests/data/acodec/g726.wav -24052 ./tests/data/acodec/g726.wav -74abea06027375111eeac1b2f8c7d3af *./tests/data/g726.acodec.out.wav +64bfac75bd371304b704be5b3dbcd04a *./tests/data/acodec/g726.wav +24054 ./tests/data/acodec/g726.wav +79523adfec05760931fda877e1eaf7b4 *./tests/data/g726.acodec.out.wav stddev: 8554.55 PSNR: 17.69 MAXDIFF:29353 bytes: 95984/ 1058400 diff --git a/tests/ref/acodec/mp2 b/tests/ref/acodec/mp2 index df21be2bd7..3be6c58fb1 100644 --- a/tests/ref/acodec/mp2 +++ b/tests/ref/acodec/mp2 @@ -1,5 +1,5 @@ f6eb0a205350bbd7fb1028a01c7ae8aa *./tests/data/acodec/mp2.mp2 96130 ./tests/data/acodec/mp2.mp2 -74c7b6b15a001add199619fafe4059a1 *./tests/data/mp2.acodec.out.wav +5a669ca7321adc6ab66a3eade4035909 *./tests/data/mp2.acodec.out.wav stddev: 9315.99 PSNR: 16.94 MAXDIFF:65388 bytes: 1059840/ 1058400 stddev: 4384.33 PSNR: 23.49 MAXDIFF:52631 bytes: 1057916/ 1058400 diff --git a/tests/ref/acodec/pcm b/tests/ref/acodec/pcm index fc9dd8f29d..da64e62a6f 100644 --- a/tests/ref/acodec/pcm +++ b/tests/ref/acodec/pcm @@ -1,70 +1,70 @@ -89f5b8dd97e0dddbe59af0d44fd229f3 *./tests/data/acodec/pcm_alaw.wav -529256 ./tests/data/acodec/pcm_alaw.wav -0568b0b9a72e31559e150e7e09d301cd *./tests/data/pcm.acodec.out.wav +ede2da07839a00c255a43129922f2c7b *./tests/data/acodec/pcm_alaw.wav +529258 ./tests/data/acodec/pcm_alaw.wav +f323f7551ffad91de8613f44dcb198b6 *./tests/data/pcm.acodec.out.wav stddev: 101.67 PSNR: 56.19 MAXDIFF: 515 bytes: 1058400/ 1058400 -f443a8eeb1647ec1eeb8370c939e52d4 *./tests/data/acodec/pcm_mulaw.wav -529256 ./tests/data/acodec/pcm_mulaw.wav -1c3eeaa8814ebd4916780dff80ed6dc5 *./tests/data/pcm.acodec.out.wav +0c2a55850fb46ad5385a69b15b271f10 *./tests/data/acodec/pcm_mulaw.wav +529258 ./tests/data/acodec/pcm_mulaw.wav +7ae8c3fc804bd574006fd547fe28980c *./tests/data/pcm.acodec.out.wav stddev: 103.38 PSNR: 56.04 MAXDIFF: 644 bytes: 1058400/ 1058400 760f85fb9f4e8aba326fb44ae84c9507 *./tests/data/acodec/pcm_s8.mov 530837 ./tests/data/acodec/pcm_s8.mov -652edf30f35ad89bf27bcc9d2f9c7b53 *./tests/data/pcm.acodec.out.wav +651d4eb8d98dfcdda96ae6c43d8f156b *./tests/data/pcm.acodec.out.wav stddev: 147.89 PSNR: 52.93 MAXDIFF: 255 bytes: 1058400/ 1058400 -98cadb3502dbdc99e6e077c28b1a036c *./tests/data/acodec/pcm_u8.wav -529244 ./tests/data/acodec/pcm_u8.wav -652edf30f35ad89bf27bcc9d2f9c7b53 *./tests/data/pcm.acodec.out.wav +70fecbae732f81143a560c7315eda49a *./tests/data/acodec/pcm_u8.wav +529246 ./tests/data/acodec/pcm_u8.wav +651d4eb8d98dfcdda96ae6c43d8f156b *./tests/data/pcm.acodec.out.wav stddev: 147.89 PSNR: 52.93 MAXDIFF: 255 bytes: 1058400/ 1058400 a4e18d1ca9ef5b8132a84d43625ddc47 *./tests/data/acodec/pcm_s16be.mov 1060037 ./tests/data/acodec/pcm_s16be.mov -95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav +64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 -95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/acodec/pcm_s16le.wav -1058444 ./tests/data/acodec/pcm_s16le.wav -95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav +64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/acodec/pcm_s16le.wav +1058446 ./tests/data/acodec/pcm_s16le.wav +64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 af717ca95eaca310772eb1238c745d1b *./tests/data/acodec/pcm_s16be.mkv 1060638 ./tests/data/acodec/pcm_s16be.mkv -95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav +64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 c4f51bf32fad2f7af8ea5beedb56168b *./tests/data/acodec/pcm_s16le.mkv 1060638 ./tests/data/acodec/pcm_s16le.mkv -95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav +64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 971d2d2633e41a0326fe2d04a2d0350f *./tests/data/acodec/pcm_s24be.mov 1589237 ./tests/data/acodec/pcm_s24be.mov -95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav +64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 a85380fb79b0d4fff38e24ac1e34bb94 *./tests/data/acodec/pcm_s24le.wav 1587668 ./tests/data/acodec/pcm_s24le.wav -95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav +64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 fc4f4e3e195bbde037ed31021d229f12 *./tests/data/acodec/pcm_s32be.mov 2118437 ./tests/data/acodec/pcm_s32be.mov -95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav +64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 da6ed80f4f40f0082577dea80827e014 *./tests/data/acodec/pcm_s32le.wav 2116868 ./tests/data/acodec/pcm_s32le.wav -95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav +64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 118ff3dc83c62ce9ce669eef57e55bb2 *./tests/data/acodec/pcm_f32be.au 2116824 ./tests/data/acodec/pcm_f32be.au -95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav +64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 46f44f86a18984a832206ab9e29a79f2 *./tests/data/acodec/pcm_f32le.wav 2116880 ./tests/data/acodec/pcm_f32le.wav -95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav +64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 8112296b1ed94f72f20d04b1a54850a7 *./tests/data/acodec/pcm_f64be.au 4233624 ./tests/data/acodec/pcm_f64be.au -95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav +64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 ba17c6d1a270e1333e981f239bf7eb45 *./tests/data/acodec/pcm_f64le.wav 4233680 ./tests/data/acodec/pcm_f64le.wav -95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav +64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 -8c74234928ed425b1171211a89f67ead *./tests/data/acodec/pcm_zork.wav -529256 ./tests/data/acodec/pcm_zork.wav -864c8c866ac25642c29a13b122c70709 *./tests/data/pcm.acodec.out.wav +ebd38ed390ebdefe0bdf00d21bf12c6b *./tests/data/acodec/pcm_zork.wav +529258 ./tests/data/acodec/pcm_zork.wav +7b02646acdd063650bb3ebc444543ace *./tests/data/pcm.acodec.out.wav stddev: 633.11 PSNR: 40.30 MAXDIFF:32768 bytes: 1058400/ 1058400 8168a5c1343553ef027541830f2cb879 *./tests/data/acodec/pcm_s24daud.302 10368730 ./tests/data/acodec/pcm_s24daud.302 -- cgit v1.2.3