diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-25 13:10:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-25 13:37:40 +0200 |
| commit | 9b53691f731870220d432ec3304bcc5f744c3c96 (patch) | |
| tree | 62b1063af23bf00a0397eb8e46c59add7ee0eb1e | |
| parent | a6fd685fedb1e9f66f9fb2ffdbb7f506e17cf225 (diff) | |
| parent | 28f5cd312c9da9072108edf8b7685d009374ea96 (diff) | |
| download | ffmpeg-9b53691f731870220d432ec3304bcc5f744c3c96.tar.gz | |
Merge commit '28f5cd312c9da9072108edf8b7685d009374ea96'
* commit '28f5cd312c9da9072108edf8b7685d009374ea96':
fate: Switch ra4-288 test from framecrc() to pcm()
Conflicts:
tests/fate/real.mak
The test is kept disabled as it still does not pass on x86-64 due to float
rounding
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tests/fate/real.mak | 4 | ||||
| -rw-r--r-- | tests/ref/fate/ra4-288 | 73 |
2 files changed, 3 insertions, 74 deletions
diff --git a/tests/fate/real.mak b/tests/fate/real.mak index 26d5776ce0..c123e4447f 100644 --- a/tests/fate/real.mak +++ b/tests/fate/real.mak @@ -2,7 +2,9 @@ FATE_REALAUDIO-$(call DEMDEC, RM, RA_144) += fate-ra3-144 fate-ra3-144: CMD = framecrc -i $(TARGET_SAMPLES)/realaudio/ra3.ra #FATE_REALAUDIO-$(call DEMDEC, RM, RA_288) += fate-ra4-288 -#fate-ra4-288: CMD = framecrc -i $(TARGET_SAMPLES)/realaudio/ra4-288.ra +fate-ra4-288: CMD = pcm -i $(TARGET_SAMPLES)/realaudio/ra4_288.ra +fate-ra4-288: REF = $(SAMPLES)/realaudio/ra4_288.pcm +fate-ra4-288: CMP = oneoff FATE_REALMEDIA_AUDIO-$(call DEMDEC, RM, RA_144) += fate-ra-144 fate-ra-144: CMD = md5 -i $(TARGET_SAMPLES)/real/ra3_in_rm_file.rm -f s16le diff --git a/tests/ref/fate/ra4-288 b/tests/ref/fate/ra4-288 deleted file mode 100644 index 6c0bde087b..0000000000 --- a/tests/ref/fate/ra4-288 +++ /dev/null @@ -1,73 +0,0 @@ -#tb 0: 1/8000 -0, 0, 0, 160, 320, 0x83a99ec9 -0, 160, 160, 160, 320, 0xa5a49c69 -0, 320, 320, 160, 320, 0xda1f901c -0, 480, 480, 160, 320, 0xf9fca0a2 -0, 640, 640, 160, 320, 0x04b1899f -0, 800, 800, 160, 320, 0x67129bd1 -0, 960, 960, 160, 320, 0x64cd92ee -0, 1120, 1120, 160, 320, 0x4e1498ae -0, 1280, 1280, 160, 320, 0x644891ca -0, 1440, 1440, 160, 320, 0x8cc8bd5b -0, 1600, 1600, 160, 320, 0x5990a0e0 -0, 1760, 1760, 160, 320, 0x3225a08c -0, 1920, 1920, 160, 320, 0x7c9497e9 -0, 2080, 2080, 160, 320, 0xeb9a9ad4 -0, 2240, 2240, 160, 320, 0xabf39ee9 -0, 2400, 2400, 160, 320, 0x2f707823 -0, 2560, 2560, 160, 320, 0xae65756e -0, 2720, 2720, 160, 320, 0x9eea56c6 -0, 2880, 2880, 160, 320, 0x5f0c6bf8 -0, 3040, 3040, 160, 320, 0xfc266273 -0, 3200, 3200, 160, 320, 0x0b76731a -0, 3360, 3360, 160, 320, 0xce856cf9 -0, 3520, 3520, 160, 320, 0x560e7bf0 -0, 3680, 3680, 160, 320, 0x36216c8c -0, 3840, 3840, 160, 320, 0x6ed861e3 -0, 4000, 4000, 160, 320, 0xc58b64f9 -0, 4160, 4160, 160, 320, 0xf4c268e2 -0, 4320, 4320, 160, 320, 0xbae571c9 -0, 4480, 4480, 160, 320, 0x6c087b48 -0, 4640, 4640, 160, 320, 0x119c61cf -0, 4800, 4800, 160, 320, 0x7c646ee0 -0, 4960, 4960, 160, 320, 0x205268f0 -0, 5120, 5120, 160, 320, 0x153e88b2 -0, 5280, 5280, 160, 320, 0x8067642d -0, 5440, 5440, 160, 320, 0x24ae76cd -0, 5600, 5600, 160, 320, 0x1f0761fe -0, 5760, 5760, 160, 320, 0x223179ff -0, 5920, 5920, 160, 320, 0x583370ad -0, 6080, 6080, 160, 320, 0x9f848dff -0, 6240, 6240, 160, 320, 0x987b5ede -0, 6400, 6400, 160, 320, 0x558989d5 -0, 6560, 6560, 160, 320, 0xa3924fb3 -0, 6720, 6720, 160, 320, 0x5c9091a8 -0, 6880, 6880, 160, 320, 0xaf49572f -0, 7040, 7040, 160, 320, 0x08437d3a -0, 7200, 7200, 160, 320, 0xbd429782 -0, 7360, 7360, 160, 320, 0x284c8912 -0, 7520, 7520, 160, 320, 0xa0648204 -0, 7680, 7680, 160, 320, 0x2ad2a3d7 -0, 7840, 7840, 160, 320, 0x7d9087c3 -0, 8000, 8000, 160, 320, 0xf01f8d06 -0, 8160, 8160, 160, 320, 0x644387a1 -0, 8320, 8320, 160, 320, 0x3587817a -0, 8480, 8480, 160, 320, 0x8f579af9 -0, 8640, 8640, 160, 320, 0x4d3596e7 -0, 8800, 8800, 160, 320, 0x13f19284 -0, 8960, 8960, 160, 320, 0x6d0b9211 -0, 9120, 9120, 160, 320, 0x8c439e9e -0, 9280, 9280, 160, 320, 0xac89b376 -0, 9440, 9440, 160, 320, 0xd66cb866 -0, 9600, 9600, 160, 320, 0x39779702 -0, 9760, 9760, 160, 320, 0x58eb9da7 -0, 9920, 9920, 160, 320, 0x800c9b01 -0, 10080, 10080, 160, 320, 0xc0818dfc -0, 10240, 10240, 160, 320, 0xc38b9500 -0, 10400, 10400, 160, 320, 0xf0fda744 -0, 10560, 10560, 160, 320, 0x446895f1 -0, 10720, 10720, 160, 320, 0xc3539fc2 -0, 10880, 10880, 160, 320, 0xbe3d9c9d -0, 11040, 11040, 160, 320, 0xa219980c -0, 11200, 11200, 160, 320, 0xf09ea107 -0, 11360, 11360, 160, 320, 0x8e259ae7 |