[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] HG: xine-lib: Recognise AMR audio (normally found in 3GP
From:       Darren Salt <linux () youmustbejoking ! demon ! co ! uk>
Date:       2008-07-17 22:36:48
Message-ID: 0257127e89b9ae89715f.1216121338 () hg ! debian ! org
[Download RAW message or body]

# HG changeset patch
# User Darren Salt <linux@youmustbejoking.demon.co.uk>
# Date 1216121338 -3600
# Node ID 0257127e89b9ae89715fc4670d3be47751b18053
# Parent  bba451e00d42a0a1f32439f041974aebfcb479cb
Recognise AMR audio (normally found in 3GP files).

diff -r 0257127e89b9ae89715fc4670d3be47751b18053 -r \
                bba451e00d42a0a1f32439f041974aebfcb479cb ChangeLog
--- a/ChangeLog	Tue Jul 15 12:28:58 2008 +0100
+++ b/ChangeLog	Sun Jul 13 11:36:23 2008 +0100
@@ -1,6 +1,7 @@ xine-lib (1.1.15) 2008-??-??
 xine-lib (1.1.15) 2008-??-??
   * Use external ffmpeg by default.
   * V4L: Don't segfault if asked for an input that doesn't exist
+  * Recognise AMR audio (normally found in 3GP files).
 
 xine-lib (1.1.14) 2008-06-29
   * DVB changes:
diff -r 0257127e89b9ae89715fc4670d3be47751b18053 -r \
                bba451e00d42a0a1f32439f041974aebfcb479cb \
                src/combined/ffmpeg/ff_audio_decoder.c
--- a/src/combined/ffmpeg/ff_audio_decoder.c	Tue Jul 15 12:28:58 2008 +0100
+++ b/src/combined/ffmpeg/ff_audio_decoder.c	Sun Jul 13 11:36:23 2008 +0100
@@ -108,6 +108,8 @@ static const ff_codec_t ff_audio_lookup[
   {BUF_AUDIO_SMACKER,    CODEC_ID_SMACKAUDIO,     "Smacker (ffmpeg)"},
   {BUF_AUDIO_FLVADPCM,   CODEC_ID_ADPCM_SWF,	  "Flash ADPCM (ffmpeg)"},
   {BUF_AUDIO_WAVPACK,	 CODEC_ID_WAVPACK,	  "WavPack (ffmpeg)"},
+  {BUF_AUDIO_AMR_NB,	 CODEC_ID_AMR_NB,	  "AMR narrow band (ffmpeg)"},
+  {BUF_AUDIO_AMR_WB,	 CODEC_ID_AMR_WB,	  "AMR wide band (ffmpeg)"},
 };
 
 
@@ -598,7 +600,12 @@ static uint32_t supported_audio_types[] 
   #ifdef CONFIG_WAVPACK_DECODER
   BUF_AUDIO_WAVPACK,
   #endif
-  
+  #ifdef CONFIG_AMR_NB_DECODER
+  BUF_AUDIO_AMR_NB,
+  #endif
+  #ifdef CONFIG_AMR_WB_DECODER
+  BUF_AUDIO_AMR_WB,
+  #endif
   0
 };
 
diff -r 0257127e89b9ae89715fc4670d3be47751b18053 -r \
                bba451e00d42a0a1f32439f041974aebfcb479cb src/xine-engine/buffer.h
--- a/src/xine-engine/buffer.h	Tue Jul 15 12:28:58 2008 +0100
+++ b/src/xine-engine/buffer.h	Sun Jul 13 11:36:23 2008 +0100
@@ -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 -r 0257127e89b9ae89715fc4670d3be47751b18053 -r \
                bba451e00d42a0a1f32439f041974aebfcb479cb \
                src/xine-engine/buffer_types.c
--- a/src/xine-engine/buffer_types.c	Tue Jul 15 12:28:58 2008 +0100
+++ b/src/xine-engine/buffer_types.c	Sun Jul 13 11:36:23 2008 +0100
@@ -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" }
 };
 

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog


[prev in list] [next in list] [prev in thread] [next in thread]