[MPlayer-dev-eng] A minor patch to the RTP streaming code

[Ross Finlayson]

This patch prevents a crash if the user trys to specify a "-cache"[*] for a 
RTP stream.  I also improved support for receiving/playing non-MPEG 
codecs.  PCM u-law and a-law streams can now be played - e.g., the audio 
stream of
	rtsp://darwin.horizonlive.com:554/finlayson/sample-h263-ulaw-8000.mov
(Unfortunately the H.263+ video stream does not yet work; I'm still working 
on this.)

	Ross.

-------------- next part --------------
diff -ur MPlayer-20020807/libmpdemux/cache2.c MPlayer-20020807.new/libmpdemux/cache2.c
--- MPlayer-20020807/libmpdemux/cache2.c	Sun May  5 14:43:16 2002
+++ MPlayer-20020807.new/libmpdemux/cache2.c	Thu Aug  8 12:07:45 2002
@@ -199,6 +199,13 @@
 int stream_enable_cache(stream_t *stream,int size,int min,int prefill){
   int ss=(stream->type==STREAMTYPE_VCD)?VCD_SECTOR_DATA:STREAM_BUFFER_SIZE;
   cache_vars_t* s;
+
+  if (stream->fd <= 0) {
+    // The stream has no 'fd' behind it, so is non-cacheable
+    mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n");
+    return 1;
+  }
+
   if(size<32*1024) size=32*1024; // 32kb min
   s=cache_init(size,ss);
   stream->cache_data=s;
diff -ur MPlayer-20020807/libmpdemux/demux_rtp.cpp MPlayer-20020807.new/libmpdemux/demux_rtp.cpp
--- MPlayer-20020807/libmpdemux/demux_rtp.cpp	Sun Aug  4 17:39:07 2002
+++ MPlayer-20020807.new/libmpdemux/demux_rtp.cpp	Thu Aug  8 03:16:46 2002
@@ -162,21 +162,30 @@
 	  // Create a dummy video stream header
 	  // to make the main mplayer code happy:
 	  sh_video_t* sh_video = new_sh_video(demuxer,0);
+	  BITMAPINFOHEADER* bih
+	    = (BITMAPINFOHEADER*)calloc(1,sizeof(BITMAPINFOHEADER));
+	  bih->biSize = sizeof(BITMAPINFOHEADER);
+	  sh_video->bih = bih;
 	  demux_stream_t* d_video = demuxer->video;
 	  d_video->sh = sh_video; sh_video->ds = d_video;
 
-	  // Map known video MIME types to the format code that this prog uses:
+	  // Map known video MIME types to the BITMAPINFOHEADER parameters
+	  // that this program uses.  (Note that not all types need all
+	  // of the parameters to be set.)
 	  if (strcmp(subsession->codecName(), "MPV") == 0 ||
 	      strcmp(subsession->codecName(), "MP1S") == 0 ||
 	      strcmp(subsession->codecName(), "MP2T") == 0) {
 	    isMPEG = 1;
 	  } else if (strcmp(subsession->codecName(), "H263") == 0 ||
 		     strcmp(subsession->codecName(), "H263-1998") == 0) {
-	    sh_video->format = mmioFOURCC('H','2','6','3');
+	    bih->biCompression = sh_video->format
+	      = mmioFOURCC('H','2','6','3');
 	  } else if (strcmp(subsession->codecName(), "H261") == 0) {
-	    sh_video->format = mmioFOURCC('H','2','6','1');
+	    bih->biCompression = sh_video->format
+	      = mmioFOURCC('H','2','6','1');
 	  } else if (strcmp(subsession->codecName(), "JPEG") == 0) {
-	    sh_video->format = mmioFOURCC('M','J','P','G');
+	    bih->biCompression = sh_video->format
+	      = mmioFOURCC('M','J','P','G');
 	  } else {
 	    fprintf(stderr,
 		    "Unknown mplayer format code for MIME type \"video/%s\"\n",
@@ -186,23 +195,37 @@
 	  // Create a dummy audio stream header
 	  // to make the main mplayer code happy:
 	  sh_audio_t* sh_audio = new_sh_audio(demuxer,0);
-	  sh_audio->wf = (WAVEFORMATEX*)calloc(1,sizeof(WAVEFORMATEX));
+	  WAVEFORMATEX* wf = (WAVEFORMATEX*)calloc(1,sizeof(WAVEFORMATEX));
+	  sh_audio->wf = wf;
 	  demux_stream_t* d_audio = demuxer->audio;
 	  d_audio->sh = sh_audio; sh_audio->ds = d_audio;
 
-	  // Map known audio MIME types to the format code that this prog uses:
+	  // Map known audio MIME types to the WAVEFORMATEX parameters
+	  // that this program uses.  (Note that not all types need all
+	  // of the parameters to be set.)
+	  wf->nSamplesPerSec
+	    = subsession->rtpSource()->timestampFrequency(); // by default
 	  if (strcmp(subsession->codecName(), "MPA") == 0 ||
 	      strcmp(subsession->codecName(), "MPA-ROBUST") == 0 ||
 	      strcmp(subsession->codecName(), "X-MP3-DRAFT-00") == 0) {
-	    sh_audio->format = 0x50;
+	    wf->wFormatTag = sh_audio->format = 0x50;
+	    wf->nSamplesPerSec = 0; // sample rate is deduced from the data
 	  } else if (strcmp(subsession->codecName(), "AC3") == 0) {
-	    sh_audio->format = 0x2000;
+	    wf->wFormatTag = sh_audio->format = 0x2000;
+	    wf->nSamplesPerSec = 0; // sample rate is deduced from the data
 	  } else if (strcmp(subsession->codecName(), "PCMU") == 0) {
-	    sh_audio->format = 0x7;
+	    wf->wFormatTag = sh_audio->format = 0x7;
+	    wf->nChannels = 1;
 	  } else if (strcmp(subsession->codecName(), "PCMA") == 0) {
-	    sh_audio->format = 0x6;
+	    wf->wFormatTag = sh_audio->format = 0x6;
+	    wf->nChannels = 1;
 	  } else if (strcmp(subsession->codecName(), "GSM") == 0) {
-	    sh_audio->format = 0x31;
+	    wf->wFormatTag = sh_audio->format = 0x31;
+	    wf->nChannels = 1;
+	    wf->nAvgBytesPerSec = 1650;
+	    wf->nBlockAlign = 33;
+	    wf->wBitsPerSample = 16;
+	    wf->cbSize = 0;
 	  } else {
 	    fprintf(stderr,
 		    "Unknown mplayer format code for MIME type \"audio/%s\"\n",
diff -ur MPlayer-20020807/libmpdemux/demuxer.c MPlayer-20020807.new/libmpdemux/demuxer.c
--- MPlayer-20020807/libmpdemux/demuxer.c	Tue Aug  6 15:01:45 2002
+++ MPlayer-20020807.new/libmpdemux/demuxer.c	Thu Aug  8 03:23:33 2002
@@ -828,7 +828,7 @@
     demuxer = NULL;
   }
 }
-//=============== Try to open as a RTP stream): ===========
+//=============== Try to open as a RTP stream: ===========
  if(file_format==DEMUXER_TYPE_RTP) {
    demuxer=new_demuxer(stream,DEMUXER_TYPE_RTP,audio_id,video_id,dvdsub_id);
  }
diff -ur MPlayer-20020807/libmpdemux/network.c MPlayer-20020807.new/libmpdemux/network.c
--- MPlayer-20020807/libmpdemux/network.c	Sun Aug  4 17:39:07 2002
+++ MPlayer-20020807.new/libmpdemux/network.c	Thu Aug  8 03:22:50 2002
@@ -862,7 +862,7 @@
 			// RTSP/RTP streaming is handled separately:
 			ret = rtsp_streaming_start( stream );
 			if( ret<0 ) {
-				mp_msg(MSGT_NETWORK,MSGL_ERR,"rtsp_rtp_streaming_start failed\n");
+				mp_msg(MSGT_NETWORK,MSGL_ERR,"rtsp_streaming_start failed\n");
 			}
 			break;
 #endif