Merge commit '44caf99ecae7bc1b907fab849ecaa72dd340ba2e'

* commit '44caf99ecae7bc1b907fab849ecaa72dd340ba2e':
  fate: Add tests for RealAudio 1.0 (14.4) and RealAudio 2.0 (with 28.8)

Conflicts:
	tests/fate/real.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>

3 files changed, 133 insertions, 1 deletions

diff --git a/tests/fate/real.mak b/tests/fate/real.mak
index e57f8835dc..1dcd443594 100644
--- a/tests/fate/real.mak
+++ b/tests/fate/real.mak
@@ -1,3 +1,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_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
 
@@ -40,8 +46,10 @@ $(FATE_SIPR): CMP = oneoff
 FATE_REALMEDIA_AUDIO-$(call DEMDEC, RM, SIPR) += $(FATE_SIPR)
 fate-sipr: $(FATE_SIPR)
 
+fate-realaudio: $(FATE_REALAUDIO-yes)
 fate-realmedia-audio: $(FATE_REALMEDIA_AUDIO-yes)
 fate-realmedia-video: $(FATE_REALMEDIA_VIDEO-yes)
 fate-realmedia: fate-realmedia-audio fate-realmedia-video
+fate-real: fate-realaudio fate-realmedia
 
-FATE_SAMPLES_FFMPEG += $(FATE_REALMEDIA_AUDIO-yes) $(FATE_REALMEDIA_VIDEO-yes)
+FATE_SAMPLES_FFMPEG += $(FATE_REALAUDIO-yes) $(FATE_REALMEDIA_AUDIO-yes) $(FATE_REALMEDIA_VIDEO-yes)
diff --git a/tests/ref/fate/ra3-144 b/tests/ref/fate/ra3-144
new file mode 100644
index 0000000000..40bcaedba7
--- /dev/null
+++ b/tests/ref/fate/ra3-144
@@ -0,0 +1,51 @@
+#tb 0: 1/8000
+0,          0,          0,      160,      320, 0x00000000
+0,        160,        160,      160,      320, 0x4cfd5d74
+0,        320,        320,      160,      320, 0xbb60fa3d
+0,        480,        480,      160,      320, 0x4d75097c
+0,        640,        640,      160,      320, 0x59cbd3b4
+0,        800,        800,      160,      320, 0x0bcddb40
+0,        960,        960,      160,      320, 0x3d8ec98a
+0,       1120,       1120,      160,      320, 0x3612b700
+0,       1280,       1280,      160,      320, 0x23cfb9b6
+0,       1440,       1440,      160,      320, 0xd339c9a5
+0,       1600,       1600,      160,      320, 0xffb6b7c9
+0,       1760,       1760,      160,      320, 0x8730ac48
+0,       1920,       1920,      160,      320, 0x1568b279
+0,       2080,       2080,      160,      320, 0xf2229fda
+0,       2240,       2240,      160,      320, 0x91c0adbf
+0,       2400,       2400,      160,      320, 0xe261a238
+0,       2560,       2560,      160,      320, 0x5c0d97c6
+0,       2720,       2720,      160,      320, 0x32d492de
+0,       2880,       2880,      160,      320, 0x46a3af81
+0,       3040,       3040,      160,      320, 0xf8deaa2e
+0,       3200,       3200,      160,      320, 0x48649866
+0,       3360,       3360,      160,      320, 0x4cb2a03e
+0,       3520,       3520,      160,      320, 0x55e9a3d7
+0,       3680,       3680,      160,      320, 0xc60d9cf8
+0,       3840,       3840,      160,      320, 0x969098b8
+0,       4000,       4000,      160,      320, 0xe00b9f43
+0,       4160,       4160,      160,      320, 0x85c6af06
+0,       4320,       4320,      160,      320, 0x2037a849
+0,       4480,       4480,      160,      320, 0xd8e09379
+0,       4640,       4640,      160,      320, 0x5df69e34
+0,       4800,       4800,      160,      320, 0x95869c06
+0,       4960,       4960,      160,      320, 0x651c95a7
+0,       5120,       5120,      160,      320, 0xd433a2f4
+0,       5280,       5280,      160,      320, 0xc6c1a0e2
+0,       5440,       5440,      160,      320, 0x6cad9e61
+0,       5600,       5600,      160,      320, 0x57f5ab36
+0,       5760,       5760,      160,      320, 0x11fd9788
+0,       5920,       5920,      160,      320, 0x805db795
+0,       6080,       6080,      160,      320, 0xb306a36b
+0,       6240,       6240,      160,      320, 0xa34d9933
+0,       6400,       6400,      160,      320, 0xbc24a23c
+0,       6560,       6560,      160,      320, 0x6639a03c
+0,       6720,       6720,      160,      320, 0x4f20ab13
+0,       6880,       6880,      160,      320, 0xe30ca2bb
+0,       7040,       7040,      160,      320, 0x51e5ac4f
+0,       7200,       7200,      160,      320, 0x2a369ff4
+0,       7360,       7360,      160,      320, 0xfbffaa78
+0,       7520,       7520,      160,      320, 0xf117a04f
+0,       7680,       7680,      160,      320, 0x36479938
+0,       7840,       7840,      160,      320, 0xd1269299
diff --git a/tests/ref/fate/ra4-288 b/tests/ref/fate/ra4-288
new file mode 100644
index 0000000000..6c0bde087b
--- /dev/null
+++ b/tests/ref/fate/ra4-288
@@ -0,0 +1,73 @@
+#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