/*****************************************************************************
* smem.c: stream output to memory buffer module
*****************************************************************************
- * Copyright (C) 2009 the VideoLAN team
+ * Copyright (C) 2009 VLC authors and VideoLAN
* $Id$
*
* Authors: Christophe Courtaut <christophe.courtaut@gmail.com>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <vlc_sout.h>
#include <vlc_block.h>
#include <vlc_codec.h>
+#include <vlc_aout.h>
/*****************************************************************************
* 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." )
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;
}
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 );
}
{
case VLC_CODEC_RGB32:
case VLC_CODEC_RGBA:
+ case VLC_CODEC_ARGB:
i_bits_per_pixel = 32;
break;
case VLC_CODEC_I444:
{
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;
}
/* 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,
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 );
}
/* 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,
projects / vlc / blobdiff