[Mplayer-cvslog] CVS: main/libmpdemux demux_rtp.cpp,1.10,1.11 demux_rtp_codec.cpp,1.1,1.2

[Arpi of Ize]

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

Modified Files:
	demux_rtp.cpp demux_rtp_codec.cpp 
Log Message:
Motion-JPEG RTP streams can now be played.  Some MPEG-4 ES video RTP
streams can also be played.
patch by Ross Finlayson <finlayson at live.com>


Index: demux_rtp.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rtp.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- demux_rtp.cpp	3 Feb 2003 10:27:50 -0000	1.10
+++ demux_rtp.cpp	9 Feb 2003 17:06:38 -0000	1.11
@@ -147,6 +147,7 @@
     rtpState->sdpDescription = sdpDescription;
     rtpState->rtspClient = rtspClient;
     rtpState->mediaSession = mediaSession;
+    rtpState->audioBufferQueue = rtpState->videoBufferQueue = NULL;
     rtpState->firstSyncTime.tv_sec = rtpState->firstSyncTime.tv_usec = 0;
     demuxer->priv = rtpState;
 

Index: demux_rtp_codec.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rtp_codec.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demux_rtp_codec.cpp	3 Feb 2003 10:27:50 -0000	1.1
+++ demux_rtp_codec.cpp	9 Feb 2003 17:06:38 -0000	1.2
@@ -46,6 +46,16 @@
   } else if (strcmp(subsession->codecName(), "H261") == 0) {
     bih->biCompression = sh_video->format
       = mmioFOURCC('H','2','6','1');
+  } else if (strcmp(subsession->codecName(), "JPEG") == 0) {
+    bih->biCompression = sh_video->format
+      = mmioFOURCC('M','J','P','G');
+#if (LIVEMEDIA_LIBRARY_VERSION_INT < 1044662400)
+    fprintf(stderr, "WARNING: This video stream might not play correctly.  Please upgrade to version \"2003.02.08\" or later of the \"LIVE.COM Streaming Media\" libraries.\n");
+#endif
+  } else if (strcmp(subsession->codecName(), "MP4V-ES") == 0) {
+    bih->biCompression = sh_video->format
+      = mmioFOURCC('m','p','4','v');
+    //flags |= RTPSTATE_IS_MPEG; // MPEG hdr checking in video.c doesn't work!
   } else if (strcmp(subsession->codecName(), "X-QT") == 0 ||
 	     strcmp(subsession->codecName(), "X-QUICKTIME") == 0) {
     // QuickTime generic RTP format, as described in
@@ -130,9 +140,6 @@
     wf->cbSize = 0;
   } else if (strcmp(subsession->codecName(), "MP4A-LATM") == 0) {
     wf->wFormatTag = sh_audio->format = mmioFOURCC('m','p','4','a');
-#ifndef HAVE_FAAD
-    fprintf(stderr, "WARNING: Playing MPEG-4 (AAC) Audio requires the \"faad\" library!\n");
-#endif
 #if (LIVEMEDIA_LIBRARY_VERSION_INT < 1042761600)
     fprintf(stderr, "WARNING: This audio stream might not play correctly.  Please upgrade to version \"2003.01.17\" or later of the \"LIVE.COM Streaming Media\" libraries.\n");
 #else