Changeset 93020752782611894027dae8276b1a489ac5eea3

Timestamp:

09/08/06 21:50:25 (2 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1157745025 +0000

git-parent:

[68b76a9c2818db636384729d67698fca58a615d2]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1157745025 +0000

Message:

Fix SDP line ordering (closes #716)

Files:

• modules/misc/rtsp.c (modified) (1 diff)
• modules/stream_out/rtp.c (modified) (2 diffs)

modules/misc/rtsp.c

@@ -1284 +1284 @@
-        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 */
-
-
-
+
-
-    if( p_media->i_length > 0 )

modules/stream_out/rtp.c

@@ -525 +525 @@
-
-        /* create the SDP for a muxed stream (only once) */
-2327
+4566
-           All text fields should be UTF-8 encoded. Use global a:charset to announce this.
-           o= - should be local username (no spaces allowed)
-
-
+
-           o= don't use the localhost address. use fully qualified domain name or IP4 address
-           p= international phone number (pass via vars?)
-           c= IP6 support
-           a= recvonly (missing)
-           a= type:broadcast (missing)
@@ -556 +554 @@
-                  "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"
-                  "c=IN IP%c %s%s\r\n"
-                  "m=video %d RTP/AVP %d\r\n"
-                  "a=rtpmap:%d %s\r\n",