Buffer type patch from Mike Melanson

CVS patchset: 1945
CVS date: 2002/05/27 06:10:26

2 files changed, 97 insertions, 6 deletions

diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 086234768..9561130ec 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.43 2002/04/27 23:31:33 cvogler Exp $
+ * $Id: buffer.h,v 1.44 2002/05/27 06:10:26 siggi Exp $
  *
  *
  * contents:
@@ -104,6 +104,13 @@ extern "C" {
 #define BUF_VIDEO_CYUV          0x021B0000
 #define BUF_VIDEO_DIVX5         0x021C0000
 #define BUF_VIDEO_XVID          0x021D0000
+#define BUF_VIDEO_SMC		0x021E0000
+#define BUF_VIDEO_RPZA		0x021F0000
+#define BUF_VIDEO_QTRLE		0x02200000
+#define BUF_VIDEO_MSRLE		0x02210000
+#define BUF_VIDEO_DUCKTM1	0x02220000
+#define BUF_VIDEO_FLI		0x02230000
+#define BUF_VIDEO_ROQ		0x02240000
 
 /* audio buffer types:  (please keep in sync with buffer_types.c) */
 
@@ -125,7 +132,12 @@ extern "C" {
 #define BUF_AUDIO_AAC           0x030e0000
 #define BUF_AUDIO_REAL    	0x030f0000
 #define BUF_AUDIO_VIVOG723      0x03100000
-
+#define BUF_AUDIO_DK3ADPCM	0x03110000
+#define BUF_AUDIO_DK4ADPCM	0x03120000
+#define BUF_AUDIO_ROQ		0x03130000
+#define BUF_AUDIO_QTIMAADPCM	0x03140000
+#define BUF_AUDIO_MAC3		0x03150000
+#define BUF_AUDIO_MAC6		0x03160000
 
 /* spu buffer types:    */
  
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index 0856d1ede..b4edc5264 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.16 2002/04/20 20:20:44 guenter Exp $
+ * $Id: buffer_types.c,v 1.17 2002/05/27 06:10:26 siggi Exp $
  *
  *
  * contents:
@@ -50,7 +50,7 @@ typedef struct video_db_s {
 } video_db_t;
 
 typedef struct audio_db_s {
-   uint16_t formattag[10];
+   uint32_t formattag[10];
    uint32_t buf_type;
    char *name;
 } audio_db_t;
@@ -327,10 +327,51 @@ static video_db_t video_db[] = {
 {
   {
     mmioFOURCC('c', 'y', 'u', 'v'),
+    mmioFOURCC('C', 'Y', 'U', 'V'),
     0
   },
   BUF_VIDEO_CYUV,
-  "cyuv format"
+  "Creative YUV format"
+},
+{
+  {
+    mmioFOURCC('s', 'm', 'c', ' '),
+    0
+  },
+  BUF_VIDEO_SMC,
+  "Apple Quicktime Graphics (SMC)"
+},
+{
+  {
+    mmioFOURCC('r', 'p', 'z', 'a'),
+    mmioFOURCC('a', 'z', 'p', 'r'),
+    0
+  },
+  BUF_VIDEO_RPZA,
+  "Apple Quicktime Video (RPZA)"
+},
+{
+  {
+    mmioFOURCC('r', 'l', 'e', ' '),
+    0
+  },
+  BUF_VIDEO_QTRLE,
+  "Apple Quicktime Animation (RLE)"
+},
+{
+  {
+    1, 2, 0  /* MS RLE format identifiers */
+  },
+  BUF_VIDEO_MSRLE,
+  "Microsoft RLE"
+},
+{
+  {
+    mmioFOURCC('D', 'U', 'C', 'K'),
+    0
+  },
+  BUF_VIDEO_DUCKTM1,
+  "Duck Truemotion v1"
 },
 { { 0 }, 0, "last entry" }
 };
@@ -391,7 +432,7 @@ static audio_db_t audio_db[] = {
     0x11, 0
   },
   BUF_AUDIO_IMAADPCM,
-  "IMA ADPCM"
+  "MS IMA ADPCM"
 },
 {
   {
@@ -444,6 +485,44 @@ static audio_db_t audio_db[] = {
   BUF_AUDIO_VIVOG723,
   "Vivo G.723/Siren Audio Codec"
 },
+{
+  {
+    0x61, 0
+  },
+  BUF_AUDIO_DK4ADPCM,
+  "Duck DK4 ADPCM (rogue format number)"
+},
+{
+  {
+    0x62, 0
+  },
+  BUF_AUDIO_DK3ADPCM,
+  "Duck DK3 ADPCM (rogue format number)"
+},
+{
+  {
+    mmioFOURCC('i', 'm', 'a', '4'),
+    0
+  },
+  BUF_AUDIO_QTIMAADPCM,
+  "QT IMA ADPCM"
+},
+{
+  {
+    mmioFOURCC('m', 'a', 'c', '3'),
+    0
+  },
+  BUF_AUDIO_MAC3,
+  "Apple MACE 3:1 Audio"
+},
+{
+  {
+    mmioFOURCC('m', 'a', 'c', '6'),
+    0
+  },
+  BUF_AUDIO_MAC6,
+  "Apple MACE 6:1 Audio"
+},
 { { 0 }, 0, "last entry" }
 };