Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
f2fb8b7f
Commit
f2fb8b7f
authored
Feb 27, 2007
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not force a default TTL value (the value 1 will be used in SDP only).
parent
a9a6e8ca
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
9 deletions
+4
-9
modules/stream_out/rtp.c
modules/stream_out/rtp.c
+4
-9
No files found.
modules/stream_out/rtp.c
View file @
f2fb8b7f
...
@@ -390,13 +390,9 @@ static int Open( vlc_object_t *p_this )
...
@@ -390,13 +390,9 @@ static int Open( vlc_object_t *p_this )
/* must not exceed 999 once formatted */
/* must not exceed 999 once formatted */
if
(
val
.
i_int
<
0
)
if
(
val
.
i_int
<
0
)
{
msg_Warn
(
p_stream
,
"illegal TTL %d, the SDP advertised value will be faked"
,
val
.
i_int
);
msg_Warn
(
p_stream
,
"illegal TTL %d, using 1"
,
val
.
i_int
);
val
.
i_int
=
-
1
;
}
p_sys
->
i_ttl
=
val
.
i_int
;
p_sys
->
i_ttl
=
val
.
i_int
;
var_Get
(
p_stream
,
SOUT_CFG_PREFIX
"mp4a-latm"
,
&
val
);
var_Get
(
p_stream
,
SOUT_CFG_PREFIX
"mp4a-latm"
,
&
val
);
p_sys
->
b_latm
=
val
.
b_bool
;
p_sys
->
b_latm
=
val
.
b_bool
;
...
@@ -536,8 +532,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -536,8 +532,7 @@ static int Open( vlc_object_t *p_this )
a= source-filter: we need our source address
a= source-filter: we need our source address
a= x-plgroup: (missing)
a= x-plgroup: (missing)
RTP packets need to get the correct src IP address */
RTP packets need to get the correct src IP address */
if
(
(
ipv
==
4
)
if
(
ipv
==
4
&&
net_AddressIsMulticast
(
VLC_OBJECT
(
p_stream
),
p_sys
->
psz_destination
)
)
&&
net_AddressIsMulticast
(
(
vlc_object_t
*
)
p_stream
,
p_sys
->
psz_destination
)
)
{
{
snprintf
(
psz_ttl
,
sizeof
(
psz_ttl
),
"/%d"
,
p_sys
->
i_ttl
);
snprintf
(
psz_ttl
,
sizeof
(
psz_ttl
),
"/%d"
,
p_sys
->
i_ttl
);
psz_ttl
[
sizeof
(
psz_ttl
)
-
1
]
=
'\0'
;
psz_ttl
[
sizeof
(
psz_ttl
)
-
1
]
=
'\0'
;
...
@@ -858,7 +853,7 @@ static char *SDPGenerate( const sout_stream_t *p_stream,
...
@@ -858,7 +853,7 @@ static char *SDPGenerate( const sout_stream_t *p_stream,
{
{
/* Add the ttl if it is a multicast address */
/* Add the ttl if it is a multicast address */
/* FIXME: 1 is not a correct default value in the case of IPv6 */
/* FIXME: 1 is not a correct default value in the case of IPv6 */
p
+=
sprintf
(
p
,
"/%d
\r\n
"
,
p_sys
->
i_ttl
?:
1
);
p
+=
sprintf
(
p
,
"/%d
\r\n
"
,
p_sys
->
i_ttl
?
p_sys
->
i_ttl
:
1
);
}
}
else
else
{
{
...
@@ -1825,7 +1820,7 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
...
@@ -1825,7 +1820,7 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args,
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"
,
id
->
psz_destination
,
id
->
i_port
,
id
->
i_port
+
1
,
id
->
psz_destination
,
id
->
i_port
,
id
->
i_port
+
1
,
p_sys
->
i_ttl
);
p_sys
->
i_ttl
>
0
?
p_sys
->
i_ttl
:
1
);
}
}
else
if
(
strstr
(
psz_transport
,
"unicast"
)
&&
strstr
(
psz_transport
,
"client_port="
)
)
else
if
(
strstr
(
psz_transport
,
"unicast"
)
&&
strstr
(
psz_transport
,
"client_port="
)
)
{
{
...
...
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