X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fsmem.c;h=f4d3df8d5cdf5a26596a79270b8881f2362c74f1;hb=86401c10101efe979175fbec7d4f5fefe8553cb7;hp=e8bca937e927f5ee15482473bfdf4d4d37db5b8f;hpb=4d85871d1b29265a6cc5744677f0f0bb9bfac20f;p=vlc diff --git a/modules/stream_out/smem.c b/modules/stream_out/smem.c index e8bca937e9..f4d3df8d5c 100644 --- a/modules/stream_out/smem.c +++ b/modules/stream_out/smem.c @@ -52,26 +52,27 @@ #include #include #include +#include /***************************************************************************** * Module descriptor *****************************************************************************/ #define T_VIDEO_PRERENDER_CALLBACK N_( "Video prerender callback" ) -#define LT_VIDEO_PRERENDER_CALLBACK N_( "Address of the video prerender callback function" \ - "this function will set the buffer where render will be done" ) +#define LT_VIDEO_PRERENDER_CALLBACK N_( "Address of the video prerender callback function. " \ + "This function will set the buffer where render will be done." ) #define T_AUDIO_PRERENDER_CALLBACK N_( "Audio prerender callback" ) -#define LT_AUDIO_PRERENDER_CALLBACK N_( "Address of the audio prerender callback function." \ - "this function will set the buffer where render will be done" ) +#define LT_AUDIO_PRERENDER_CALLBACK N_( "Address of the audio prerender callback function. " \ + "This function will set the buffer where render will be done." ) #define T_VIDEO_POSTRENDER_CALLBACK N_( "Video postrender callback" ) -#define LT_VIDEO_POSTRENDER_CALLBACK N_( "Address of the video postrender callback function." \ - "this function will be called when the render is into the buffer" ) +#define LT_VIDEO_POSTRENDER_CALLBACK N_( "Address of the video postrender callback function. " \ + "This function will be called when the render is into the buffer." ) #define T_AUDIO_POSTRENDER_CALLBACK N_( "Audio postrender callback" ) -#define LT_AUDIO_POSTRENDER_CALLBACK N_( "Address of the audio postrender callback function." \ - "this function will be called when the render is into the buffer" ) +#define LT_AUDIO_POSTRENDER_CALLBACK N_( "Address of the audio postrender callback function. " \ + "This function will be called when the render is into the buffer." ) #define T_VIDEO_DATA N_( "Video Callback data" ) #define LT_VIDEO_DATA N_( "Data for the video callback function." ) @@ -98,19 +99,19 @@ vlc_module_begin () add_shortcut( "smem" ) set_category( CAT_SOUT ) set_subcategory( SUBCAT_SOUT_STREAM ) - add_string( SOUT_PREFIX_VIDEO "prerender-callback", "0", NULL, T_VIDEO_PRERENDER_CALLBACK, LT_VIDEO_PRERENDER_CALLBACK, true ) + add_string( SOUT_PREFIX_VIDEO "prerender-callback", "0", T_VIDEO_PRERENDER_CALLBACK, LT_VIDEO_PRERENDER_CALLBACK, true ) change_volatile() - add_string( SOUT_PREFIX_AUDIO "prerender-callback", "0", NULL, T_AUDIO_PRERENDER_CALLBACK, LT_AUDIO_PRERENDER_CALLBACK, true ) + add_string( SOUT_PREFIX_AUDIO "prerender-callback", "0", T_AUDIO_PRERENDER_CALLBACK, LT_AUDIO_PRERENDER_CALLBACK, true ) change_volatile() - add_string( SOUT_PREFIX_VIDEO "postrender-callback", "0", NULL, T_VIDEO_POSTRENDER_CALLBACK, LT_VIDEO_POSTRENDER_CALLBACK, true ) + add_string( SOUT_PREFIX_VIDEO "postrender-callback", "0", T_VIDEO_POSTRENDER_CALLBACK, LT_VIDEO_POSTRENDER_CALLBACK, true ) change_volatile() - add_string( SOUT_PREFIX_AUDIO "postrender-callback", "0", NULL, T_AUDIO_POSTRENDER_CALLBACK, LT_AUDIO_POSTRENDER_CALLBACK, true ) + add_string( SOUT_PREFIX_AUDIO "postrender-callback", "0", T_AUDIO_POSTRENDER_CALLBACK, LT_AUDIO_POSTRENDER_CALLBACK, true ) change_volatile() - add_string( SOUT_PREFIX_VIDEO "data", "0", NULL, T_VIDEO_DATA, LT_VIDEO_DATA, true ) + add_string( SOUT_PREFIX_VIDEO "data", "0", T_VIDEO_DATA, LT_VIDEO_DATA, true ) change_volatile() - add_string( SOUT_PREFIX_AUDIO "data", "0", NULL, T_AUDIO_DATA, LT_VIDEO_DATA, true ) + add_string( SOUT_PREFIX_AUDIO "data", "0", T_AUDIO_DATA, LT_VIDEO_DATA, true ) change_volatile() - add_bool( SOUT_CFG_PREFIX "time-sync", true, NULL, T_TIME_SYNC, LT_TIME_SYNC, true ) + add_bool( SOUT_CFG_PREFIX "time-sync", true, T_TIME_SYNC, LT_TIME_SYNC, true ) change_private() set_callbacks( Open, Close ) vlc_module_end () @@ -191,10 +192,7 @@ static int Open( vlc_object_t *p_this ) p_stream->pf_add = Add; p_stream->pf_del = Del; p_stream->pf_send = Send; - - /* Does the module need out_pace_control? */ - if ( p_sys->time_sync ) - p_stream->p_sout->i_out_pace_nocontrol++; + p_stream->pace_nocontrol = p_sys->time_sync; return VLC_SUCCESS; } @@ -205,8 +203,6 @@ static int Open( vlc_object_t *p_this ) static void Close( vlc_object_t * p_this ) { sout_stream_t *p_stream = (sout_stream_t*)p_this; - if ( p_stream->p_sys->time_sync ) - p_stream->p_sout->i_out_pace_nocontrol--; free( p_stream->p_sys ); } @@ -273,36 +269,10 @@ 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; + int i_bits_per_sample = aout_BitsPerSample( p_fmt->i_codec ); - switch( p_fmt->i_codec ) + if( !i_bits_per_sample ) { - 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; } @@ -342,7 +312,7 @@ static int SendVideo( sout_stream_t *p_stream, sout_stream_id_t *id, { sout_stream_sys_t *p_sys = p_stream->p_sys; int i_line, i_line_size, i_size, i_pixel_pitch; - uint8_t* p_pixels; + uint8_t* p_pixels = NULL; if( id->format->video.i_bits_per_pixel > 0 ) { @@ -357,15 +327,30 @@ static int SendVideo( sout_stream_t *p_stream, sout_stream_id_t *id, } /* Calling the prerender callback to get user buffer */ p_sys->pf_video_prerender_callback( id->p_data, &p_pixels , i_size ); + + if (!p_pixels) + { + msg_Err( p_stream, "No buffer given!" ); + block_ChainRelease( p_buffer ); + return VLC_EGENERIC; + } + /* Copying data into user buffer */ if( id->format->video.i_bits_per_pixel > 0 ) { - 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 ); + uint8_t *p_in = p_buffer->p_buffer; + uint8_t *p_out = p_pixels; + + for ( int line = 0; line < i_line; line++ ) + { + memcpy( p_out, p_in, i_line_size ); + p_out += i_line_size; + p_in += i_line_size; + } } else { - vlc_memcpy( p_pixels, p_buffer->p_buffer, i_size ); + memcpy( p_pixels, p_buffer->p_buffer, i_size ); } /* Calling the postrender callback to tell the user his buffer is ready */ p_sys->pf_video_postrender_callback( id->p_data, p_pixels, @@ -380,15 +365,29 @@ static int SendAudio( sout_stream_t *p_stream, sout_stream_id_t *id, { sout_stream_sys_t *p_sys = p_stream->p_sys; int i_size; - uint8_t* p_pcm_buffer; + uint8_t* p_pcm_buffer = NULL; int i_samples = 0; i_size = p_buffer->i_buffer; + if (id->format->audio.i_channels <= 0) + { + msg_Warn( p_stream, "No buffer given!" ); + block_ChainRelease( p_buffer ); + return VLC_EGENERIC; + } + 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 ); + if (!p_pcm_buffer) + { + msg_Err( p_stream, "No buffer given!" ); + block_ChainRelease( p_buffer ); + return VLC_EGENERIC; + } + /* Copying data into user buffer */ - vlc_memcpy( p_pcm_buffer, p_buffer->p_buffer, i_size ); + 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,