#include <stdlib.h> /* free() */
#include <stdio.h> /* sprintf() */
-#include <string.h> /* strerror() */
+#include <string.h>
#include <vlc_sout.h>
+#include <vlc_playlist.h>
#include "stream_output.h"
sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest )
{
sout_instance_t *p_sout;
- vlc_value_t keep;
-
- if( var_Get( p_parent, "sout-keep", &keep ) < 0 )
- {
- msg_Warn( p_parent, "cannot get sout-keep value" );
- keep.b_bool = VLC_FALSE;
- }
- if( keep.b_bool )
- {
- if( ( p_sout = vlc_object_find( p_parent, VLC_OBJECT_SOUT,
- FIND_ANYWHERE ) ) != NULL )
- {
- if( !strcmp( p_sout->psz_sout, psz_dest ) )
- {
- msg_Dbg( p_parent, "sout keep: reusing sout" );
- msg_Dbg( p_parent, "sout keep: you probably want to use "
- "gather stream_out" );
- vlc_object_detach( p_sout );
- vlc_object_attach( p_sout, p_parent );
- vlc_object_release( p_sout );
- return p_sout;
- }
- else
- {
- msg_Dbg( p_parent, "sout keep: destroying unusable sout" );
- vlc_object_release( p_sout );
- sout_DeleteInstance( p_sout );
- }
- }
- }
- else if( !keep.b_bool )
- {
- while( ( p_sout = vlc_object_find( p_parent, VLC_OBJECT_SOUT,
- FIND_PARENT ) ) != NULL )
- {
- msg_Dbg( p_parent, "sout keep: destroying old sout" );
- vlc_object_release( p_sout );
- sout_DeleteInstance( p_sout );
- }
- }
/* *** Allocate descriptor *** */
p_sout = vlc_object_create( p_parent, VLC_OBJECT_SOUT );
/* attach it for inherit */
vlc_object_attach( p_sout, p_parent );
- p_sout->p_stream = sout_StreamNew( p_sout, p_sout->psz_chain );
+ /* */
+ var_Create( p_sout, "sout-mux-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ /* */
+ p_sout->p_stream = sout_StreamNew( p_sout, p_sout->psz_chain );
if( p_sout->p_stream == NULL )
{
msg_Err( p_sout, "stream chain failed for `%s'", p_sout->psz_chain );
*****************************************************************************/
void sout_DeleteInstance( sout_instance_t * p_sout )
{
- /* Unlink object */
- vlc_object_detach( p_sout );
-
/* remove the stream out chain */
sout_StreamDelete( p_sout->p_stream );
vlc_object_destroy( 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( !p_sout->p_libvlc->b_stats )
+ 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 )
+ return;
+
+ 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);
+ break;
+ case SOUT_STATISTIC_DECODED_AUDIO:
+ I(p_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 );
+ break;
+#endif
+
+ case SOUT_STATISTIC_SENT_PACKET:
+ I(p_sout_sent_packets);
+ 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 );
+ break;
+
+ default:
+ msg_Err( p_sout, "Invalid statistic type %d (internal error)", i_type );
+ break;
+ }
+ vlc_object_release( p_input );
+}
/*****************************************************************************
* Packetizer/Input
*****************************************************************************/
* sout_AccessOutNew: allocate a new access out
*****************************************************************************/
sout_access_out_t *sout_AccessOutNew( sout_instance_t *p_sout,
- char *psz_access, char *psz_name )
+ const char *psz_access, const char *psz_name )
{
sout_access_out_t *p_access;
char *psz_next;
{
free( psz_next );
}
- p_access->psz_name = strdup( psz_name ? psz_name : "" );
+ 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;
if( !p_access->p_module )
{
free( p_access->psz_access );
- free( p_access->psz_name );
+ free( p_access->psz_path );
vlc_object_detach( p_access );
vlc_object_destroy( p_access );
return( NULL );
config_ChainDestroy( p_access->p_cfg );
- free( p_access->psz_name );
+ free( p_access->psz_path );
vlc_object_destroy( p_access );
}
/*****************************************************************************
* sout_AccessRead:
*****************************************************************************/
-int sout_AccessOutRead( sout_access_out_t *p_access, block_t *p_buffer )
+ssize_t sout_AccessOutRead( sout_access_out_t *p_access, block_t *p_buffer )
{
return( p_access->pf_read ?
p_access->pf_read( p_access, p_buffer ) : VLC_EGENERIC );
/*****************************************************************************
* sout_AccessWrite:
*****************************************************************************/
-int sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer )
+ssize_t sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer )
{
- int i_total = 0;
+ const unsigned i_packets_gather = 30;
p_access->i_writes++;
p_access->i_sent_bytes += p_buffer->i_buffer;
- if( p_access->p_libvlc->b_stats && p_access->i_writes % 30 == 0 )
+ if( (p_access->i_writes % i_packets_gather) == 0 )
{
- /* Access_out -> sout_instance -> input_thread_t */
- input_thread_t *p_input =
- (input_thread_t *)vlc_object_find( p_access, VLC_OBJECT_INPUT,
- FIND_PARENT );
- if( p_input )
- {
- stats_UpdateInteger( p_input, p_input->p->counters.p_sout_sent_packets,
- 30, NULL );
- stats_UpdateInteger( p_input, p_input->p->counters.p_sout_sent_bytes,
- p_access->i_sent_bytes, &i_total );
- stats_UpdateFloat( p_input, p_input->p->counters.p_sout_send_bitrate,
- (float)i_total, NULL );
- p_access->i_sent_bytes = 0;
- vlc_object_release( p_input );
- }
+ sout_UpdateStatistic( p_access->p_sout, SOUT_STATISTIC_SENT_PACKET, i_packets_gather );
+ sout_UpdateStatistic( p_access->p_sout, SOUT_STATISTIC_SENT_BYTE, p_access->i_sent_bytes );
+ p_access->i_sent_bytes = 0;
}
return p_access->pf_write( p_access, p_buffer );
}
if( !p_mux->b_add_stream_any_time && !p_mux->b_waiting_stream )
{
msg_Err( p_mux, "cannot add a new stream (unsupported while muxing "
- "to this format)" );
+ "to this format). You can try increasing sout-mux-caching value" );
return NULL;
}
{
int i_index;
- if( p_mux->b_waiting_stream && p_input->p_fifo->i_depth > 0 )
+ if( p_mux->b_waiting_stream
+ && block_FifoCount( p_input->p_fifo ) > 0 )
{
/* We stop waiting, and call the muxer for taking care of the data
* before we remove this es */
if( p_mux->b_waiting_stream )
{
+ const int64_t i_caching = var_GetInteger( p_mux->p_sout, "sout-mux-caching" ) * I64C(1000);
+
if( p_mux->i_add_stream_start < 0 )
- {
p_mux->i_add_stream_start = p_buffer->i_dts;
- }
- if( p_mux->i_add_stream_start >= 0 &&
- p_mux->i_add_stream_start + I64C(1500000) < p_buffer->i_dts )
- {
- /* Wait until we have more than 1.5 seconds worth of data
- * before start muxing */
- p_mux->b_waiting_stream = VLC_FALSE;
- }
- else
- {
+ /* 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 )
return;
- }
+ p_mux->b_waiting_stream = VLC_FALSE;
}
p_mux->pf_mux( p_mux );
}
projects / vlc / blobdiff