[MPlayer-cvslog] r31347 - in trunk: DOCS/man/en/mplayer.1 cfg-common-opts.h cfg-common.h libmpdemux/demux_rtp.cpp

[cehoyos]

Author: cehoyos
Date: Tue Jun  8 11:29:14 2010
New Revision: 31347

Log:
Support RTSP/RTP over HTTP via LIVE555.

Patch by Malte Särner, malte D sarner A multiq se

Modified:
   trunk/cfg-common-opts.h
   trunk/cfg-common.h
   trunk/libmpdemux/demux_rtp.cpp

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/en/mplayer.1

Modified: trunk/cfg-common-opts.h
==============================================================================
--- trunk/cfg-common-opts.h	Mon Jun  7 21:01:15 2010	(r31346)
+++ trunk/cfg-common-opts.h	Tue Jun  8 11:29:14 2010	(r31347)
@@ -101,6 +101,9 @@
 
 #ifdef CONFIG_LIVE555
     {"sdp", "-sdp has been removed, use sdp://file instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
+    {"rtsp-stream-over-http", &rtsp_transport_http, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+#else
+    {"rtsp-stream-over-http", "-rtsp-stream-over-http requires the \"LIVE555 Streaming Media\" library.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif /* CONFIG_LIVE555 */
 #if defined(CONFIG_LIBNEMESI) || defined(CONFIG_LIVE555)
     // -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Mon Jun  7 21:01:15 2010	(r31346)
+++ trunk/cfg-common.h	Tue Jun  8 11:29:14 2010	(r31347)
@@ -189,6 +189,7 @@ extern const m_option_t lavfdopts_conf[]
 
 extern int rtspStreamOverTCP;
 extern int rtsp_transport_tcp;
+extern int rtsp_transport_http;
 extern int rtsp_transport_sctp;
 extern int rtsp_port;
 extern char *rtsp_destination;

Modified: trunk/libmpdemux/demux_rtp.cpp
==============================================================================
--- trunk/libmpdemux/demux_rtp.cpp	Mon Jun  7 21:01:15 2010	(r31346)
+++ trunk/libmpdemux/demux_rtp.cpp	Tue Jun  8 11:29:14 2010	(r31347)
@@ -112,8 +112,10 @@ static char* openURL_sip(SIPClient* clie
 
 #ifdef CONFIG_LIBNEMESI
 extern int rtsp_transport_tcp;
+extern int rtsp_transport_http;
 #else
 int rtsp_transport_tcp = 0;
+int rtsp_transport_http = 0;
 #endif
 
 extern int rtsp_port;
@@ -146,7 +148,11 @@ extern "C" demuxer_t* demux_open_rtp(dem
       char const* url = demuxer->stream->streaming_ctrl->url->url;
       extern int verbose;
       if (strcmp(protocol, "rtsp") == 0) {
-	rtspClient = RTSPClient::createNew(*env, verbose, "MPlayer");
+	if (rtsp_transport_http == 1) {
+	  rtsp_transport_http = demuxer->stream->streaming_ctrl->url->port;
+	  rtsp_transport_tcp = 1;
+	}
+	rtspClient = RTSPClient::createNew(*env, verbose, "MPlayer", rtsp_transport_http);
 	if (rtspClient == NULL) {
 	  fprintf(stderr, "Failed to create RTSP client: %s\n",
 		  env->getResultMsg());