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

diff --git a/modules/stream_out/smem.c b/modules/stream_out/smem.c
index 5d9b79ed51..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 )
@@ -134,17 +134,16 @@ static int SendAudio( sout_stream_t *p_stream, sout_stream_id_t *id,
 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 );
-    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*, unsigned int, unsigned int, unsigned int, unsigned int );
-    void *p_audio_data;
-    void *p_video_data;
+    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, 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;
 };
 
@@ -162,30 +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 );
-    free( psz_tmp );
-
-    psz_tmp = var_CreateGetString( p_stream, SOUT_PREFIX_AUDIO "postrender-callback" );
-    p_sys->pf_audio_postrender_callback = (void (*) (void*, unsigned int, unsigned int, unsigned int, unsigned int))(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 );
+    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 "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 */
@@ -224,6 +218,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
 
 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;
 
@@ -258,6 +253,10 @@ static sout_stream_id_t *AddVideo( sout_stream_t *p_stream, es_format_t *p_fmt )
     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;
@@ -265,16 +264,59 @@ static sout_stream_id_t *AddVideo( sout_stream_t *p_stream, es_format_t *p_fmt )
 
 static sout_stream_id_t *AddAudio( sout_stream_t *p_stream, es_format_t *p_fmt )
 {
-    VLC_UNUSED( p_stream );
-    VLC_UNUSED( p_fmt );
-    return NULL;
+    char* psz_tmp;
+    sout_stream_id_t* id;
+    int i_bits_per_sample;
+
+    switch( p_fmt->i_codec )
+    {
+    case VLC_CODEC_U8:
+    case VLC_CODEC_S8:
+        i_bits_per_sample = 8;
+        break;
+    case VLC_CODEC_U16L:
+    case VLC_CODEC_S16L:
+    case VLC_CODEC_U16B:
+    case VLC_CODEC_S16B:
+        i_bits_per_sample =  16;
+        break;
+    case VLC_CODEC_U24L:
+    case VLC_CODEC_S24L:
+    case VLC_CODEC_U24B:
+    case VLC_CODEC_S24B:
+        i_bits_per_sample = 24;
+        break;
+    case VLC_CODEC_S32L:
+    case VLC_CODEC_S32B:
+    case VLC_CODEC_FL32:
+    case VLC_CODEC_FI32:
+        i_bits_per_sample = 32;
+        break;
+    case VLC_CODEC_FL64:
+        i_bits_per_sample = 64;
+        break;
+    default:
+        msg_Err( p_stream, "Smem does only support raw audio format" );
+        return NULL;
+    }
+
+    id = calloc( 1, sizeof( sout_stream_id_t ) );
+    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;
 }
 
@@ -300,22 +342,36 @@ static int SendVideo( sout_stream_t *p_stream, sout_stream_id_t *id,
     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 );
     return VLC_SUCCESS;
 }
 
 static int SendAudio( sout_stream_t *p_stream, sout_stream_id_t *id,
                       block_t *p_buffer )
 {
-    VLC_UNUSED( p_stream );
-    VLC_UNUSED( id );
-    VLC_UNUSED( p_buffer );
+    sout_stream_sys_t *p_sys = p_stream->p_sys;
+    int i_size;
+    uint8_t* p_pcm_buffer;
+    int i_samples = 0;
+
+    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( 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( 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;
 }