summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-07-15 12:28:58 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-07-15 12:28:58 +0100
commit0eabb0332dd91fdcd5bccfbdd02862ae7d34f681 (patch)
tree97e803f157e50346367b48b87c45507c583f709a /src/xine-engine
parentfb07620556cad09ebfd1454ea644300c5630276e (diff)
downloadxine-lib-0eabb0332dd91fdcd5bccfbdd02862ae7d34f681.tar.gz
xine-lib-0eabb0332dd91fdcd5bccfbdd02862ae7d34f681.tar.bz2
Recognise AMR audio (normally found in 3GP files).
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/buffer.h2
-rw-r--r--src/xine-engine/buffer_types.c14
2 files changed, 16 insertions, 0 deletions
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 34e6f7c1d..97df4d2ae 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -260,6 +260,8 @@ extern "C" {
#define BUF_AUDIO_FLVADPCM 0x033C0000
#define BUF_AUDIO_WAVPACK 0x033D0000
#define BUF_AUDIO_MP3ADU 0x033E0000
+#define BUF_AUDIO_AMR_NB 0x033F0000
+#define BUF_AUDIO_AMR_WB 0x03400000
/* spu buffer types: */
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index 26adc1b3c..688ed1609 100644
--- a/src/xine-engine/buffer_types.c
+++ b/src/xine-engine/buffer_types.c
@@ -1145,6 +1145,20 @@ static const audio_db_t audio_db[] = {
BUF_AUDIO_WAVPACK,
"Wavpack"
},
+{
+ {
+ ME_FOURCC('s', 'a', 'm', 'r'),
+ },
+ BUF_AUDIO_AMR_NB,
+ "AMR narrow band"
+},
+{
+ {
+ ME_FOURCC('s', 'a', 'w', 'b'),
+ },
+ BUF_AUDIO_AMR_WB,
+ "AMR wide band"
+},
{ { 0 }, 0, "last entry" }
};