#define SOUT_PREFIX_AUDIO SOUT_CFG_PREFIX"audio-"
vlc_module_begin ()
- set_shortname( N_("smem"))
+ set_shortname( N_("Smem"))
set_description( N_("Stream output to memory buffer") )
- set_capability( "sout stream", 50 )
+ set_capability( "sout stream", 0 )
add_shortcut( "smem" )
set_category( CAT_SOUT )
set_subcategory( SUBCAT_SOUT_STREAM )
struct sout_stream_id_t
{
es_format_t* format;
+ void *p_data;
};
struct sout_stream_sys_t
vlc_mutex_t *p_lock;
void ( *pf_video_prerender_callback ) ( void* p_video_data, uint8_t** pp_pixel_buffer , int size );
void ( *pf_audio_prerender_callback ) ( void* p_audio_data, uint8_t** pp_pcm_buffer , unsigned int size );
- void ( *pf_video_postrender_callback ) ( void* p_video_data, uint8_t* p_pixel_buffer, int width, int height, int pixel_pitch, int size, int pts );
- void ( *pf_audio_postrender_callback ) ( void* p_audio_data, uint8_t* p_pcm_buffer, unsigned int channels, unsigned int rate, unsigned int nb_samples, unsigned int bits_per_sample, unsigned int size, int pts );
- void *p_audio_data;
- void *p_video_data;
+ void ( *pf_video_postrender_callback ) ( void* p_video_data, uint8_t* p_pixel_buffer, int width, int height, int pixel_pitch, int size, mtime_t pts );
+ void ( *pf_audio_postrender_callback ) ( void* p_audio_data, uint8_t* p_pcm_buffer, unsigned int channels, unsigned int rate, unsigned int nb_samples, unsigned int bits_per_sample, unsigned int size, mtime_t pts );
bool time_sync;
};
return VLC_ENOMEM;
p_stream->p_sys = p_sys;
- p_sys->time_sync = var_CreateGetBool( p_stream, SOUT_CFG_PREFIX "time-sync" );
+ config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
+ p_stream->p_cfg );
- psz_tmp = var_CreateGetString( p_stream, SOUT_PREFIX_VIDEO "prerender-callback" );
+ p_sys->time_sync = var_GetBool( p_stream, SOUT_CFG_PREFIX "time-sync" );
+
+ psz_tmp = var_GetString( p_stream, SOUT_PREFIX_VIDEO "prerender-callback" );
p_sys->pf_video_prerender_callback = (void (*) (void *, uint8_t**, int))(intptr_t)atoll( psz_tmp );
free( psz_tmp );
- psz_tmp = var_CreateGetString( p_stream, SOUT_PREFIX_AUDIO "prerender-callback" );
+ psz_tmp = var_GetString( p_stream, SOUT_PREFIX_AUDIO "prerender-callback" );
p_sys->pf_audio_prerender_callback = (void (*) (void* , uint8_t**, unsigned int))(intptr_t)atoll( psz_tmp );
free( psz_tmp );
- psz_tmp = var_CreateGetString( p_stream, SOUT_PREFIX_VIDEO "postrender-callback" );
- p_sys->pf_video_postrender_callback = (void (*) (void*, uint8_t*, int, int, int, int, int))(intptr_t)atoll( psz_tmp );
- free( psz_tmp );
-
- psz_tmp = var_CreateGetString( p_stream, SOUT_PREFIX_AUDIO "postrender-callback" );
- p_sys->pf_audio_postrender_callback = (void (*) (void*, uint8_t*, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, int))(intptr_t)atoll( psz_tmp );
+ psz_tmp = var_GetString( p_stream, SOUT_PREFIX_VIDEO "postrender-callback" );
+ p_sys->pf_video_postrender_callback = (void (*) (void*, uint8_t*, int, int, int, int, mtime_t))(intptr_t)atoll( psz_tmp );
free( psz_tmp );
- psz_tmp = var_CreateGetString( p_stream, SOUT_PREFIX_VIDEO "data" );
- p_sys->p_video_data = (void *)( intptr_t )atoll( psz_tmp );
- free( psz_tmp );
-
- psz_tmp = var_CreateGetString( p_stream, SOUT_PREFIX_AUDIO "data" );
- p_sys->p_audio_data = (void *)( intptr_t )atoll( psz_tmp );
+ psz_tmp = var_GetString( p_stream, SOUT_PREFIX_AUDIO "postrender-callback" );
+ p_sys->pf_audio_postrender_callback = (void (*) (void*, uint8_t*, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, mtime_t))(intptr_t)atoll( psz_tmp );
free( psz_tmp );
/* Setting stream out module callbacks */
static sout_stream_id_t *AddVideo( sout_stream_t *p_stream, es_format_t *p_fmt )
{
+ char* psz_tmp;
sout_stream_id_t *id;
int i_bits_per_pixel;
if( !id )
return NULL;
+ psz_tmp = var_GetString( p_stream, SOUT_PREFIX_VIDEO "data" );
+ id->p_data = (void *)( intptr_t )atoll( psz_tmp );
+ free( psz_tmp );
+
id->format = p_fmt;
id->format->video.i_bits_per_pixel = i_bits_per_pixel;
return id;
static sout_stream_id_t *AddAudio( sout_stream_t *p_stream, es_format_t *p_fmt )
{
+ char* psz_tmp;
sout_stream_id_t* id;
int i_bits_per_sample;
if( !id )
return NULL;
+ psz_tmp = var_GetString( p_stream, SOUT_PREFIX_AUDIO "data" );
+ id->p_data = (void *)( intptr_t )atoll( psz_tmp );
+ free( psz_tmp );
+
id->format = p_fmt;
id->format->audio.i_bitspersample = i_bits_per_sample;
return id;
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
{
VLC_UNUSED( p_stream );
- if ( id != NULL )
- free( id );
+ free( id );
return VLC_SUCCESS;
}
i_line_size = i_pixel_pitch * id->format->video.i_width;
i_size = i_line * i_line_size;
/* Calling the prerender callback to get user buffer */
- p_sys->pf_video_prerender_callback( p_sys->p_video_data, &p_pixels , i_size );
+ p_sys->pf_video_prerender_callback( id->p_data, &p_pixels , i_size );
/* Copying data into user buffer */
for ( int line = 0; line < i_line; line++, p_pixels += i_line_size )
vlc_memcpy( p_pixels, p_buffer->p_buffer + i_line_size * line , i_line_size );
/* Calling the postrender callback to tell the user his buffer is ready */
- p_sys->pf_video_postrender_callback( p_sys->p_video_data, p_pixels,
+ p_sys->pf_video_postrender_callback( id->p_data, p_pixels,
id->format->video.i_width, id->format->video.i_height,
id->format->video.i_bits_per_pixel, i_size, p_buffer->i_pts );
block_ChainRelease( p_buffer );
i_size = p_buffer->i_buffer;
i_samples = i_size / ( ( id->format->audio.i_bitspersample / 8 ) * id->format->audio.i_channels );
/* Calling the prerender callback to get user buffer */
- p_sys->pf_audio_prerender_callback( p_sys->p_audio_data, &p_pcm_buffer, i_size );
+ p_sys->pf_audio_prerender_callback( id->p_data, &p_pcm_buffer, i_size );
/* Copying data into user buffer */
vlc_memcpy( p_pcm_buffer, p_buffer->p_buffer, i_size );
/* Calling the postrender callback to tell the user his buffer is ready */
- p_sys->pf_audio_postrender_callback( p_sys->p_audio_data, p_pcm_buffer,
- id->format->audio.i_channels, id->format->audio.i_rate, p_buffer->i_samples,
+ p_sys->pf_audio_postrender_callback( id->p_data, p_pcm_buffer,
+ id->format->audio.i_channels, id->format->audio.i_rate, i_samples,
id->format->audio.i_bitspersample, i_size, p_buffer->i_pts );
block_ChainRelease( p_buffer );
return VLC_SUCCESS;