summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2002-09-01 04:24:35 +0000
committerMike Melanson <mike@multimedia.cx>2002-09-01 04:24:35 +0000
commitc90d7950baeb40d1b4daf3c48a6ed1ea07d0d5f9 (patch)
treeb405a1aaa12db9cf13bf96b0767092da6e1d3974 /src/xine-engine
parenta210d8691594d1c4e1c9b0da8c868fbcbc66aa22 (diff)
downloadxine-lib-c90d7950baeb40d1b4daf3c48a6ed1ea07d0d5f9.tar.gz
xine-lib-c90d7950baeb40d1b4daf3c48a6ed1ea07d0d5f9.tar.bz2
added logarithmic PCM audio decoder (mu-law & A-law formats)
CVS patchset: 2572 CVS date: 2002/09/01 04:24:35
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/buffer.h4
-rw-r--r--src/xine-engine/buffer_types.c20
2 files changed, 22 insertions, 2 deletions
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index aaeec218f..0c41f4748 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: buffer.h,v 1.66 2002/08/30 14:19:48 f1rmb Exp $
+ * $Id: buffer.h,v 1.67 2002/09/01 04:24:35 tmmm Exp $
*
*
* contents:
@@ -158,6 +158,8 @@ extern "C" {
#define BUF_AUDIO_QCLP 0x03190000
#define BUF_AUDIO_SMJPEG_IMA 0x031A0000
#define BUF_AUDIO_VQA_IMA 0x031B0000
+#define BUF_AUDIO_MULAW 0x031C0000
+#define BUF_AUDIO_ALAW 0x031D0000
/* spu buffer types: */
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index d04505a0b..b479db331 100644
--- a/src/xine-engine/buffer_types.c
+++ b/src/xine-engine/buffer_types.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: buffer_types.c,v 1.39 2002/08/29 06:06:03 tmmm Exp $
+ * $Id: buffer_types.c,v 1.40 2002/09/01 04:24:35 tmmm Exp $
*
*
* contents:
@@ -652,6 +652,24 @@ static audio_db_t audio_db[] = {
BUF_AUDIO_QCLP,
"Qualcomm PureVoice"
},
+{
+ {
+ 0x7,
+ meFOURCC('u', 'l', 'a', 'w'),
+ 0
+ },
+ BUF_AUDIO_MULAW,
+ "mu-law logarithmic PCM"
+},
+{
+ {
+ 0x6,
+ meFOURCC('a', 'l', 'a', 'w'),
+ 0
+ },
+ BUF_AUDIO_ALAW,
+ "A-law logarithmic PCM"
+},
{ { 0 }, 0, "last entry" }
};