# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <stdlib.h> /* free() */
#include <stdio.h> /* sprintf() */
#include <string.h>
#include <vlc_sout.h>
-#include <vlc_playlist.h>
#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"
+
+#define VLC_CODEC_NULL VLC_FOURCC( 'n', 'u', 'l', 'l' )
#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;
/* *** Allocate descriptor *** */
- p_sout = vlc_object_create( p_parent, VLC_OBJECT_SOUT );
+ p_sout = vlc_custom_create( p_parent, sizeof( *p_sout ),
+ VLC_OBJECT_GENERIC, typename );
if( p_sout == NULL )
- {
- msg_Err( p_parent, "out of memory" );
return NULL;
- }
/* *** init descriptor *** */
p_sout->psz_sout = strdup( psz_dest );
p_sout->i_out_pace_nocontrol = 0;
p_sout->p_sys = NULL;
- vlc_mutex_init( p_sout, &p_sout->lock );
+ vlc_mutex_init( &p_sout->lock );
if( psz_dest && psz_dest[0] == '#' )
{
p_sout->psz_chain = strdup( &psz_dest[1] );
*****************************************************************************/
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 )
+ 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 );
}
/*****************************************************************************
{
sout_packetizer_input_t *p_input;
- msg_Dbg( p_sout, "adding a new input" );
-
/* *** create a packetizer input *** */
p_input = malloc( sizeof( sout_packetizer_input_t ) );
+ if( !p_input ) return NULL;
p_input->p_sout = p_sout;
p_input->p_fmt = p_fmt;
- if( p_fmt->i_codec == VLC_FOURCC( 'n', 'u', 'l', 'l' ) )
+ msg_Dbg( p_sout, "adding a new sout input (sout_input:%p)", p_input );
+
+ if( p_fmt->i_codec == VLC_CODEC_NULL )
{
vlc_object_release( p_sout );
return p_input;
{
sout_instance_t *p_sout = p_input->p_sout;
- msg_Dbg( p_sout, "removing an 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;
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 ) ) ) )
- {
- msg_Err( p_sout, "out of memory" );
+ 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->p_sys = NULL;
p_access->pf_seek = NULL;
p_access->pf_read = NULL;
p_access->pf_write = NULL;
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 =
- module_Need( p_access, "sout access", p_access->psz_access, VLC_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 )
- {
- msg_Err( p_sout, "out of memory" );
return NULL;
- }
p_mux->p_sout = p_sout;
psz_next = config_ChainCreate( &p_mux->psz_mux, &p_mux->p_cfg, psz_mux );
p_mux->p_sys = NULL;
p_mux->p_module = NULL;
- p_mux->b_add_stream_any_time = VLC_FALSE;
- p_mux->b_waiting_stream = VLC_TRUE;
+ p_mux->b_add_stream_any_time = false;
+ 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 =
- module_Need( p_mux, "sout mux", p_mux->psz_mux, VLC_TRUE );
+ module_need( p_mux, "sout mux", p_mux->psz_mux, true );
if( p_mux->p_module == NULL )
{
/* *** probe mux capacity *** */
if( p_mux->pf_control )
{
- int b_answer = VLC_FALSE;
+ int b_answer = false;
if( sout_MuxControl( p_mux, MUX_CAN_ADD_STREAM_WHILE_MUXING,
&b_answer ) )
{
- b_answer = VLC_FALSE;
+ b_answer = false;
}
if( b_answer )
{
msg_Dbg( p_sout, "muxer support adding stream at any time" );
- p_mux->b_add_stream_any_time = VLC_TRUE;
- p_mux->b_waiting_stream = VLC_FALSE;
+ p_mux->b_add_stream_any_time = true;
+ p_mux->b_waiting_stream = false;
/* If we control the output pace then it's better to wait before
* starting muxing (generates better streams/files). */
if( !p_sout->i_out_pace_nocontrol )
{
- b_answer = VLC_TRUE;
+ b_answer = true;
}
else if( sout_MuxControl( p_mux, MUX_GET_ADD_STREAM_WAIT,
&b_answer ) )
{
- b_answer = VLC_FALSE;
+ b_answer = false;
}
if( b_answer )
{
msg_Dbg( p_sout, "muxer prefers to wait for all ES before "
"starting to mux" );
- p_mux->b_waiting_stream = VLC_TRUE;
+ p_mux->b_waiting_stream = true;
}
}
}
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 );
/* create a new sout input */
p_input = malloc( sizeof( sout_input_t ) );
if( !p_input )
- {
- msg_Err( p_mux, "out of memory" );
return NULL;
- }
p_input->p_sout = p_mux->p_sout;
p_input->p_fmt = p_fmt;
- p_input->p_fifo = block_FifoNew( p_mux->p_sout );
+ p_input->p_fifo = block_FifoNew();
p_input->p_sys = NULL;
TAB_APPEND( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input );
{
/* We stop waiting, and call the muxer for taking care of the data
* before we remove this es */
- p_mux->b_waiting_stream = VLC_FALSE;
+ p_mux->b_waiting_stream = false;
p_mux->pf_mux( p_mux );
}
{
mtime_t current_date = mdate();
if ( current_date > p_buffer->i_dts )
- msg_Warn( p_mux, "late buffer for mux input ("I64Fd")",
+ msg_Warn( p_mux, "late buffer for mux input (%"PRId64")",
current_date - p_buffer->i_dts );
}
if( p_mux->b_waiting_stream )
{
- const int64_t i_caching = var_GetInteger( p_mux->p_sout, "sout-mux-caching" ) * I64C(1000);
+ const int64_t i_caching = var_GetInteger( p_mux->p_sout, "sout-mux-caching" ) * INT64_C(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_buffer->i_dts < p_mux->i_add_stream_start + i_caching )
return;
- p_mux->b_waiting_stream = VLC_FALSE;
+ p_mux->b_waiting_stream = false;
}
p_mux->pf_mux( p_mux );
}
* return a pointer on the rest
* XXX: psz_chain is modified
*/
-#define SKIPSPACE( p ) { while( *p && ( *p == ' ' || *p == '\t' ) ) p++; }
-#define SKIPTRAILINGSPACE( p, e ) \
- { while( e > p && ( *(e-1) == ' ' || *(e-1) == '\t' ) ) e--; }
-
-/* go accross " " and { } */
-static char *_get_chain_end( char *str )
-{
- char c, *p = str;
-
- SKIPSPACE( p );
-
- for( ;; )
- {
- if( !*p || *p == ',' || *p == '}' ) return p;
-
- if( *p != '{' && *p != '"' && *p != '\'' )
- {
- p++;
- continue;
- }
-
- if( *p == '{' ) c = '}';
- else c = *p;
- p++;
-
- for( ;; )
- {
- if( !*p ) return p;
-
- if( *p == c ) return ++p;
- else if( *p == '{' && c == '}' ) p = _get_chain_end( p );
- else p++;
- }
- }
-}
/*
* XXX name and p_cfg are used (-> do NOT free them)
*/
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 )
- {
- msg_Err( p_sout, "out of memory" );
return NULL;
- }
p_stream->p_sout = p_sout;
p_stream->p_sys = NULL;
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 =
- module_Need( p_stream, "sout stream", p_stream->psz_name, VLC_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_t mrl;
char *psz_chain;
- const char *fmt = "standard{mux=\"%s\",access=\"%s\",dst=\"%s\"}";
- static const char rtpfmt[] = "rtp{mux=\"%s\",proto=\"%s\",dst=\"%s\"}";
mrl_Parse( &mrl, psz_url );
- /* Check if the URLs goes #rtp - otherwise we'll use #standard */
+ /* Check if the URLs goes to #rtp - otherwise we'll use #standard */
+ static const char rtplist[] = "dccp\0sctp\0tcp\0udplite\0";
+ for (const char *a = rtplist; *a; a += strlen (a) + 1)
+ if (strcmp (a, mrl.psz_access) == 0)
+ goto rtp;
+
if (strcmp (mrl.psz_access, "rtp") == 0)
{
+ char *port;
/* For historical reasons, rtp:// means RTP over UDP */
strcpy (mrl.psz_access, "udp");
- fmt = rtpfmt;
+rtp:
+ if (mrl.psz_name[0] == '[')
+ {
+ port = strstr (mrl.psz_name, "]:");
+ if (port != NULL)
+ port++;
+ }
+ else
+ port = strchr (mrl.psz_name, ':');
+ if (port != NULL)
+ *port++ = '\0'; /* erase ':' */
+
+ if (asprintf (&psz_chain,
+ "rtp{mux=\"%s\",proto=\"%s\",dst=\"%s%s%s\"}",
+ mrl.psz_way, mrl.psz_access, mrl.psz_name,
+ port ? "\",port=\"" : "", port ? port : "") == -1)
+ psz_chain = NULL;
}
else
{
- static const char list[] = "dccp\0sctp\0tcp\0udplite\0";
- for (const char *a = list; *a; a += strlen (a) + 1)
- if (strcmp (a, mrl.psz_access) == 0)
- {
- fmt = rtpfmt;
- break;
- }
+ /* Convert the URL to a basic standard sout chain */
+ if (asprintf (&psz_chain,
+ "standard{mux=\"%s\",access=\"%s\",dst=\"%s\"}",
+ mrl.psz_way, mrl.psz_access, mrl.psz_name) == -1)
+ psz_chain = NULL;
}
- /* Convert the URL to a basic sout chain */
- if (asprintf (&psz_chain, fmt,
- mrl.psz_way, mrl.psz_access, mrl.psz_name) == -1)
- psz_chain = NULL;
-
/* Duplicate and wrap if sout-display is on */
if (psz_chain && (config_GetInt( p_this, "sout-display" ) > 0))
{
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