Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
8deea329
Commit
8deea329
authored
Feb 20, 2014
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sout_MuxSendBuffer: use a variable
parent
35861b06
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
src/stream_output/stream_output.c
src/stream_output/stream_output.c
+5
-4
No files found.
src/stream_output/stream_output.c
View file @
8deea329
...
...
@@ -515,14 +515,15 @@ void sout_MuxDeleteStream( sout_mux_t *p_mux, sout_input_t *p_input )
int
sout_MuxSendBuffer
(
sout_mux_t
*
p_mux
,
sout_input_t
*
p_input
,
block_t
*
p_buffer
)
{
mtime_t
i_dts
=
p_buffer
->
i_dts
;
block_FifoPut
(
p_input
->
p_fifo
,
p_buffer
);
if
(
p_mux
->
p_sout
->
i_out_pace_nocontrol
)
{
mtime_t
current_date
=
mdate
();
if
(
current_date
>
p_buffer
->
i_dts
)
if
(
current_date
>
i_dts
)
msg_Warn
(
p_mux
,
"late buffer for mux input (%"
PRId64
")"
,
current_date
-
p_buffer
->
i_dts
);
current_date
-
i_dts
);
}
if
(
p_mux
->
b_waiting_stream
)
...
...
@@ -530,11 +531,11 @@ int sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input,
const
int64_t
i_caching
=
var_GetInteger
(
p_mux
->
p_sout
,
"sout-mux-caching"
)
*
INT64_C
(
1000
);
if
(
p_mux
->
i_add_stream_start
<
0
)
p_mux
->
i_add_stream_start
=
p_buffer
->
i_dts
;
p_mux
->
i_add_stream_start
=
i_dts
;
/* Wait until we have enought data before muxing */
if
(
p_mux
->
i_add_stream_start
<
0
||
p_buffer
->
i_dts
<
p_mux
->
i_add_stream_start
+
i_caching
)
i_dts
<
p_mux
->
i_add_stream_start
+
i_caching
)
return
VLC_SUCCESS
;
p_mux
->
b_waiting_stream
=
false
;
}
...
...
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