aout: add common helpers for software amplification

[vlc] / modules / stream_out / smem.c

diff --git a/modules/stream_out/smem.c b/modules/stream_out/smem.c
index 64d92c1c7c647e3e95a1aae5f84cffdb905a7c77..d26674c11807ecabc7d67f00e29a31b4c542abfb 100644 (file)
--- a/modules/stream_out/smem.c
+++ b/modules/stream_out/smem.c
@@ -58,20 +58,20 @@
  *****************************************************************************/
 
 #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." )
@@ -369,11 +369,11 @@ static int SendVideo( sout_stream_t *p_stream, sout_stream_id_t *id,
     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 );
+            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 );
+        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,
@@ -392,6 +392,13 @@ static int SendAudio( sout_stream_t *p_stream, sout_stream_id_t *id,
     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 );
@@ -403,7 +410,7 @@ static int SendAudio( sout_stream_t *p_stream, sout_stream_id_t *id,
     }
 
     /* 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,