mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2024-11-24 10:23:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

stream_output: handle Flushing via sout_MuxFlush()

Browse Source 
Signed-off-by: Thomas Guillem <thomas@gllm.fr>
This commit is contained in:
Steve Lhomme 2015-12-18 11:24:48 +01:00 committed by Thomas Guillem
parent ecacf6f0dd
commit aa505e2cc6
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/vlc_sout.h
View File

@ -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, ... )
{

7
modules/stream_out/standard.c
View File

@ -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;

1
src/libvlccore.sym
View File

@ -384,6 +384,7 @@ sout_MuxDeleteStream
sout_MuxGetStream
sout_MuxNew
sout_MuxSendBuffer
sout_MuxFlush
sout_StreamChainDelete
sout_StreamChainNew
spu_Create

5
src/stream_output/stream_output.c
View File

@ -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