added some new buffer types and modified formattag_to_buf_audio() to that

it works with a 32-bit number instead of a 16-bit one (QT files identify
audio formats with fourccs)

CVS patchset: 1984
CVS date: 2002/06/02 16:32:46

2 files changed, 39 insertions, 9 deletions

diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 9561130ec..0e1921ace 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.44 2002/05/27 06:10:26 siggi Exp $
+ * $Id: buffer.h,v 1.45 2002/06/02 16:32:46 tmmm Exp $
  *
  *
  * contents:
@@ -78,7 +78,7 @@ extern "C" {
 #define BUF_VIDEO_MPEG		0x02000000
 #define BUF_VIDEO_MPEG4		0x02010000
 #define BUF_VIDEO_CINEPAK	0x02020000
-#define BUF_VIDEO_SORENSON	0x02030000
+#define BUF_VIDEO_SORENSON_V1	0x02030000
 #define BUF_VIDEO_MSMPEG4_V12	0x02040000
 #define BUF_VIDEO_MSMPEG4_V3	0x02050000
 #define BUF_VIDEO_MJPEG		0x02060000
@@ -111,6 +111,7 @@ extern "C" {
 #define BUF_VIDEO_DUCKTM1	0x02220000
 #define BUF_VIDEO_FLI		0x02230000
 #define BUF_VIDEO_ROQ		0x02240000
+#define BUF_VIDEO_SORENSON_V3	0x02250000
 
 /* audio buffer types:  (please keep in sync with buffer_types.c) */
 
@@ -138,6 +139,8 @@ extern "C" {
 #define BUF_AUDIO_QTIMAADPCM	0x03140000
 #define BUF_AUDIO_MAC3		0x03150000
 #define BUF_AUDIO_MAC6		0x03160000
+#define BUF_AUDIO_QDESIGN1	0x03170000
+#define BUF_AUDIO_QDESIGN2	0x03180000
 
 /* spu buffer types:    */
  
@@ -250,7 +253,7 @@ uint32_t fourcc_to_buf_video( void * fourcc );
 char * buf_video_name( uint32_t buf_type );
 
 /* return BUF_VIDEO_xxx given the formattag */
-uint32_t formattag_to_buf_audio( uint16_t formattag );
+uint32_t formattag_to_buf_audio( uint32_t formattag );
 
 /* return codec name given BUF_VIDEO_xxx */
 char * buf_audio_name( uint32_t buf_type );
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index b4edc5264..98e9dfb99 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.17 2002/05/27 06:10:26 siggi Exp $
+ * $Id: buffer_types.c,v 1.18 2002/06/02 16:32:46 tmmm Exp $
  *
  *
  * contents:
@@ -111,8 +111,17 @@ static video_db_t video_db[] = {
     mmioFOURCC('s', 'v', 'q', 'i'),
     0
   },
-  BUF_VIDEO_SORENSON,
-  "Sorenson"
+  BUF_VIDEO_SORENSON_V1,
+  "Sorenson Video 1"
+},
+{
+  {
+    mmioFOURCC('S', 'V', 'Q', '3'),
+    mmioFOURCC('s', 'v', 'q', '3'),
+    0
+  },
+  BUF_VIDEO_SORENSON_V3,
+  "Sorenson Video 3"
 },
 {
   {
@@ -401,7 +410,9 @@ static audio_db_t audio_db[] = {
 },
 {
   {
-    0x01, 0
+    0x01,
+    mmioFOURCC('r','a','w',' '),
+    0
   },
   BUF_AUDIO_LPCM_LE,
   "Uncompressed PCM little endian"
@@ -523,6 +534,22 @@ static audio_db_t audio_db[] = {
   BUF_AUDIO_MAC6,
   "Apple MACE 6:1 Audio"
 },
+{
+  {
+    mmioFOURCC('Q', 'D', 'M', 'C'),
+    0
+  },
+  BUF_AUDIO_QDESIGN1,
+  "QDesign Audio v1"
+},
+{
+  {
+    mmioFOURCC('Q', 'D', 'M', '2'),
+    0
+  },
+  BUF_AUDIO_QDESIGN2,
+  "QDesign Audio v2"
+},
 { { 0 }, 0, "last entry" }
 };
 
@@ -566,10 +593,10 @@ int i;
     }
   }
 
-  return "unknow";
+  return "unknown";
 }
 
-uint32_t formattag_to_buf_audio( uint16_t formattag ) {
+uint32_t formattag_to_buf_audio( uint32_t formattag ) {
 int i, j;
 static uint16_t cached_formattag=0;
 static uint32_t cached_buf_type=0;