Really fix SDP ordering here too (closes #716 again)

diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c
index 1ff60f56d51d37ca793da32009d50fd9c5794e98..a63d3dc3d91a1c06ec5a28cf737848c342006a12 100644 (file)
--- a/modules/misc/rtsp.c
+++ b/modules/misc/rtsp.c
@@ -1245,9 +1245,9 @@ static char *SDPGenerate( const vod_media_t *p_media, httpd_client_t *cl )
         sizeof( "i=*\r\n" ) + strlen( p_media->psz_session_description ) +
         sizeof( "u=*\r\n" ) + strlen( p_media->psz_session_url ) +
         sizeof( "e=*\r\n" ) + strlen( p_media->psz_session_email ) +
+        sizeof( "c=IN IP4 0.0.0.0\r\n" ) + 20 + 10 +
         sizeof( "t=0 0\r\n" ) + /* FIXME */
         sizeof( "a=tool:"PACKAGE_STRING"\r\n" ) +
-        sizeof( "c=IN IP4 0.0.0.0\r\n" ) + 20 + 10 +
         sizeof( "a=range:npt=0-1000000000.000\r\n" );
 
     psz_control = (ipv == '6') ? p_media->psz_rtsp_control_v6
@@ -1284,9 +1284,8 @@ static char *SDPGenerate( const vod_media_t *p_media, httpd_client_t *cl )
         p += sprintf( p, "e=%s\r\n", p_media->psz_session_email );
 
     p += sprintf( p, "c=IN IP%c %s\r\n", ipv, ipv == '6' ? "::" : "0.0.0.0" );
-    p += sprintf( p, "a=tool:"PACKAGE_STRING"\r\n" );
     p += sprintf( p, "t=0 0\r\n" ); /* FIXME */
-
+    p += sprintf( p, "a=tool:"PACKAGE_STRING"\r\n" );
 
     if( p_media->i_length > 0 )
     {

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 579ddb3da081dca235ba6df1f87c31bb24cf2918..c3ab404df335d3d414fc90dced4f2bdde0efd63f 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -525,14 +525,10 @@ static int Open( vlc_object_t *p_this )
 
         /* create the SDP for a muxed stream (only once) */
         /* FIXME  http://www.faqs.org/rfcs/rfc4566.html
-           All text fields should be UTF-8 encoded. Use global a:charset to announce this.
            o= - should be local username (no spaces allowed)
            o= time should be hashed with some other value to garantee uniqueness
            o= don't use the localhost address. use fully qualified domain name or IP4 address
-           p= international phone number (pass via vars?)
-           a= recvonly (missing)
-           a= type:broadcast (missing)
-           a= charset: (normally charset should be UTF-8, this can be used to override s= and i=)
+          a= source-filter: we need our source address
            a= x-plgroup: (missing)
            RTP packets need to get the correct src IP address  */
         if( net_AddressIsMulticast( (vlc_object_t *)p_stream, p_sys->psz_destination ) )
@@ -554,8 +550,10 @@ static int Open( vlc_object_t *p_this )
                   "u=%s\r\n"
                   "e=%s\r\n"
                   "c=IN IP%c %s%s\r\n"
-                  "a=tool:"PACKAGE_STRING"\r\n"
                   "t=0 0\r\n" /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */
+                  "a=tool:"PACKAGE_STRING"\r\n"
+                  "a=recvonly\r\n"
+                  "a=type:broadcast\r\n"
                   "m=video %d RTP/AVP %d\r\n"
                   "a=rtpmap:%d %s\r\n",
                   p_sys->i_sdp_id, p_sys->i_sdp_version,