X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fsmem.c;h=bed8bbe2fb96c9754e3d22297a32ec012cfffadc;hb=8f055856fa79bfa284f77bcd55e7556977eec769;hp=f85419cba884a1bce9926c30168c482458fe9151;hpb=7b24c95dd096e4e131a2b61ef175a21551753bd5;p=vlc

diff --git a/modules/stream_out/smem.c b/modules/stream_out/smem.c
index f85419cba8..bed8bbe2fb 100644
--- a/modules/stream_out/smem.c
+++ b/modules/stream_out/smem.c
@@ -94,9 +94,9 @@ static void Close( vlc_object_t * );
 #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 )
@@ -142,8 +142,8 @@ 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 ( *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;
 };
 
@@ -161,22 +161,25 @@ static int Open( vlc_object_t *p_this )
         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 );
+    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_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_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 */
@@ -250,7 +253,7 @@ static sout_stream_id_t *AddVideo( sout_stream_t *p_stream, es_format_t *p_fmt )
     if( !id )
         return NULL;
 
-    psz_tmp = var_CreateGetString( p_stream, SOUT_PREFIX_VIDEO "data" );
+    psz_tmp = var_GetString( p_stream, SOUT_PREFIX_VIDEO "data" );
     id->p_data = (void *)( intptr_t )atoll( psz_tmp );
     free( psz_tmp );
 
@@ -301,7 +304,7 @@ static sout_stream_id_t *AddAudio( sout_stream_t *p_stream, es_format_t *p_fmt )
     if( !id )
         return NULL;
 
-    psz_tmp = var_CreateGetString( p_stream, SOUT_PREFIX_AUDIO "data" );
+    psz_tmp = var_GetString( p_stream, SOUT_PREFIX_AUDIO "data" );
     id->p_data = (void *)( intptr_t )atoll( psz_tmp );
     free( psz_tmp );
 
@@ -313,8 +316,7 @@ static sout_stream_id_t *AddAudio( sout_stream_t *p_stream, es_format_t *p_fmt )
 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;
 }
 
@@ -368,7 +370,7 @@ static int SendAudio( sout_stream_t *p_stream, sout_stream_id_t *id,
     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( id->p_data, p_pcm_buffer,
-                                         id->format->audio.i_channels, id->format->audio.i_rate, p_buffer->i_samples,
+                                         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;