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
926ffdc2
Commit
926ffdc2
authored
Apr 25, 2004
by
Gildas Bazin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* src/stream_output/stream_output.c: small coding style changes.
parent
3e63b534
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
16 deletions
+24
-16
src/stream_output/stream_output.c
src/stream_output/stream_output.c
+24
-16
No files found.
src/stream_output/stream_output.c
View file @
926ffdc2
...
@@ -79,12 +79,14 @@ sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest )
...
@@ -79,12 +79,14 @@ sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest )
else
if
(
keep
.
b_bool
)
else
if
(
keep
.
b_bool
)
{
{
msg_Warn
(
p_parent
,
"sout-keep true"
);
msg_Warn
(
p_parent
,
"sout-keep true"
);
if
(
(
p_sout
=
vlc_object_find
(
p_parent
,
VLC_OBJECT_SOUT
,
FIND_ANYWHERE
)
)
)
if
(
(
p_sout
=
vlc_object_find
(
p_parent
,
VLC_OBJECT_SOUT
,
FIND_ANYWHERE
)
)
)
{
{
if
(
!
strcmp
(
p_sout
->
psz_sout
,
psz_dest
)
)
if
(
!
strcmp
(
p_sout
->
psz_sout
,
psz_dest
)
)
{
{
msg_Warn
(
p_parent
,
"sout keep : reusing sout"
);
msg_Warn
(
p_parent
,
"sout keep : reusing sout"
);
msg_Warn
(
p_parent
,
"sout keep : you probably want to use gather stream_out"
);
msg_Warn
(
p_parent
,
"sout keep : you probably want to use "
"gather stream_out"
);
vlc_object_detach
(
p_sout
);
vlc_object_detach
(
p_sout
);
vlc_object_attach
(
p_sout
,
p_parent
);
vlc_object_attach
(
p_sout
,
p_parent
);
vlc_object_release
(
p_sout
);
vlc_object_release
(
p_sout
);
...
@@ -99,7 +101,8 @@ sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest )
...
@@ -99,7 +101,8 @@ sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest )
}
}
else
if
(
!
keep
.
b_bool
)
else
if
(
!
keep
.
b_bool
)
{
{
while
(
(
p_sout
=
vlc_object_find
(
p_parent
,
VLC_OBJECT_SOUT
,
FIND_PARENT
)
)
)
while
(
(
p_sout
=
vlc_object_find
(
p_parent
,
VLC_OBJECT_SOUT
,
FIND_PARENT
)
)
)
{
{
msg_Warn
(
p_parent
,
"sout keep : destroying old sout"
);
msg_Warn
(
p_parent
,
"sout keep : destroying old sout"
);
sout_DeleteInstance
(
p_sout
);
sout_DeleteInstance
(
p_sout
);
...
@@ -353,9 +356,8 @@ int sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer )
...
@@ -353,9 +356,8 @@ int sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer )
/*****************************************************************************
/*****************************************************************************
* sout_MuxNew: create a new mux
* sout_MuxNew: create a new mux
*****************************************************************************/
*****************************************************************************/
sout_mux_t
*
sout_MuxNew
(
sout_instance_t
*
p_sout
,
sout_mux_t
*
sout_MuxNew
(
sout_instance_t
*
p_sout
,
char
*
psz_mux
,
char
*
psz_mux
,
sout_access_out_t
*
p_access
)
sout_access_out_t
*
p_access
)
{
{
sout_mux_t
*
p_mux
;
sout_mux_t
*
p_mux
;
char
*
psz_next
;
char
*
psz_next
;
...
@@ -564,7 +566,7 @@ void sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input,
...
@@ -564,7 +566,7 @@ void sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input,
/*****************************************************************************
/*****************************************************************************
*
*
*****************************************************************************/
*****************************************************************************/
static
int
mrl_Parse
(
mrl_t
*
p_mrl
,
char
*
psz_mrl
)
static
int
mrl_Parse
(
mrl_t
*
p_mrl
,
char
*
psz_mrl
)
{
{
char
*
psz_dup
=
strdup
(
psz_mrl
);
char
*
psz_dup
=
strdup
(
psz_mrl
);
char
*
psz_parser
=
psz_dup
;
char
*
psz_parser
=
psz_dup
;
...
@@ -764,7 +766,8 @@ static char *_get_chain_end( char *str )
...
@@ -764,7 +766,8 @@ static char *_get_chain_end( char *str )
}
}
}
}
}
}
else
if
(
*
p
==
'\0'
||
*
p
==
','
||
*
p
==
'}'
||
*
p
==
' '
||
*
p
==
'\t'
)
else
if
(
*
p
==
'\0'
||
*
p
==
','
||
*
p
==
'}'
||
*
p
==
' '
||
*
p
==
'\t'
)
{
{
return
p
;
return
p
;
}
}
...
@@ -818,7 +821,8 @@ char * sout_cfg_parser( char **ppsz_name, sout_cfg_t **pp_cfg, char *psz_chain )
...
@@ -818,7 +821,8 @@ char * sout_cfg_parser( char **ppsz_name, sout_cfg_t **pp_cfg, char *psz_chain )
psz_name
=
p
;
psz_name
=
p
;
while
(
*
p
&&
*
p
!=
'='
&&
*
p
!=
','
&&
*
p
!=
'}'
&&
*
p
!=
' '
&&
*
p
!=
'\t'
)
while
(
*
p
&&
*
p
!=
'='
&&
*
p
!=
','
&&
*
p
!=
'}'
&&
*
p
!=
' '
&&
*
p
!=
'\t'
)
{
{
p
++
;
p
++
;
}
}
...
@@ -924,7 +928,8 @@ static void sout_cfg_free( sout_cfg_t *p_cfg )
...
@@ -924,7 +928,8 @@ static void sout_cfg_free( sout_cfg_t *p_cfg )
}
}
}
}
void
__sout_ParseCfg
(
vlc_object_t
*
p_this
,
char
*
psz_prefix
,
const
char
**
ppsz_options
,
sout_cfg_t
*
cfg
)
void
__sout_ParseCfg
(
vlc_object_t
*
p_this
,
char
*
psz_prefix
,
const
char
**
ppsz_options
,
sout_cfg_t
*
cfg
)
{
{
char
*
psz_name
;
char
*
psz_name
;
int
i_type
;
int
i_type
;
...
@@ -960,8 +965,10 @@ void __sout_ParseCfg( vlc_object_t *p_this, char *psz_prefix, const char **ppsz_
...
@@ -960,8 +965,10 @@ void __sout_ParseCfg( vlc_object_t *p_this, char *psz_prefix, const char **ppsz_
{
{
break
;
break
;
}
}
if
(
(
!
strncmp
(
cfg
->
psz_name
,
"no-"
,
3
)
&&
!
strcmp
(
ppsz_options
[
i
],
cfg
->
psz_name
+
3
)
)
||
if
(
(
!
strncmp
(
cfg
->
psz_name
,
"no-"
,
3
)
&&
(
!
strncmp
(
cfg
->
psz_name
,
"no"
,
2
)
&&
!
strcmp
(
ppsz_options
[
i
],
cfg
->
psz_name
+
2
)
)
)
!
strcmp
(
ppsz_options
[
i
],
cfg
->
psz_name
+
3
)
)
||
(
!
strncmp
(
cfg
->
psz_name
,
"no"
,
2
)
&&
!
strcmp
(
ppsz_options
[
i
],
cfg
->
psz_name
+
2
)
)
)
{
{
b_yes
=
VLC_FALSE
;
b_yes
=
VLC_FALSE
;
break
;
break
;
...
@@ -980,7 +987,8 @@ void __sout_ParseCfg( vlc_object_t *p_this, char *psz_prefix, const char **ppsz_
...
@@ -980,7 +987,8 @@ void __sout_ParseCfg( vlc_object_t *p_this, char *psz_prefix, const char **ppsz_
i_type
=
config_GetType
(
p_this
,
psz_name
);
i_type
=
config_GetType
(
p_this
,
psz_name
);
if
(
!
i_type
)
if
(
!
i_type
)
{
{
msg_Warn
(
p_this
,
"unknown option %s (value=%s)"
,
cfg
->
psz_name
,
cfg
->
psz_value
);
msg_Warn
(
p_this
,
"unknown option %s (value=%s)"
,
cfg
->
psz_name
,
cfg
->
psz_value
);
goto
next
;
goto
next
;
}
}
if
(
i_type
!=
VLC_VAR_BOOL
&&
cfg
->
psz_value
==
NULL
)
if
(
i_type
!=
VLC_VAR_BOOL
&&
cfg
->
psz_value
==
NULL
)
...
@@ -1021,8 +1029,7 @@ void __sout_ParseCfg( vlc_object_t *p_this, char *psz_prefix, const char **ppsz_
...
@@ -1021,8 +1029,7 @@ void __sout_ParseCfg( vlc_object_t *p_this, char *psz_prefix, const char **ppsz_
/*
/*
* XXX name and p_cfg are used (-> do NOT free them)
* XXX name and p_cfg are used (-> do NOT free them)
*/
*/
sout_stream_t
*
sout_stream_new
(
sout_instance_t
*
p_sout
,
sout_stream_t
*
sout_stream_new
(
sout_instance_t
*
p_sout
,
char
*
psz_chain
)
char
*
psz_chain
)
{
{
sout_stream_t
*
p_stream
;
sout_stream_t
*
p_stream
;
...
@@ -1091,7 +1098,8 @@ static char *_sout_stream_url_to_chain( vlc_object_t *p_this, char *psz_url )
...
@@ -1091,7 +1098,8 @@ static char *_sout_stream_url_to_chain( vlc_object_t *p_this, char *psz_url )
if
(
config_GetInt
(
p_this
,
"sout-display"
)
)
if
(
config_GetInt
(
p_this
,
"sout-display"
)
)
{
{
p
+=
sprintf
(
p
,
"duplicate{dst=display,dst=std{mux=
\"
%s
\"
,access=
\"
%s
\"
,url=
\"
%s
\"
}}"
,
p
+=
sprintf
(
p
,
"duplicate{dst=display,dst=std{mux=
\"
%s
\"
,"
"access=
\"
%s
\"
,url=
\"
%s
\"
}}"
,
mrl
.
psz_way
,
mrl
.
psz_access
,
mrl
.
psz_name
);
mrl
.
psz_way
,
mrl
.
psz_access
,
mrl
.
psz_name
);
}
}
else
else
...
...
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