diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-20 22:18:26 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-20 22:18:26 +0200 |
commit | 3194ab78a6c4ea0a4c60c91c4d0ea34028ca408f (patch) | |
tree | 13f41910a7e4feec8d64182bf3b6772d88236098 /tests/ref | |
parent | 9b1f776d751472e8a376b412d02a96a35044e2a0 (diff) | |
parent | b0e9edc44f1722787adacbff9aa60343206a58c0 (diff) | |
download | ffmpeg-3194ab78a6c4ea0a4c60c91c4d0ea34028ca408f.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec: add a cook parser to get subpacket duration
FATE: allow lavf tests to alter input parameters
FATE: replace the acodec-pcm_s24daud test with an enc_dec_pcm checksum test
FATE: replace the acodec-g726 test with 4 new encode/decode tests
FATE: replace current g722 encoding tests with an encode/decode test
FATE: add a pattern rule for generating asynth wav files
FATE: optionally write a WAVE header in audiogen
avutil: add audio fifo buffer
Conflicts:
doc/APIchanges
libavcodec/version.h
libavutil/avutil.h
tests/Makefile
tests/codec-regression.sh
tests/fate/voice.mak
tests/lavf-regression.sh
tests/ref/acodec/g722
tests/ref/acodec/g726
tests/ref/acodec/pcm_s24daud
tests/ref/lavf/dv_fmt
tests/ref/lavf/gxf
tests/ref/lavf/mxf
tests/ref/lavf/mxf_d10
tests/ref/seek/lavf_dv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref')
-rw-r--r-- | tests/ref/acodec/g722 | 4 | ||||
-rw-r--r-- | tests/ref/acodec/g726 | 4 | ||||
-rw-r--r-- | tests/ref/acodec/pcm_s24daud | 4 | ||||
-rw-r--r-- | tests/ref/fate/dcinema-encode | 1 | ||||
-rw-r--r-- | tests/ref/fate/g722-encode | 1 | ||||
-rw-r--r-- | tests/ref/fate/g722enc | 1 | ||||
-rw-r--r-- | tests/ref/fate/g726-encode-2bit | 1 | ||||
-rw-r--r-- | tests/ref/fate/g726-encode-3bit | 1 | ||||
-rw-r--r-- | tests/ref/fate/g726-encode-4bit | 1 | ||||
-rw-r--r-- | tests/ref/fate/g726-encode-5bit | 1 | ||||
-rw-r--r-- | tests/ref/lavf/dv_fmt | 4 | ||||
-rw-r--r-- | tests/ref/lavf/gxf | 4 | ||||
-rw-r--r-- | tests/ref/lavf/mxf_d10 | 4 | ||||
-rw-r--r-- | tests/ref/seek/g726_wav | 53 | ||||
-rw-r--r-- | tests/ref/seek/pcm_s24daud_302 | 27 |
15 files changed, 12 insertions, 99 deletions
diff --git a/tests/ref/acodec/g722 b/tests/ref/acodec/g722 deleted file mode 100644 index de0e5a0caa..0000000000 --- a/tests/ref/acodec/g722 +++ /dev/null @@ -1,4 +0,0 @@ -e4d5ae038f29659c03fcf68818f7be6c *./tests/data/acodec/g722.wav -48053 ./tests/data/acodec/g722.wav -8dafe5b74ccd5f08fed2fb2a69c5475f *./tests/data/g722.acodec.out.wav -stddev: 8939.47 PSNR: 17.30 MAXDIFF:40370 bytes: 191980/ 1058400 diff --git a/tests/ref/acodec/g726 b/tests/ref/acodec/g726 deleted file mode 100644 index c519ac297e..0000000000 --- a/tests/ref/acodec/g726 +++ /dev/null @@ -1,4 +0,0 @@ -331fcf91f4483b508059d0933af97987 *./tests/data/acodec/g726.wav -24054 ./tests/data/acodec/g726.wav -fac563ba7947d8fc42b4af048707c145 *./tests/data/g726.acodec.out.wav -stddev: 8553.69 PSNR: 17.69 MAXDIFF:29353 bytes: 95984/ 1058400 diff --git a/tests/ref/acodec/pcm_s24daud b/tests/ref/acodec/pcm_s24daud deleted file mode 100644 index e1f22964fc..0000000000 --- a/tests/ref/acodec/pcm_s24daud +++ /dev/null @@ -1,4 +0,0 @@ -1b75d5198ae789ab3c48f7024e08f4a9 *./tests/data/acodec/pcm_s24daud.302 -10368730 ./tests/data/acodec/pcm_s24daud.302 -70ec0ba6bc151ddc7509c09804d95d3b *./tests/data/pcm_s24daud.acodec.out.wav -stddev: 8967.92 PSNR: 17.28 MAXDIFF:42548 bytes: 6911796/ 1058400 diff --git a/tests/ref/fate/dcinema-encode b/tests/ref/fate/dcinema-encode new file mode 100644 index 0000000000..8aeb21526c --- /dev/null +++ b/tests/ref/fate/dcinema-encode @@ -0,0 +1 @@ +MD5=2d7c6897c315493647db159f4bfd6edc diff --git a/tests/ref/fate/g722-encode b/tests/ref/fate/g722-encode new file mode 100644 index 0000000000..c7198cf83c --- /dev/null +++ b/tests/ref/fate/g722-encode @@ -0,0 +1 @@ +MD5=7106189574186051c0497b287e2e5f19 diff --git a/tests/ref/fate/g722enc b/tests/ref/fate/g722enc deleted file mode 100644 index 9b8e469a8b..0000000000 --- a/tests/ref/fate/g722enc +++ /dev/null @@ -1 +0,0 @@ -94e2f200d6e05b47cec4aa3e94571cf3 diff --git a/tests/ref/fate/g726-encode-2bit b/tests/ref/fate/g726-encode-2bit new file mode 100644 index 0000000000..26a12190fc --- /dev/null +++ b/tests/ref/fate/g726-encode-2bit @@ -0,0 +1 @@ +MD5=215eaef5778a16e2bf4f3725a557f355 diff --git a/tests/ref/fate/g726-encode-3bit b/tests/ref/fate/g726-encode-3bit new file mode 100644 index 0000000000..f9c6940217 --- /dev/null +++ b/tests/ref/fate/g726-encode-3bit @@ -0,0 +1 @@ +MD5=0bebd949dfd5ac0ae3f2c3ceb2e3fac1 diff --git a/tests/ref/fate/g726-encode-4bit b/tests/ref/fate/g726-encode-4bit new file mode 100644 index 0000000000..6d03517164 --- /dev/null +++ b/tests/ref/fate/g726-encode-4bit @@ -0,0 +1 @@ +MD5=a21cfea116ab2179eabe5d84b6bfc09a diff --git a/tests/ref/fate/g726-encode-5bit b/tests/ref/fate/g726-encode-5bit new file mode 100644 index 0000000000..459ebb39f2 --- /dev/null +++ b/tests/ref/fate/g726-encode-5bit @@ -0,0 +1 @@ +MD5=9cad98cf5205bf76d6e9d1241e56141a diff --git a/tests/ref/lavf/dv_fmt b/tests/ref/lavf/dv_fmt index 884c079243..ea667b9627 100644 --- a/tests/ref/lavf/dv_fmt +++ b/tests/ref/lavf/dv_fmt @@ -4,6 +4,6 @@ cc33ae4f9e6828914dea0f09d1241b7e *./tests/data/lavf/lavf.dv 3480000 ./tests/data/lavf/lavf.dv ./tests/data/lavf/lavf.dv CRC=0x8d5e9e8f -3a6a9163a67b729b4a6b5d972ccceb97 *./tests/data/lavf/lavf.dv +b36c83cd0ba0ebe719f09f885c4bbcd3 *./tests/data/lavf/lavf.dv 3600000 ./tests/data/lavf/lavf.dv -./tests/data/lavf/lavf.dv CRC=0x5ce4e5e4 +./tests/data/lavf/lavf.dv CRC=0x2bc2ae3a diff --git a/tests/ref/lavf/gxf b/tests/ref/lavf/gxf index 5796895a1d..63101b89ed 100644 --- a/tests/ref/lavf/gxf +++ b/tests/ref/lavf/gxf @@ -4,6 +4,6 @@ befc1a39c37a4ecd9264942a3e34b3f6 *./tests/data/lavf/lavf.gxf 267d2b2b6e357209d76c366302cf35c3 *./tests/data/lavf/lavf.gxf 794572 ./tests/data/lavf/lavf.gxf ./tests/data/lavf/lavf.gxf CRC=0xab47d02d -1c1693cf2358025f1e37ac76e1da925a *./tests/data/lavf/lavf.gxf +0a1a37fa79b62435545271b4e8e882f5 *./tests/data/lavf/lavf.gxf 796392 ./tests/data/lavf/lavf.gxf -./tests/data/lavf/lavf.gxf CRC=0x102918fd +./tests/data/lavf/lavf.gxf CRC=0x3b1a8e91 diff --git a/tests/ref/lavf/mxf_d10 b/tests/ref/lavf/mxf_d10 index efeac5a2c0..a10e8456ed 100644 --- a/tests/ref/lavf/mxf_d10 +++ b/tests/ref/lavf/mxf_d10 @@ -1,3 +1,3 @@ -23177c8a72f34e243e9ffc4f6c70d3c7 *./tests/data/lavf/lavf.mxf_d10 +0d72247067569901a2e351586ddc0b82 *./tests/data/lavf/lavf.mxf_d10 5330989 ./tests/data/lavf/lavf.mxf_d10 -./tests/data/lavf/lavf.mxf_d10 CRC=0x81602ff1 +./tests/data/lavf/lavf.mxf_d10 CRC=0x4474d480 diff --git a/tests/ref/seek/g726_wav b/tests/ref/seek/g726_wav deleted file mode 100644 index 0e145a2722..0000000000 --- a/tests/ref/seek/g726_wav +++ /dev/null @@ -1,53 +0,0 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096 -ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096 -ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 1.894000 pts: 1.894000 pos: 7634 size: 4096 -ret: 0 st: 0 flags:0 ts: 0.788375 -ret: 0 st: 0 flags:1 dts: 0.788500 pts: 0.788500 pos: 3212 size: 4096 -ret: 0 st: 0 flags:1 ts:-0.317500 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096 -ret: 0 st:-1 flags:0 ts: 2.576668 -ret: 0 st: 0 flags:1 dts: 2.576750 pts: 2.576750 pos: 10365 size: 4096 -ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 1.470750 pts: 1.470750 pos: 5941 size: 4096 -ret: 0 st: 0 flags:0 ts: 0.365000 -ret: 0 st: 0 flags:1 dts: 0.365000 pts: 0.365000 pos: 1518 size: 4096 -ret: 0 st: 0 flags:1 ts:-0.740875 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096 -ret: 0 st:-1 flags:0 ts: 2.153336 -ret: 0 st: 0 flags:1 dts: 2.153500 pts: 2.153500 pos: 8672 size: 4096 -ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 1.047500 pts: 1.047500 pos: 4248 size: 4096 -ret: 0 st: 0 flags:0 ts:-0.058375 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096 -ret: 0 st: 0 flags:1 ts: 2.835875 -ret: 0 st: 0 flags:1 dts: 2.835750 pts: 2.835750 pos: 11401 size: 4096 -ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 1.730000 pts: 1.730000 pos: 6978 size: 4096 -ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.624000 pts: 0.624000 pos: 2554 size: 4096 -ret: 0 st: 0 flags:0 ts:-0.481625 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096 -ret: 0 st: 0 flags:1 ts: 2.412500 -ret: 0 st: 0 flags:1 dts: 2.412500 pts: 2.412500 pos: 9708 size: 4096 -ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 1.306750 pts: 1.306750 pos: 5285 size: 4096 -ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.200750 pts: 0.200750 pos: 861 size: 4096 -ret: 0 st: 0 flags:0 ts:-0.905000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096 -ret: 0 st: 0 flags:1 ts: 1.989125 -ret: 0 st: 0 flags:1 dts: 1.989000 pts: 1.989000 pos: 8014 size: 4096 -ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.883500 pts: 0.883500 pos: 3592 size: 4096 -ret: 0 st:-1 flags:1 ts:-0.222493 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096 -ret: 0 st: 0 flags:0 ts: 2.671625 -ret: 0 st: 0 flags:1 dts: 2.671750 pts: 2.671750 pos: 10745 size: 4096 -ret: 0 st: 0 flags:1 ts: 1.565875 -ret: 0 st: 0 flags:1 dts: 1.565750 pts: 1.565750 pos: 6321 size: 4096 -ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos: 1898 size: 4096 -ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096 diff --git a/tests/ref/seek/pcm_s24daud_302 b/tests/ref/seek/pcm_s24daud_302 deleted file mode 100644 index 5c9b6d976b..0000000000 --- a/tests/ref/seek/pcm_s24daud_302 +++ /dev/null @@ -1,27 +0,0 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4 size: 39816 -ret:-1 st:-1 flags:0 ts:-1.000000 -ret:-1 st:-1 flags:1 ts: 1.894167 -ret:-1 st: 0 flags:0 ts: 0.788333 -ret:-1 st: 0 flags:1 ts:-0.317500 -ret:-1 st:-1 flags:0 ts: 2.576668 -ret:-1 st:-1 flags:1 ts: 1.470835 -ret:-1 st: 0 flags:0 ts: 0.365000 -ret:-1 st: 0 flags:1 ts:-0.740833 -ret:-1 st:-1 flags:0 ts: 2.153336 -ret:-1 st:-1 flags:1 ts: 1.047503 -ret:-1 st: 0 flags:0 ts:-0.058333 -ret:-1 st: 0 flags:1 ts: 2.835833 -ret:-1 st:-1 flags:0 ts: 1.730004 -ret:-1 st:-1 flags:1 ts: 0.624171 -ret:-1 st: 0 flags:0 ts:-0.481667 -ret:-1 st: 0 flags:1 ts: 2.412500 -ret:-1 st:-1 flags:0 ts: 1.306672 -ret:-1 st:-1 flags:1 ts: 0.200839 -ret:-1 st: 0 flags:0 ts:-0.904989 -ret:-1 st: 0 flags:1 ts: 1.989178 -ret:-1 st:-1 flags:0 ts: 0.883340 -ret:-1 st:-1 flags:1 ts:-0.222493 -ret:-1 st: 0 flags:0 ts: 2.671678 -ret:-1 st: 0 flags:1 ts: 1.565844 -ret:-1 st:-1 flags:0 ts: 0.460008 -ret:-1 st:-1 flags:1 ts:-0.645825 |