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
b4e6c46e
Commit
b4e6c46e
authored
Dec 23, 2009
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stream_out: keep caching value in the mux_sys_t struct iso of asking it every time.
parent
59c9e899
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
include/vlc_sout.h
include/vlc_sout.h
+1
-0
src/stream_output/stream_output.c
src/stream_output/stream_output.c
+5
-1
No files found.
include/vlc_sout.h
View file @
b4e6c46e
...
@@ -156,6 +156,7 @@ struct sout_mux_t
...
@@ -156,6 +156,7 @@ struct sout_mux_t
bool
b_waiting_stream
;
bool
b_waiting_stream
;
/* we wait one second after first stream added */
/* we wait one second after first stream added */
mtime_t
i_add_stream_start
;
mtime_t
i_add_stream_start
;
mtime_t
i_caching
;
};
};
enum
sout_mux_query_e
enum
sout_mux_query_e
...
...
src/stream_output/stream_output.c
View file @
b4e6c46e
...
@@ -432,6 +432,7 @@ sout_mux_t * sout_MuxNew( sout_instance_t *p_sout, char *psz_mux,
...
@@ -432,6 +432,7 @@ sout_mux_t * sout_MuxNew( sout_instance_t *p_sout, char *psz_mux,
p_mux
->
b_add_stream_any_time
=
false
;
p_mux
->
b_add_stream_any_time
=
false
;
p_mux
->
b_waiting_stream
=
true
;
p_mux
->
b_waiting_stream
=
true
;
p_mux
->
i_add_stream_start
=
-
1
;
p_mux
->
i_add_stream_start
=
-
1
;
p_mux
->
i_caching
=
var_GetInteger
(
p_mux
->
p_sout
,
"sout-mux-caching"
)
*
INT64_C
(
1000
);
vlc_object_attach
(
p_mux
,
p_sout
);
vlc_object_attach
(
p_mux
,
p_sout
);
...
@@ -592,13 +593,16 @@ void sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input,
...
@@ -592,13 +593,16 @@ void sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input,
{
{
mtime_t
current_date
=
mdate
();
mtime_t
current_date
=
mdate
();
if
(
current_date
>
p_buffer
->
i_dts
)
if
(
current_date
>
p_buffer
->
i_dts
)
{
msg_Warn
(
p_mux
,
"late buffer for mux input (%"
PRId64
")"
,
msg_Warn
(
p_mux
,
"late buffer for mux input (%"
PRId64
")"
,
current_date
-
p_buffer
->
i_dts
);
current_date
-
p_buffer
->
i_dts
);
p_mux
->
b_waiting_stream
=
false
;
}
}
}
if
(
p_mux
->
b_waiting_stream
)
if
(
p_mux
->
b_waiting_stream
)
{
{
const
int64_t
i_caching
=
var_GetInteger
(
p_mux
->
p_sout
,
"sout-mux-caching"
)
*
INT64_C
(
1000
)
;
const
int64_t
i_caching
=
p_mux
->
i_caching
;
if
(
p_mux
->
i_add_stream_start
<
0
)
if
(
p_mux
->
i_add_stream_start
<
0
)
p_mux
->
i_add_stream_start
=
p_buffer
->
i_dts
;
p_mux
->
i_add_stream_start
=
p_buffer
->
i_dts
;
...
...
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