#include <vlc_meta.h>
#include <vlc_block.h>
+#include <vlc_codec.h>
#include "input/input_interface.h"
+#define VLC_CODEC_NULL VLC_FOURCC( 'n', 'u', 'l', 'l' )
+
#undef DEBUG_BUFFER
/*****************************************************************************
* Local prototypes
msg_Dbg( p_sout, "adding a new sout input (sout_input:%p)", p_input );
- if( p_fmt->i_codec == VLC_FOURCC( 'n', 'u', 'l', 'l' ) )
+ if( p_fmt->i_codec == VLC_CODEC_NULL )
{
vlc_object_release( p_sout );
return p_input;
msg_Dbg( p_sout, "removing a sout input (sout_input:%p)", p_input );
- if( p_input->p_fmt->i_codec != VLC_FOURCC( 'n', 'u', 'l', 'l' ) )
+ if( p_input->p_fmt->i_codec != VLC_CODEC_NULL )
{
vlc_mutex_lock( &p_sout->lock );
p_sout->p_stream->pf_del( p_sout->p_stream, p_input->id );
sout_instance_t *p_sout = p_input->p_sout;
int i_ret;
- if( p_input->p_fmt->i_codec == VLC_FOURCC( 'n', 'u', 'l', 'l' ) )
+ if( p_input->p_fmt->i_codec == VLC_CODEC_NULL )
{
block_Release( p_buffer );
return VLC_SUCCESS;
p_access->i_writes = 0;
p_access->i_sent_bytes = 0;
+ vlc_object_set_name( p_access, p_access->psz_access );
vlc_object_attach( p_access, p_sout );
p_access->p_module =
p_mux->b_waiting_stream = true;
p_mux->i_add_stream_start = -1;
+ vlc_object_set_name( p_mux, p_mux->psz_mux );
vlc_object_attach( p_mux, p_sout );
p_mux->p_module =
msg_Dbg( p_sout, "stream=`%s'", p_stream->psz_name );
+ vlc_object_set_name( p_stream, p_stream->psz_name );
vlc_object_attach( p_stream, p_sout );
p_stream->p_module =
mrl_Clean( &mrl );
return psz_chain;
}
+
+#undef sout_EncoderCreate
+encoder_t *sout_EncoderCreate( vlc_object_t *p_this )
+{
+ static const char type[] = "encoder";
+ return vlc_custom_create( p_this, sizeof( encoder_t ), VLC_OBJECT_GENERIC,
+ type );
+}