Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
94558b79
Commit
94558b79
authored
Jan 22, 2010
by
Pierre Ynard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rtp sout: fix duplicate slashes in RTSP URLs
parent
5cd12c79
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
9 deletions
+8
-9
modules/stream_out/rtsp.c
modules/stream_out/rtsp.c
+8
-9
No files found.
modules/stream_out/rtsp.c
View file @
94558b79
...
...
@@ -52,7 +52,7 @@ struct rtsp_stream_t
httpd_host_t
*
host
;
httpd_url_t
*
url
;
char
*
psz_path
;
const
char
*
track_
fmt
;
const
char
*
track_
sep
;
unsigned
track_id
;
unsigned
port
;
...
...
@@ -94,10 +94,8 @@ rtsp_stream_t *RtspSetup( sout_stream_t *p_stream, const vlc_url_t *url )
goto
error
;
assert
(
strlen
(
rtsp
->
psz_path
)
>
0
);
if
(
rtsp
->
psz_path
[
strlen
(
rtsp
->
psz_path
)
-
1
]
==
'/'
)
rtsp
->
track_fmt
=
"%strackID=%u"
;
else
rtsp
->
track_fmt
=
"%s/trackID=%u"
;
rtsp
->
track_sep
=
rtsp
->
psz_path
[
strlen
(
rtsp
->
psz_path
)
-
1
]
==
'/'
?
""
:
"/"
;
msg_Dbg
(
p_stream
,
"RTSP stream: host %s port %d at %s"
,
url
->
psz_host
,
rtsp
->
port
,
rtsp
->
psz_path
);
...
...
@@ -207,8 +205,8 @@ rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid,
id
->
hiport
=
hiport
;
}
snprintf
(
urlbuf
,
sizeof
(
urlbuf
),
rtsp
->
track_fmt
,
rtsp
->
psz_path
,
id
->
track_id
);
snprintf
(
urlbuf
,
sizeof
(
urlbuf
),
"%s%strackID=%u"
,
rtsp
->
psz_path
,
rtsp
->
track_sep
,
id
->
track_id
);
msg_Dbg
(
rtsp
->
owner
,
"RTSP: adding %s"
,
urlbuf
);
url
=
id
->
url
=
httpd_UrlNewUnique
(
rtsp
->
host
,
urlbuf
,
NULL
,
NULL
,
NULL
);
...
...
@@ -663,8 +661,9 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
else
seq
=
rtp_get_seq
(
tr
->
id
->
sout_id
);
infolen
+=
sprintf
(
info
+
infolen
,
"url=%s/trackID=%u;seq=%u;rtptime=%u, "
,
control
,
tr
->
id
->
track_id
,
seq
,
"url=%s%strackID=%u;seq=%u;rtptime=%u, "
,
control
,
rtsp
->
track_sep
,
tr
->
id
->
track_id
,
seq
,
rtp_compute_ts
(
tr
->
id
->
sout_id
,
ts
)
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment