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/fate | |
| 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/fate')
| -rw-r--r-- | tests/fate/pcm.mak | 5 | ||||
| -rw-r--r-- | tests/fate/voice.mak | 35 |
2 files changed, 36 insertions, 4 deletions
diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak index 3ce04f9cea..4b271346f6 100644 --- a/tests/fate/pcm.mak +++ b/tests/fate/pcm.mak @@ -25,5 +25,10 @@ fate-pcm_u8-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-raw.mov -f FATE_PCM += fate-w64 fate-w64: CMD = crc -i $(SAMPLES)/w64/w64-pcm16.w64 +FATE_PCM += fate-dcinema-encode +fate-dcinema-encode: tests/data/asynth-96000-6.wav +fate-dcinema-encode: SRC = tests/data/asynth-96000-6.wav +fate-dcinema-encode: CMD = enc_dec_pcm daud md5 s16le $(SRC) -c:a pcm_s24daud + FATE_TESTS += $(FATE_PCM) fate-pcm: $(FATE_PCM) diff --git a/tests/fate/voice.mak b/tests/fate/voice.mak index b9bf8e1e51..f8fa24b7b6 100644 --- a/tests/fate/voice.mak +++ b/tests/fate/voice.mak @@ -1,9 +1,36 @@ -FATE_VOICE += fate-g722dec-1 +FATE_G722 += fate-g722dec-1 fate-g722dec-1: CMD = framecrc -i $(SAMPLES)/g722/conf-adminmenu-162.g722 -FATE_VOICE += fate-g722enc -fate-g722enc: tests/data/asynth-16000-1.sw -fate-g722enc: CMD = md5 -ar 16000 -ac 1 -f s16le -i $(TARGET_PATH)/tests/data/asynth-16000-1.sw -acodec g722 -ac 1 -f g722 +FATE_G722 += fate-g722-encode +fate-g722-encode: tests/data/asynth-16000-1.wav +fate-g722-encode: SRC = tests/data/asynth-16000-1.wav +fate-g722-encode: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g722 + +FATE_VOICE += $(FATE_G722) +fate-g722: $(FATE_G722) + +FATE_G726 += fate-g726-encode-2bit +fate-g726-encode-2bit: tests/data/asynth-8000-1.wav +fate-g726-encode-2bit: SRC = tests/data/asynth-8000-1.wav +fate-g726-encode-2bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 16k + +FATE_G726 += fate-g726-encode-3bit +fate-g726-encode-3bit: tests/data/asynth-8000-1.wav +fate-g726-encode-3bit: SRC = tests/data/asynth-8000-1.wav +fate-g726-encode-3bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 24k + +FATE_G726 += fate-g726-encode-4bit +fate-g726-encode-4bit: tests/data/asynth-8000-1.wav +fate-g726-encode-4bit: SRC = tests/data/asynth-8000-1.wav +fate-g726-encode-4bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 32k + +FATE_G726 += fate-g726-encode-5bit +fate-g726-encode-5bit: tests/data/asynth-8000-1.wav +fate-g726-encode-5bit: SRC = tests/data/asynth-8000-1.wav +fate-g726-encode-5bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 40k + +FATE_VOICE += $(FATE_G726) +fate-g726: $(FATE_G726) FATE_GSM += fate-gsm-ms fate-gsm-ms: CMD = framecrc -i $(SAMPLES)/gsm/ciao.wav |