Skip to content

V
vlc-2-2
Commit 38d2de2c authored by Pierre Ynard's avatar Pierre Ynard
Browse files
Options

rtsp: small simplification

parent 48b9ba2f
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 17 deletions
modules/stream_out/rtsp.c
View file @ 38d2de2c
...@@ -905,29 +905,22 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id, ...@@ -905,29 +905,22 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
httpd_ServerIP( cl, ip ); httpd_ServerIP( cl, ip );
/* Specify source IP only if it is different from the
* RTSP control connection server address */
if( strcmp( src, ip ) ) if( strcmp( src, ip ) )
{ {
/* Specify source IP if it is different from the RTSP
* control connection server address */
char *ptr = strchr( src, '%' ); char *ptr = strchr( src, '%' );
if( ptr != NULL ) *ptr = '\0'; /* remove scope ID */ if( ptr != NULL ) *ptr = '\0'; /* remove scope ID */
httpd_MsgAdd( answer, "Transport",
"RTP/AVP/UDP;unicast;source=%s;"
"client_port=%u-%u;server_port=%u-%u;"
"ssrc=%08X;mode=play",
src, loport, loport + 1, sport,
sport + 1, ssrc );
} }
else else
{ src[0] = '\0';
httpd_MsgAdd( answer, "Transport", httpd_MsgAdd( answer, "Transport",
"RTP/AVP/UDP;unicast;" "RTP/AVP/UDP;unicast%s%s;"
"client_port=%u-%u;server_port=%u-%u;" "client_port=%u-%u;server_port=%u-%u;"
"ssrc=%08X;mode=play", "ssrc=%08X;mode=play",
loport, loport + 1, sport, sport + 1, src[0] ? ";source=" : "", src,
ssrc ); loport, loport + 1, sport, sport + 1, ssrc );
}
answer->i_status = 200; answer->i_status = 200;
} }
......
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