RTP: pass path rather than URL to RtspSetup()

[vlc] / modules / stream_out / smem.c

diff --git a/modules/stream_out/smem.c b/modules/stream_out/smem.c
index e8bca937e927f5ee15482473bfdf4d4d37db5b8f..5587c2f2d3e0dd2140a454166c94a384750f9fbb 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." )
@@ -98,19 +98,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 ()
@@ -342,7 +342,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,6 +357,14 @@ 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 )
     {
@@ -380,13 +388,27 @@ 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 );
     /* Calling the postrender callback to tell the user his buffer is ready */