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
8e65c917
Commit
8e65c917
authored
May 07, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Undo --sout-udp-auto-mcast
(was not in previous release, so not adding _obsolete).
parent
7b556d01
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
56 deletions
+8
-56
modules/access_output/udp.c
modules/access_output/udp.c
+8
-56
No files found.
modules/access_output/udp.c
View file @
8e65c917
...
@@ -74,9 +74,6 @@ static void Close( vlc_object_t * );
...
@@ -74,9 +74,6 @@ static void Close( vlc_object_t * );
"of packets that will be sent at a time. It " \
"of packets that will be sent at a time. It " \
"helps reducing the scheduling load on " \
"helps reducing the scheduling load on " \
"heavily-loaded systems." )
"heavily-loaded systems." )
#define AUTO_MCAST_TEXT N_("Automatic multicast streaming")
#define AUTO_MCAST_LONGTEXT N_("Allocates an outbound multicast address " \
"automatically.")
vlc_module_begin
();
vlc_module_begin
();
set_description
(
_
(
"UDP stream output"
)
);
set_description
(
_
(
"UDP stream output"
)
);
...
@@ -88,8 +85,6 @@ vlc_module_begin();
...
@@ -88,8 +85,6 @@ vlc_module_begin();
true
);
true
);
add_obsolete_integer
(
SOUT_CFG_PREFIX
"late"
);
add_obsolete_integer
(
SOUT_CFG_PREFIX
"late"
);
add_obsolete_bool
(
SOUT_CFG_PREFIX
"raw"
);
add_obsolete_bool
(
SOUT_CFG_PREFIX
"raw"
);
add_bool
(
SOUT_CFG_PREFIX
"auto-mcast"
,
false
,
NULL
,
AUTO_MCAST_TEXT
,
AUTO_MCAST_LONGTEXT
,
true
);
set_capability
(
"sout access"
,
100
);
set_capability
(
"sout access"
,
100
);
add_shortcut
(
"udp"
);
add_shortcut
(
"udp"
);
...
@@ -101,7 +96,6 @@ vlc_module_end();
...
@@ -101,7 +96,6 @@ vlc_module_end();
*****************************************************************************/
*****************************************************************************/
static
const
char
*
const
ppsz_sout_options
[]
=
{
static
const
char
*
const
ppsz_sout_options
[]
=
{
"auto-mcast"
,
"caching"
,
"caching"
,
"group"
,
"group"
,
NULL
NULL
...
@@ -186,14 +180,6 @@ static int Open( vlc_object_t *p_this )
...
@@ -186,14 +180,6 @@ static int Open( vlc_object_t *p_this )
p_access
->
p_sys
=
p_sys
;
p_access
->
p_sys
=
p_sys
;
i_dst_port
=
DEFAULT_PORT
;
i_dst_port
=
DEFAULT_PORT
;
if
(
var_GetBool
(
p_access
,
SOUT_CFG_PREFIX
"auto-mcast"
))
{
char
buf
[
INET6_ADDRSTRLEN
];
if
(
MakeRandMulticast
(
AF_INET
,
buf
,
sizeof
(
buf
))
!=
NULL
)
psz_dst_addr
=
strdup
(
buf
);
}
else
{
char
*
psz_parser
=
psz_dst_addr
=
strdup
(
p_access
->
psz_path
);
char
*
psz_parser
=
psz_dst_addr
=
strdup
(
p_access
->
psz_path
);
if
(
psz_parser
[
0
]
==
'['
)
if
(
psz_parser
[
0
]
==
'['
)
...
@@ -205,7 +191,6 @@ static int Open( vlc_object_t *p_this )
...
@@ -205,7 +191,6 @@ static int Open( vlc_object_t *p_this )
*
psz_parser
++
=
'\0'
;
*
psz_parser
++
=
'\0'
;
i_dst_port
=
atoi
(
psz_parser
);
i_dst_port
=
atoi
(
psz_parser
);
}
}
}
p_sys
->
p_thread
=
p_sys
->
p_thread
=
vlc_object_create
(
p_access
,
sizeof
(
sout_access_thread_t
)
);
vlc_object_create
(
p_access
,
sizeof
(
sout_access_thread_t
)
);
...
@@ -534,36 +519,3 @@ static void ThreadWrite( vlc_object_t *p_this )
...
@@ -534,36 +519,3 @@ static void ThreadWrite( vlc_object_t *p_this )
i_date_last
=
i_date
;
i_date_last
=
i_date
;
}
}
}
}
static
const
char
*
MakeRandMulticast
(
int
family
,
char
*
buf
,
size_t
buflen
)
{
uint32_t
rand
=
(
getpid
()
&
0xffff
)
|
(
uint32_t
)(((
mdate
()
>>
10
)
&
0xffff
)
<<
16
);
switch
(
family
)
{
#ifdef AF_INET6
case
AF_INET6
:
{
struct
in6_addr
addr
;
memcpy
(
&
addr
,
"
\xff\x38\x00\x00
"
"
\x00\x00\x00\x00
"
"
\x00\x00\x00\x00
"
,
12
);
rand
|=
0x80000000
;
memcpy
(
addr
.
s6_addr
+
12
,
&
(
uint32_t
){
htonl
(
rand
)
},
4
);
return
inet_ntop
(
family
,
&
addr
,
buf
,
buflen
);
}
#endif
case
AF_INET
:
{
struct
in_addr
addr
;
addr
.
s_addr
=
htonl
((
rand
&
0xffffff
)
|
0xe8000000
);
return
inet_ntop
(
family
,
&
addr
,
buf
,
buflen
);
}
}
#ifdef EAFNOSUPPORT
errno
=
EAFNOSUPPORT
;
#endif
return
NULL
;
}
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