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
aa505e2c
Commit
aa505e2c
authored
Dec 18, 2015
by
Steve Lhomme
Committed by
Thomas Guillem
Dec 22, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stream_output: handle Flushing via sout_MuxFlush()
Signed-off-by:
Thomas Guillem
<
thomas@gllm.fr
>
parent
ecacf6f0
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
0 deletions
+14
-0
include/vlc_sout.h
include/vlc_sout.h
+1
-0
modules/stream_out/standard.c
modules/stream_out/standard.c
+7
-0
src/libvlccore.sym
src/libvlccore.sym
+1
-0
src/stream_output/stream_output.c
src/stream_output/stream_output.c
+5
-0
No files found.
include/vlc_sout.h
View file @
aa505e2c
...
...
@@ -175,6 +175,7 @@ VLC_API void sout_MuxDeleteStream( sout_mux_t *, sout_input_t * );
VLC_API
void
sout_MuxDelete
(
sout_mux_t
*
);
VLC_API
int
sout_MuxSendBuffer
(
sout_mux_t
*
,
sout_input_t
*
,
block_t
*
);
VLC_API
int
sout_MuxGetStream
(
sout_mux_t
*
,
unsigned
,
mtime_t
*
);
VLC_API
void
sout_MuxFlush
(
sout_mux_t
*
,
sout_input_t
*
);
static
inline
int
sout_MuxControl
(
sout_mux_t
*
p_mux
,
int
i_query
,
...
)
{
...
...
modules/stream_out/standard.c
View file @
aa505e2c
...
...
@@ -143,6 +143,12 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
{
return
sout_MuxSendBuffer
(
p_stream
->
p_sys
->
p_mux
,
(
sout_input_t
*
)
id
,
p_buffer
);
}
static
void
Flush
(
sout_stream_t
*
p_stream
,
sout_stream_id_sys_t
*
id
)
{
sout_MuxFlush
(
p_stream
->
p_sys
->
p_mux
,
(
sout_input_t
*
)
id
);
}
static
void
create_SDP
(
sout_stream_t
*
p_stream
,
sout_access_out_t
*
p_access
)
{
sout_stream_sys_t
*
p_sys
=
p_stream
->
p_sys
;
...
...
@@ -405,6 +411,7 @@ static int Open( vlc_object_t *p_this )
p_stream
->
pf_add
=
Add
;
p_stream
->
pf_del
=
Del
;
p_stream
->
pf_send
=
Send
;
p_stream
->
pf_flush
=
Flush
;
if
(
!
sout_AccessOutCanControlPace
(
p_access
)
)
p_stream
->
pace_nocontrol
=
true
;
...
...
src/libvlccore.sym
View file @
aa505e2c
...
...
@@ -384,6 +384,7 @@ sout_MuxDeleteStream
sout_MuxGetStream
sout_MuxNew
sout_MuxSendBuffer
sout_MuxFlush
sout_StreamChainDelete
sout_StreamChainNew
spu_Create
...
...
src/stream_output/stream_output.c
View file @
aa505e2c
...
...
@@ -562,6 +562,11 @@ int sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input,
return
p_mux
->
pf_mux
(
p_mux
);
}
void
sout_MuxFlush
(
sout_mux_t
*
p_mux
,
sout_input_t
*
p_input
)
{
VLC_UNUSED
(
p_mux
);
block_FifoEmpty
(
p_input
->
p_fifo
);
}
/*****************************************************************************
* sout_MuxGetStream: find stream to be muxed
...
...
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