diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-17 23:16:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-17 23:16:05 +0100 |
| commit | 967bdb8572f27b9891fe7bd9b8489146a906633d (patch) | |
| tree | 61b486be897a4503f71e2ecc7734f16930dc1a94 /tests/fate | |
| parent | 219a6fb61cb9e6f534f20dc3313442f89b0ffd42 (diff) | |
| parent | 6ca3b248e21fc48418c4221fc92c2eecaf07cb9b (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
resample: allocate a large enough output buffer
fate: fix enc_dec_pcm tests with remote target
wmaenc: remove bit-exact hack
FATE: remove WMA acodec tests
FATE: add WMAv1 and WMAv2 encode/decode tests with fuzzy comparison
FATE: add AC-3 and E-AC-3 encode/decode tests with fuzzy comparison
qtrle: Use bytestream2 functions to prevent buffer overreads.
vqavideo: check malloc return values
x11grab: fix a memory leak exposed by valgrind
threads: fix old frames returned after avcodec_flush_buffers()
MPV: always mark dummy frames as reference
h264: fix deadlocks on incomplete reference frame decoding.
mpeg4: report frame decoding completion at ff_MPV_frame_end().
mimic: don't use self as reference, and report completion at end of decode().
Conflicts:
libavcodec/h264.c
libavcodec/qtrle.c
libavcodec/resample.c
libavcodec/vqavideo.c
libavdevice/x11grab.c
tests/ref/seek/wmav1_asf
tests/ref/seek/wmav2_asf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/ac3.mak | 16 | ||||
| -rw-r--r-- | tests/fate/wma.mak | 19 |
2 files changed, 35 insertions, 0 deletions
diff --git a/tests/fate/ac3.mak b/tests/fate/ac3.mak index 83b13b6323..2e851864c3 100644 --- a/tests/fate/ac3.mak +++ b/tests/fate/ac3.mak @@ -28,5 +28,21 @@ fate-eac3-4: CMD = pcm -i $(SAMPLES)/eac3/serenity_english_5.1_1536_small.eac3 fate-eac3-4: CMP = oneoff fate-eac3-4: REF = $(SAMPLES)/eac3/serenity_english_5.1_1536_small.pcm +FATE_AC3 += fate-ac3-encode +fate-ac3-encode: CMD = enc_dec_pcm ac3 s16le -c:a ac3 -b:a 128k +fate-ac3-encode: CMP = stddev +fate-ac3-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav +fate-ac3-encode: CMP_SHIFT = -1024 +fate-ac3-encode: CMP_TARGET = 399.62 +fate-ac3-encode: SIZE_TOLERANCE = 488 + +FATE_AC3 += fate-eac3-encode +fate-eac3-encode: CMD = enc_dec_pcm eac3 s16le -c:a eac3 -b:a 128k +fate-eac3-encode: CMP = stddev +fate-eac3-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav +fate-eac3-encode: CMP_SHIFT = -1024 +fate-eac3-encode: CMP_TARGET = 514.02 +fate-eac3-encode: SIZE_TOLERANCE = 488 + FATE_TESTS += $(FATE_AC3) fate-ac3: $(FATE_AC3) diff --git a/tests/fate/wma.mak b/tests/fate/wma.mak index 3d849ea146..9143f8c0f3 100644 --- a/tests/fate/wma.mak +++ b/tests/fate/wma.mak @@ -36,3 +36,22 @@ fate-wmavoice-19k: FUZZ = 3 FATE_TESTS += $(FATE_WMAVOICE) fate-wmavoice: $(FATE_WMAVOICE) + +FATE_WMA_ENCODE += fate-wmav1-encode +fate-wmav1-encode: CMD = enc_dec_pcm asf s16le -c:a wmav1 -b:a 128k +fate-wmav1-encode: CMP = stddev +fate-wmav1-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav +fate-wmav1-encode: CMP_SHIFT = -8192 +fate-wmav1-encode: CMP_TARGET = 291.06 +fate-wmav1-encode: SIZE_TOLERANCE = 4632 + +FATE_WMA_ENCODE += fate-wmav2-encode +fate-wmav2-encode: CMD = enc_dec_pcm asf s16le -c:a wmav2 -b:a 128k +fate-wmav2-encode: CMP = stddev +fate-wmav2-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav +fate-wmav2-encode: CMP_SHIFT = -8192 +fate-wmav2-encode: CMP_TARGET = 258.32 +fate-wmav2-encode: SIZE_TOLERANCE = 4632 + +FATE_TESTS += $(FATE_WMA_ENCODE) +fate-wma-encode: $(FATE_WMA_ENCODE) |