another codec/buftypes update

CVS patchset: 1410
CVS date: 2002/01/15 17:30:51

4 files changed, 38 insertions, 6 deletions

diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c
index 9fec027f4..640d02d17 100644
--- a/src/libffmpeg/xine_decoder.c
+++ b/src/libffmpeg/xine_decoder.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: xine_decoder.c,v 1.22 2002/01/05 21:54:17 miguelfreitas Exp $
+ * $Id: xine_decoder.c,v 1.23 2002/01/15 17:30:51 miguelfreitas Exp $
  *
  * xine decoder plugin using ffmpeg
  *
@@ -110,6 +110,7 @@ static int ff_can_handle (video_decoder_t *this_gen, int buf_type) {
            buf_type == BUF_VIDEO_MPEG4 ||
            buf_type == BUF_VIDEO_MJPEG ||
 	   /* buf_type == BUF_VIDEO_I263 || */
+	   buf_type == BUF_VIDEO_H263 ||
 	   buf_type == BUF_VIDEO_RV10 ||
 	   buf_type == BUF_VIDEO_JPEG);
 }
@@ -171,6 +172,9 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
       codec = avcodec_find_decoder (CODEC_ID_MJPEG);
       break;
     case BUF_VIDEO_I263:
+      codec = avcodec_find_decoder (CODEC_ID_H263I);
+      break;
+    case BUF_VIDEO_H263:
       codec = avcodec_find_decoder (CODEC_ID_H263);
       break;
     case BUF_VIDEO_RV10:
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
index d4eb877b4..ac8e38bde 100644
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.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: w32codec.c,v 1.58 2002/01/15 16:02:02 miguelfreitas Exp $
+ * $Id: w32codec.c,v 1.59 2002/01/15 17:30:51 miguelfreitas Exp $
  *
  * routines for using w32 codecs
  * DirectShow support by Miguel Freitas (Nov/2001)
@@ -311,6 +311,7 @@ static char* get_vids_codec_name(w32v_decoder_t *this,
 
   case BUF_VIDEO_MSVC:
     /* Video in Windows Video 1 */
+    /* note: can't play streams with 8bpp */
     this->flipped=1;
     this->yuv_supported=0;
     return "msvidc32.dll";    
@@ -785,7 +786,8 @@ static int w32a_can_handle (audio_decoder_t *this_gen, int buf_type) {
 	   (codec == BUF_AUDIO_IMC) ||
 	   (codec == BUF_AUDIO_LH) || 
 	   (codec == BUF_AUDIO_VOXWARE) ||
-           (codec == BUF_AUDIO_ACELPNET) );
+           (codec == BUF_AUDIO_ACELPNET) ||
+           (codec == BUF_AUDIO_VIVOG723) );
 }
 
 static char* get_auds_codec_name(w32a_decoder_t *this, int buf_type) {
@@ -814,6 +816,8 @@ static char* get_auds_codec_name(w32a_decoder_t *this, int buf_type) {
     this->ds_driver=1;
     this->guid=&CLSID_Acelp;
     return "acelpdec.ax";
+  case BUF_AUDIO_VIVOG723:
+    return "vivog723.acm";
   }
   printf ("w32codec: this didn't happen: unknown audio buf type %08x\n",
 	  buf_type);
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 106c19854..f63327e23 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.31 2002/01/15 16:02:03 miguelfreitas Exp $
+ * $Id: buffer.h,v 1.32 2002/01/15 17:30:51 miguelfreitas Exp $
  *
  *
  * contents:
@@ -100,7 +100,7 @@ extern "C" {
 #define BUF_VIDEO_DV		0x02160000
 #define BUF_VIDEO_REAL    	0x02170000
 #define BUF_VIDEO_VP31		0x02180000
-
+#define BUF_VIDEO_H263		0x02190000
 
 /* audio buffer types:  (please keep in sync with buffer_types.c) */
 
@@ -121,6 +121,7 @@ extern "C" {
 #define BUF_AUDIO_ACELPNET      0x030d0000
 #define BUF_AUDIO_AAC           0x030e0000
 #define BUF_AUDIO_REAL    	0x030f0000
+#define BUF_AUDIO_VIVOG723      0x03100000
 
 
 /* spu buffer types:    */
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index 4e1b86e60..994cacd97 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.8 2002/01/15 16:02:03 miguelfreitas Exp $
+ * $Id: buffer_types.c,v 1.9 2002/01/15 17:30:51 miguelfreitas Exp $
  *
  *
  * contents:
@@ -198,6 +198,9 @@ static video_db_t video_db[] = {
   {
     mmioFOURCC('I', '2', '6', '3'),
     mmioFOURCC('i', '2', '6', '3'),
+    mmioFOURCC('V', 'I', 'V', 'O'),
+    mmioFOURCC('v', 'i', 'v', 'o'),
+    mmioFOURCC('v', 'i', 'v', '1'),
     0
   },
   BUF_VIDEO_I263,
@@ -266,6 +269,9 @@ static video_db_t video_db[] = {
     mmioFOURCC('c','r','a','m'),
     mmioFOURCC('C','R','A','M'),
     mmioFOURCC('M','S','V','C'),
+    mmioFOURCC('m','s','v','c'),
+    mmioFOURCC('W','H','A','M'),
+    mmioFOURCC('w','h','a','m'),
     0
   },
   BUF_VIDEO_MSVC,
@@ -292,6 +298,16 @@ static video_db_t video_db[] = {
   BUF_VIDEO_VP31,
   "On2 VP3.1 Codec"
 },
+{
+  {
+    mmioFOURCC('H', '2', '6', '3'),
+    mmioFOURCC('h', '2', '6', '3'),
+    mmioFOURCC('U', '2', '6', '3'),
+    0
+  },
+  BUF_VIDEO_H263,
+  "H263 format"
+},
 { { 0 }, 0, "last entry" }
 };
 
@@ -395,6 +411,13 @@ static audio_db_t audio_db[] = {
   BUF_AUDIO_ACELPNET,
   "ACELP.net"
 },
+{
+  {
+    0x111, 0x112, 0
+  },
+  BUF_AUDIO_VIVOG723,
+  "Vivo G.723/Siren Audio Codec"
+},
 { { 0 }, 0, "last entry" }
 };