Commit 93020752 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Fix SDP line ordering (closes #716)

parent 68b76a9c
...@@ -1283,10 +1283,10 @@ static char *SDPGenerate( const vod_media_t *p_media, httpd_client_t *cl ) ...@@ -1283,10 +1283,10 @@ static char *SDPGenerate( const vod_media_t *p_media, httpd_client_t *cl )
if( *p_media->psz_session_email ) if( *p_media->psz_session_email )
p += sprintf( p, "e=%s\r\n", p_media->psz_session_email ); p += sprintf( p, "e=%s\r\n", p_media->psz_session_email );
p += sprintf( p, "t=0 0\r\n" ); /* FIXME */ 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, "a=tool:"PACKAGE_STRING"\r\n" );
p += sprintf( p, "t=0 0\r\n" ); /* FIXME */
p += sprintf( p, "c=IN IP%c %s\r\n", ipv, ipv == '6' ? "::" : "0.0.0.0" );
if( p_media->i_length > 0 ) if( p_media->i_length > 0 )
{ {
......
...@@ -524,14 +524,12 @@ static int Open( vlc_object_t *p_this ) ...@@ -524,14 +524,12 @@ static int Open( vlc_object_t *p_this )
} }
/* create the SDP for a muxed stream (only once) */ /* create the SDP for a muxed stream (only once) */
/* FIXME http://www.faqs.org/rfcs/rfc2327.html /* FIXME http://www.faqs.org/rfcs/rfc4566.html
All text fields should be UTF-8 encoded. Use global a:charset to announce this. All text fields should be UTF-8 encoded. Use global a:charset to announce this.
o= - should be local username (no spaces allowed) o= - should be local username (no spaces allowed)
o= time should be hashed with some other value to garantue uniqueness o= time should be hashed with some other value to garantee uniqueness
o= we need IP6 support?
o= don't use the localhost address. use fully qualified domain name or IP4 address o= don't use the localhost address. use fully qualified domain name or IP4 address
p= international phone number (pass via vars?) p= international phone number (pass via vars?)
c= IP6 support
a= recvonly (missing) a= recvonly (missing)
a= type:broadcast (missing) a= type:broadcast (missing)
a= charset: (normally charset should be UTF-8, this can be used to override s= and i=) a= charset: (normally charset should be UTF-8, this can be used to override s= and i=)
...@@ -555,9 +553,9 @@ static int Open( vlc_object_t *p_this ) ...@@ -555,9 +553,9 @@ static int Open( vlc_object_t *p_this )
"i=%s\r\n" "i=%s\r\n"
"u=%s\r\n" "u=%s\r\n"
"e=%s\r\n" "e=%s\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" "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 */
"m=video %d RTP/AVP %d\r\n" "m=video %d RTP/AVP %d\r\n"
"a=rtpmap:%d %s\r\n", "a=rtpmap:%d %s\r\n",
p_sys->i_sdp_id, p_sys->i_sdp_version, p_sys->i_sdp_id, p_sys->i_sdp_version,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment