Skip to content

V
vlc-2-2
Commit 1c07ad88 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Fix RTSP Transport mode handling

parent 07e26cc6
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
modules/stream_out/rtp.c
View file @ 1c07ad88
...@@ -1856,7 +1856,8 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, ...@@ -1856,7 +1856,8 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
else else
if( strncmp( opt, "mode=", 5 ) == 0 ) if( strncmp( opt, "mode=", 5 ) == 0 )
{ {
if( strncasecmp( opt + 5, "\"PLAY\"", 6 ) ) if( strncasecmp( opt + 5, "play", 4 )
&& strncasecmp( opt + 5, "\"PLAY\"", 6 ) )
{ {
/* Not playing?! */ /* Not playing?! */
b_unsupp = VLC_TRUE; b_unsupp = VLC_TRUE;
...@@ -1894,7 +1895,8 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, ...@@ -1894,7 +1895,8 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
answer->i_status = 200; answer->i_status = 200;
httpd_MsgAdd( answer, "Transport", httpd_MsgAdd( answer, "Transport",
"RTP/AVP/UDP;destination=%s;port=%d-%d;ttl=%d", "RTP/AVP/UDP;destination=%s;port=%d-%d;"
"ttl=%d;mode=play",
id->psz_destination, id->i_port, id->i_port+1, id->psz_destination, id->i_port, id->i_port+1,
( p_sys->i_ttl > 0 ) ? p_sys->i_ttl : 1 ); ( p_sys->i_ttl > 0 ) ? p_sys->i_ttl : 1 );
} }
...@@ -1967,14 +1969,16 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, ...@@ -1967,14 +1969,16 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
* control connection server address */ * control connection server address */
httpd_MsgAdd( answer, "Transport", httpd_MsgAdd( answer, "Transport",
"RTP/AVP/UDP;unicast;source=%s;" "RTP/AVP/UDP;unicast;source=%s;"
"client_port=%u-%u;server_port=%u-%u", "client_port=%u-%u;server_port=%u-%u;"
"mode=play",
src, loport, hiport, sport, sport + 1 ); src, loport, hiport, sport, sport + 1 );
} }
else else
{ {
httpd_MsgAdd( answer, "Transport", httpd_MsgAdd( answer, "Transport",
"RTP/AVP/UDP;unicast;" "RTP/AVP/UDP;unicast;"
"client_port=%u-%u;server_port=%u-%u", "client_port=%u-%u;server_port=%u-%u;"
"mode=play",
loport, hiport, sport, sport + 1 ); loport, hiport, sport, sport + 1 );
} }
......
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