* trackID changes for the VLC rtsp server as suggested by Leonardo ... <leonardo_c...

  - apparently DSS is casesensitive on trackID.

diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c
index a9a41838af67adec3a6098169a408fdbc8dc4610..8150d9c607f8d20952ba1c9178fd3d470311f96b 100644 (file)
--- a/modules/misc/rtsp.c
+++ b/modules/misc/rtsp.c
@@ -306,10 +306,10 @@ static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name,
     msg_Dbg( p_vod, "created rtsp url: %s", p_media->psz_rtsp_path );
 
     asprintf( &p_media->psz_rtsp_control_v4,
-               "a=control:rtsp://%%s:%d%s/trackid=%%d\r\n",
+               "a=control:rtsp://%%s:%d%s/trackID=%%d\r\n",
                p_sys->i_port, p_media->psz_rtsp_path );
     asprintf( &p_media->psz_rtsp_control_v6,
-               "a=control:rtsp://[%%s]:%d%s/trackid=%%d\r\n",
+               "a=control:rtsp://[%%s]:%d%s/trackID=%%d\r\n",
               p_sys->i_port, p_media->psz_rtsp_path );
 
     httpd_UrlCatch( p_media->p_rtsp_url, HTTPD_MSG_SETUP,
@@ -386,7 +386,7 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt )
     p_media->psz_mux = NULL;
 
     /* TODO: update SDP, etc... */
-    asprintf( &psz_urlc, "%s/trackid=%d",
+    asprintf( &psz_urlc, "%s/trackID=%d",
               p_media->psz_rtsp_path, p_media->i_es );
     msg_Dbg( p_vod, "  - ES %4.4s (%s)", (char *)&p_fmt->i_codec, psz_urlc );
 

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index a3d48c335f0e6bf6565c9e75eac5b671aaf1536f..c2b0bc49d54793bb1a3066b4c47777e5641c59a4 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -792,7 +792,7 @@ static char *SDPGenerate( const sout_stream_t *p_stream,
         }
         if( b_rtsp )
         {
-            i_size += strlen( "a=control:*/trackid=*\r\n" ) + strlen( p_sys->psz_rtsp_control ) + 10;
+            i_size += strlen( "a=control:*/trackID=*\r\n" ) + strlen( p_sys->psz_rtsp_control ) + 10;
         }
     }
     if( p_sys->p_mux )
@@ -862,7 +862,7 @@ static char *SDPGenerate( const sout_stream_t *p_stream,
         }
         if( b_rtsp )
         {
-            p += sprintf( p, "a=control:%s/trackid=%d\r\n", p_sys->psz_rtsp_control, i );
+            p += sprintf( p, "a=control:trackID=%d\r\n", i );
         }
     }
     if( p_sys->p_mux )
@@ -1134,7 +1134,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     {
         char psz_urlc[strlen( p_sys->psz_rtsp_control ) + 1 + 10];
 
-        sprintf( psz_urlc, "%s/trackid=%d", p_sys->psz_rtsp_path, p_sys->i_es );
+        sprintf( psz_urlc, "%s/trackID=%d", p_sys->psz_rtsp_path, p_sys->i_es );
         msg_Dbg( p_stream, "rtsp: adding %s\n", psz_urlc );
         id->p_rtsp_url = httpd_UrlNewUnique( p_sys->p_rtsp_host, psz_urlc, NULL, NULL, NULL );