* For example, you can use smem as it :
* --sout="#transcode{vcodec=RV24,acodec=s16l}:smem{smem-options}"
*
- * Into each lock function (audio and video), you will have all the informations
+ * Into each lock function (audio and video), you will have all the information
* you need to allocate a buffer, so that this module will copy data in it.
*
* the video-data and audio-data pointers will be passed to lock/unlock function
*
- * For now, audio is NOT IMPLEMENTED.
- *
******************************************************************************/
/*****************************************************************************
*****************************************************************************/
#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." )
#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", 0 )
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_AUDIO "prerender-callback", "0", NULL, T_AUDIO_PRERENDER_CALLBACK, LT_AUDIO_PRERENDER_CALLBACK, true )
- add_string( SOUT_PREFIX_VIDEO "postrender-callback", "0", NULL, T_VIDEO_POSTRENDER_CALLBACK, LT_VIDEO_POSTRENDER_CALLBACK, true )
- add_string( SOUT_PREFIX_AUDIO "postrender-callback", "0", NULL, T_AUDIO_POSTRENDER_CALLBACK, LT_AUDIO_POSTRENDER_CALLBACK, true )
- add_string( SOUT_PREFIX_VIDEO "data", "0", NULL, T_VIDEO_DATA, LT_VIDEO_DATA, true )
- add_string( SOUT_PREFIX_AUDIO "data", "0", NULL, T_AUDIO_DATA, LT_VIDEO_DATA, true )
- add_bool( SOUT_CFG_PREFIX "time-sync", true, NULL, T_TIME_SYNC, LT_TIME_SYNC, 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", T_AUDIO_PRERENDER_CALLBACK, LT_AUDIO_PRERENDER_CALLBACK, true )
+ change_volatile()
+ 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", T_AUDIO_POSTRENDER_CALLBACK, LT_AUDIO_POSTRENDER_CALLBACK, true )
+ change_volatile()
+ add_string( SOUT_PREFIX_VIDEO "data", "0", T_VIDEO_DATA, LT_VIDEO_DATA, true )
+ change_volatile()
+ add_string( SOUT_PREFIX_AUDIO "data", "0", T_AUDIO_DATA, LT_VIDEO_DATA, true )
+ change_volatile()
+ add_bool( SOUT_CFG_PREFIX "time-sync", true, T_TIME_SYNC, LT_TIME_SYNC, true )
+ change_private()
set_callbacks( Open, Close )
vlc_module_end ()
switch( p_fmt->i_codec )
{
case VLC_CODEC_RGB32:
+ case VLC_CODEC_RGBA:
i_bits_per_pixel = 32;
break;
case VLC_CODEC_I444:
i_bits_per_pixel = 8;
break;
default:
- msg_Err( p_stream, "Smem does only support raw video format" );
- return NULL;
+ i_bits_per_pixel = 0;
+ msg_Dbg( p_stream, "non raw video format detected (%4.4s), buffers will contain compressed video", (char *)&p_fmt->i_codec );
+ break;
}
id = calloc( 1, sizeof( sout_stream_id_t ) );
{
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;
- i_line = id->format->video.i_height;
- i_pixel_pitch = id->format->video.i_bits_per_pixel / 8;
- i_line_size = i_pixel_pitch * id->format->video.i_width;
- i_size = i_line * i_line_size;
+ if( id->format->video.i_bits_per_pixel > 0 )
+ {
+ i_line = id->format->video.i_height;
+ i_pixel_pitch = id->format->video.i_bits_per_pixel / 8;
+ i_line_size = i_pixel_pitch * id->format->video.i_width;
+ i_size = i_line * i_line_size;
+ }
+ else
+ {
+ i_size = p_buffer->i_buffer;
+ }
/* 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 */
- 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 );
+ 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 );
+ }
+ else
+ {
+ vlc_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,
id->format->video.i_width, id->format->video.i_height,
{
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 );
/* Calling the postrender callback to tell the user his buffer is ready */
block_ChainRelease( p_buffer );
return VLC_SUCCESS;
}
+
projects / vlc / blobdiff