[Mplayer-cvslog] CVS: main/libmpdemux Makefile,1.12,1.13 demuxer.c,1.58,1.59 demuxer.h,1.22,1.23

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mplayer:/var/tmp.root/cvs-serv31515

Modified Files:
	Makefile demuxer.c demuxer.h 
Log Message:
added real demuxer

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile	23 Dec 2001 22:08:47 -0000	1.12
+++ Makefile	26 Dec 2001 22:57:51 -0000	1.13
@@ -3,7 +3,7 @@
 
 include ../config.mak
 
-SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c aviwrite.c demux_asf.c demux_avi.c demux_mov.c demux_mpg.c demux_viv.c demuxer.c dvdauth.c open.c parse_es.c stream.c tv.c tvi_dummy.c tvi_v4l.c frequencies.c demux_fli.c
+SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c aviwrite.c demux_asf.c demux_avi.c demux_mov.c demux_mpg.c demux_viv.c demuxer.c dvdauth.c open.c parse_es.c stream.c tv.c tvi_dummy.c tvi_v4l.c frequencies.c demux_fli.c demux_real.c
 ifeq ($(STREAMING),yes)
 SRCS += asf_streaming.c url.c http.c network.c rtp.c
 endif

Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- demuxer.c	26 Dec 2001 20:44:56 -0000	1.58
+++ demuxer.c	26 Dec 2001 22:57:51 -0000	1.59
@@ -159,6 +159,7 @@
 int demux_asf_fill_buffer(demuxer_t *demux);
 int demux_mov_fill_buffer(demuxer_t *demux,demux_stream_t* ds);
 int demux_vivo_fill_buffer(demuxer_t *demux);
+int demux_real_fill_buffer(demuxer_t *demux);
 #ifdef USE_TV
 #include "tv.h"
 extern tvi_handle_t *tv_handler;
@@ -181,6 +182,7 @@
     case DEMUXER_TYPE_ASF: return demux_asf_fill_buffer(demux);
     case DEMUXER_TYPE_MOV: return demux_mov_fill_buffer(demux,ds);
     case DEMUXER_TYPE_VIVO: return demux_vivo_fill_buffer(demux);
+    case DEMUXER_TYPE_REAL: return demux_real_fill_buffer(demux);
 #ifdef USE_TV
     case DEMUXER_TYPE_TV: return demux_tv_fill_buffer(demux, tv_handler);
 #endif
@@ -362,6 +364,9 @@
 extern int vivo_check_file(demuxer_t *demuxer);
 extern void demux_open_vivo(demuxer_t *demuxer);
 
+extern int real_check_file(demuxer_t *demuxer);
+extern void demux_open_real(demuxer_t *demuxer);
+
 demuxer_t* demux_open(stream_t *stream,int file_format,int audio_id,int video_id,int dvdsub_id){
 
 //int file_format=(*file_format_ptr);
@@ -425,6 +430,14 @@
       file_format=DEMUXER_TYPE_VIVO;
   }
 }
+//=============== Try to open as REAL file: =================
+if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_REAL){
+  demuxer=new_demuxer(stream,DEMUXER_TYPE_REAL,audio_id,video_id,dvdsub_id);
+  if(real_check_file(demuxer)){
+      mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected REAL file format!\n");
+      file_format=DEMUXER_TYPE_REAL;
+  }
+}
 //=============== Try to open as FLI file: =================
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_FLI){
   demuxer=new_demuxer(stream,DEMUXER_TYPE_FLI,audio_id,video_id,dvdsub_id);
@@ -528,6 +541,10 @@
  }
  case DEMUXER_TYPE_VIVO: {
   demux_open_vivo(demuxer);
+  break;
+ }
+ case DEMUXER_TYPE_REAL: {
+  demux_open_real(demuxer);
   break;
  }
  case DEMUXER_TYPE_ASF: {

Index: demuxer.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- demuxer.h	24 Nov 2001 23:58:12 -0000	1.22
+++ demuxer.h	26 Dec 2001 22:57:51 -0000	1.23
@@ -13,6 +13,7 @@
 #define DEMUXER_TYPE_VIVO 8
 #define DEMUXER_TYPE_TV 9
 #define DEMUXER_TYPE_FLI 10
+#define DEMUXER_TYPE_REAL 11
 
 #define DEMUXER_TIME_NONE 0
 #define DEMUXER_TIME_PTS 1