send proper info in m= line of SAP announcements:

  m=video 1234 udp 33      for raw UDP
  m=video 1234 RTP/AVP 33  for RTP

diff --git a/include/stream_output.h b/include/stream_output.h
index 26a76b7c2c0b438427f0c72ce1ac5e7b365a6c93..6a060b4fa6129d920e253b52e1c4bffe0aeb602d 100644 (file)
--- a/include/stream_output.h
+++ b/include/stream_output.h
@@ -253,6 +253,7 @@ struct session_descriptor_t
 
     sap_session_t *p_sap; /* If we have a sap session, remember it */
     char *psz_sdp;
+    vlc_bool_t b_rtp;
 };
 
 #define METHOD_TYPE_SAP 1

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index 823aa39a51e77fb2e243d4b83856f5324157706f..fbbc0fa44fa050f7388e8411d7b9b6ed83cfa21c 100644 (file)
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -369,6 +369,7 @@ static int Open( vlc_object_t *p_this )
 
             p_session->i_ttl = config_GetInt( p_sout, "ttl" );
             p_session->i_payload = 33;
+            p_session->b_rtp = strstr( psz_access, "rtp") ? 1 : 0;
 
             msg_Info( p_this, "SAP Enabled");
 

diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
index 82d73e3d837706666673da952ab392ae759946d0..eafffec7f8536bc609315a3a8bedc84f9dbff6cd 100644 (file)
--- a/src/stream_output/sap.c
+++ b/src/stream_output/sap.c
@@ -615,15 +615,16 @@ static char *SDPGenerate( sap_handler_t *p_sap,
                             "s=%s\r\n"
                             "t=0 0\r\n"
                             "c=IN IP%c %s/%d\r\n"
-                            "m=video %d udp %d\r\n"
+                            "m=video %d %s %d\r\n"
                             "a=tool:"PACKAGE_STRING"\r\n"
                             "a=type:broadcast\r\n"
                             "%s%s%s",
                             i_sdp_id, i_sdp_version,
                             ipv, p_addr->psz_machine,
-                            psz_name, ipv,
-                            psz_uri, p_session->i_ttl,
-                            p_session->i_port, p_session->i_payload,
+                            psz_name, ipv, psz_uri, p_session->i_ttl,
+                            p_session->i_port, 
+                            p_session->b_rtp ? "RTP/AVP" : "udp",
+                            p_session->i_payload,
                             psz_group ? "a=x-plgroup:" : "",
                             psz_group ? psz_group : "", psz_group ? "\r\n" : "" ) == -1 )
         return NULL;