#include "stream_output.h"
#include <vlc_meta.h>
+#include <vlc_block.h>
+#include <vlc_codec.h>
-#include "input/input_internal.h"
+#include "input/input_interface.h"
#undef DEBUG_BUFFER
/*****************************************************************************
/*****************************************************************************
* sout_NewInstance: creates a new stream output instance
*****************************************************************************/
-sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest )
+sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, const char *psz_dest )
{
static const char typename[] = "stream output";
sout_instance_t *p_sout;
*****************************************************************************/
void sout_UpdateStatistic( sout_instance_t *p_sout, sout_statistic_t i_type, int i_delta )
{
- input_thread_t *p_input;
- int i_bytes; /* That's pretty stupid to define it as an integer, it will overflow
- really fast ... */
-
- if( !libvlc_stats (p_sout) )
+ if( !libvlc_stats( p_sout ) )
return;
- /* FIXME that's ugly
- * TODO add a private (ie not VLC_EXPORTed) input_UpdateStatistic for that */
- p_input = vlc_object_find( p_sout, VLC_OBJECT_INPUT, FIND_PARENT );
- if( !p_input || p_input->i_state == INIT_S || p_input->i_state == ERROR_S )
+ /* */
+ input_thread_t *p_input = vlc_object_find( p_sout, VLC_OBJECT_INPUT, FIND_PARENT );
+ if( !p_input )
return;
+ int i_input_type;
switch( i_type )
{
-#define I(c) stats_UpdateInteger( p_input, p_input->p->counters.c, i_delta, NULL )
case SOUT_STATISTIC_DECODED_VIDEO:
- I(p_decoded_video);
+ i_input_type = SOUT_STATISTIC_DECODED_VIDEO;
break;
case SOUT_STATISTIC_DECODED_AUDIO:
- I(p_decoded_audio);
+ i_input_type = SOUT_STATISTIC_DECODED_AUDIO;
break;
case SOUT_STATISTIC_DECODED_SUBTITLE:
- I(p_decoded_sub);
- break;
-#if 0
- case SOUT_STATISTIC_ENCODED_VIDEO:
- case SOUT_STATISTIC_ENCODED_AUDIO:
- case SOUT_STATISTIC_ENCODED_SUBTITLE:
- msg_Warn( p_sout, "Not yet supported statistic type %d", i_type );
+ i_input_type = SOUT_STATISTIC_DECODED_SUBTITLE;
break;
-#endif
case SOUT_STATISTIC_SENT_PACKET:
- I(p_sout_sent_packets);
+ i_input_type = SOUT_STATISTIC_SENT_PACKET;
break;
-#undef I
+
case SOUT_STATISTIC_SENT_BYTE:
- if( !stats_UpdateInteger( p_input, p_input->p->counters.p_sout_sent_bytes, i_delta, &i_bytes ) )
- stats_UpdateFloat( p_input, p_input->p->counters.p_sout_send_bitrate, i_bytes, NULL );
+ i_input_type = SOUT_STATISTIC_SENT_BYTE;
break;
default:
- msg_Err( p_sout, "Invalid statistic type %d (internal error)", i_type );
- break;
+ msg_Err( p_sout, "Not yet supported statistic type %d", i_type );
+ vlc_object_release( p_input );
+ return;
}
+
+ input_UpdateStatistic( p_input, i_input_type, i_delta );
+
vlc_object_release( p_input );
}
/*****************************************************************************
return i_ret;
}
+#undef sout_AccessOutNew
/*****************************************************************************
* sout_AccessOutNew: allocate a new access out
*****************************************************************************/
-sout_access_out_t *sout_AccessOutNew( sout_instance_t *p_sout,
+sout_access_out_t *sout_AccessOutNew( vlc_object_t *p_sout,
const char *psz_access, const char *psz_name )
{
+ static const char typename[] = "access out";
sout_access_out_t *p_access;
char *psz_next;
- if( !( p_access = vlc_object_create( p_sout,
- sizeof( sout_access_out_t ) ) ) )
+ p_access = vlc_custom_create( p_sout, sizeof( *p_access ),
+ VLC_OBJECT_GENERIC, typename );
+ if( !p_access )
return NULL;
psz_next = config_ChainCreate( &p_access->psz_access, &p_access->p_cfg,
psz_access );
free( psz_next );
p_access->psz_path = strdup( psz_name ? psz_name : "" );
- p_access->p_sout = p_sout;
p_access->p_sys = NULL;
p_access->pf_seek = NULL;
p_access->pf_read = NULL;
vlc_object_attach( p_access, p_sout );
p_access->p_module =
- module_Need( p_access, "sout access", p_access->psz_access, true );
+ module_need( p_access, "sout access", p_access->psz_access, true );
if( !p_access->p_module )
{
vlc_object_detach( p_access );
if( p_access->p_module )
{
- module_Unneed( p_access, p_access->p_module );
+ module_unneed( p_access, p_access->p_module );
}
free( p_access->psz_access );
*****************************************************************************/
ssize_t sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer )
{
+#if 0
const unsigned i_packets_gather = 30;
p_access->i_writes++;
p_access->i_sent_bytes += p_buffer->i_buffer;
sout_UpdateStatistic( p_access->p_sout, SOUT_STATISTIC_SENT_BYTE, p_access->i_sent_bytes );
p_access->i_sent_bytes = 0;
}
+#endif
return p_access->pf_write( p_access, p_buffer );
}
/**
* sout_AccessOutControl
*/
-int sout_AccessOutControl (sout_access_out_t *access, int query, va_list args)
+int sout_AccessOutControl (sout_access_out_t *access, int query, ...)
{
- return (access->pf_control) ? access->pf_control (access, query, args)
- : VLC_EGENERIC;
+ va_list ap;
+ int ret;
+
+ va_start (ap, query);
+ if (access->pf_control)
+ ret = access->pf_control (access, query, ap);
+ else
+ ret = VLC_EGENERIC;
+ va_end (ap);
+ return ret;
}
/*****************************************************************************
sout_mux_t * sout_MuxNew( sout_instance_t *p_sout, char *psz_mux,
sout_access_out_t *p_access )
{
+ static const char typename[] = "mux";
sout_mux_t *p_mux;
char *psz_next;
- p_mux = vlc_object_create( p_sout, sizeof( sout_mux_t ) );
+ p_mux = vlc_custom_create( p_sout, sizeof( *p_mux ), VLC_OBJECT_GENERIC,
+ typename);
if( p_mux == NULL )
return NULL;
vlc_object_attach( p_mux, p_sout );
p_mux->p_module =
- module_Need( p_mux, "sout mux", p_mux->psz_mux, true );
+ module_need( p_mux, "sout mux", p_mux->psz_mux, true );
if( p_mux->p_module == NULL )
{
vlc_object_detach( p_mux );
if( p_mux->p_module )
{
- module_Unneed( p_mux, p_mux->p_module );
+ module_unneed( p_mux, p_mux->p_module );
}
free( p_mux->psz_mux );
*/
sout_stream_t *sout_StreamNew( sout_instance_t *p_sout, char *psz_chain )
{
+ static const char typename[] = "stream out";
sout_stream_t *p_stream;
if( !psz_chain )
return NULL;
}
- p_stream = vlc_object_create( p_sout, sizeof( sout_stream_t ) );
-
+ p_stream = vlc_custom_create( p_sout, sizeof( *p_stream ),
+ VLC_OBJECT_GENERIC, typename );
if( !p_stream )
return NULL;
vlc_object_attach( p_stream, p_sout );
p_stream->p_module =
- module_Need( p_stream, "sout stream", p_stream->psz_name, true );
+ module_need( p_stream, "sout stream", p_stream->psz_name, true );
if( !p_stream->p_module )
{
msg_Dbg( p_stream, "destroying chain... (name=%s)", p_stream->psz_name );
vlc_object_detach( p_stream );
- if( p_stream->p_module ) module_Unneed( p_stream, p_stream->p_module );
+ if( p_stream->p_module ) module_unneed( p_stream, p_stream->p_module );
FREENULL( p_stream->psz_name );
FREENULL( p_stream->psz_next );
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 );
+}
projects / vlc / blobdiff