Fix memleaks (use vlclua_dir_list_free).

[vlc] / modules / access_output / rtmp.c

diff --git a/modules/access_output/rtmp.c b/modules/access_output/rtmp.c
index 6e7cfdadd262fb44635d13ef72b72d6c00a4aae6..a26690a097cfdb9f7973ba8cf4cb02556b870e5b 100644 (file)
--- a/modules/access_output/rtmp.c
+++ b/modules/access_output/rtmp.c
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 
@@ -41,9 +41,10 @@
  * Module descriptor
  *****************************************************************************/
 
-#define URL_TEXT N_( "Destination" )
-#define URL_LONGTEXT N_( \
-    "This is the output URL that will be used." )
+#define RTMP_CONNECT_TEXT N_( "Active TCP connection" )
+#define RTMP_CONNECT_LONGTEXT N_( \
+    "If enabled, VLC will connect to a remote destination instead of " \
+    "waiting for an incoming connection." )
 
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
@@ -58,15 +59,13 @@ vlc_module_begin();
     set_subcategory( SUBCAT_SOUT_STREAM );
     add_shortcut( "rtmp" );
     set_callbacks( Open, Close );
+    add_bool( "rtmp-connect", false, NULL, RTMP_CONNECT_TEXT,
+              RTMP_CONNECT_LONGTEXT, false );
 vlc_module_end();
 
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-static const char *ppsz_sout_options[] = {
-    NULL
-};
-
 static ssize_t Write( sout_access_out_t *, block_t * );
 static int     Seek ( sout_access_out_t *, off_t  );
 static void ThreadControl( vlc_object_t * );
@@ -90,8 +89,6 @@ static int Open( vlc_object_t *p_this )
     int length_path, length_media_name;
     int i;
 
-    config_ChainParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
-
     if( !( p_sys = calloc ( 1, sizeof( sout_access_out_sys_t ) ) ) )
     {
         msg_Err( p_access, "not enough memory" );
@@ -183,27 +180,37 @@ static int Open( vlc_object_t *p_this )
     /* p_sys->p_thread->result_publish = only used on access */
     p_sys->p_thread->result_play = 1;
     p_sys->p_thread->result_stop = 0;
+    p_sys->p_thread->fd = -1;
 
     /* Open connection */
-    p_sys->p_thread->fd = net_ConnectTCP( p_access, p_sys->p_thread->url.psz_host, p_sys->p_thread->url.i_port );
-    if( p_sys->p_thread->fd == -1 )
+    if( var_CreateGetBool( p_access, "rtmp-connect" ) > 0 )
+    {
+#if 0
+        p_sys->p_thread->fd = net_ConnectTCP( p_access,
+                                              p_sys->p_thread->url.psz_host,
+                                              p_sys->p_thread->url.i_port );
+#endif
+        msg_Err( p_access, "to be implemented" );
+        goto error2;
+    }
+    else
     {
         int *p_fd_listen;
 
-        msg_Warn( p_access, "cannot connect to %s:%d", p_sys->p_thread->url.psz_host, p_sys->p_thread->url.i_port );
-        msg_Dbg( p_access, "switching to passive mode" );
-
         p_sys->active = 0;
-
-        p_fd_listen = net_ListenTCP( p_access, p_sys->p_thread->url.psz_host, p_sys->p_thread->url.i_port );
+        p_fd_listen = net_ListenTCP( p_access, p_sys->p_thread->url.psz_host,
+                                     p_sys->p_thread->url.i_port );
         if( p_fd_listen == NULL )
         {
-            msg_Warn( p_access, "cannot listen to %s port %i", p_sys->p_thread->url.psz_host, p_sys->p_thread->url.i_port );
+            msg_Warn( p_access, "cannot listen to %s port %i",
+                      p_sys->p_thread->url.psz_host,
+                      p_sys->p_thread->url.i_port );
             goto error2;
         }
 
-        p_sys->p_thread->fd = net_Accept( p_access, p_fd_listen, -1 );
-
+        do
+            p_sys->p_thread->fd = net_Accept( p_access, p_fd_listen, -1 );
+        while( p_sys->p_thread->fd == -1 );
         net_ListenClose( p_fd_listen );
 
         if( rtmp_handshake_passive( p_this, p_sys->p_thread->fd ) < 0 )
@@ -212,11 +219,6 @@ static int Open( vlc_object_t *p_this )
             goto error2;
         }
     }
-    else
-    {
-        msg_Err( p_access, "to be implemented" );
-        goto error2;
-    }
 
     if( vlc_thread_create( p_sys->p_thread, "rtmp control thread", ThreadControl,
                            VLC_THREAD_PRIORITY_INPUT, false ) )
@@ -246,7 +248,8 @@ error2:
     free( p_sys->p_thread->psz_application );
     free( p_sys->p_thread->psz_media );
 
-    net_Close( p_sys->p_thread->fd );
+    if( p_sys->p_thread->fd != -1 )
+        net_Close( p_sys->p_thread->fd );
 error:
     vlc_object_detach( p_sys->p_thread );
     vlc_object_release( p_sys->p_thread );
@@ -331,7 +334,8 @@ p_buffer->p_buffer[i], p_buffer->p_buffer[i+1], p_buffer->p_buffer[i+2], p_buffe
 p_buffer->p_buffer[i+8], p_buffer->p_buffer[i+9], p_buffer->p_buffer[i+10], p_buffer->p_buffer[i+11], p_buffer->p_buffer[i+12], p_buffer->p_buffer[i+13], p_buffer->p_buffer[i+14], p_buffer->p_buffer[i+15]);
 }*/
 ////////////////////////
-msg_Warn(p_access, "rtmp.c:360 i_dts %d i_pts %d", p_buffer->i_dts, p_buffer->i_pts);
+        msg_Warn(p_access, "rtmp.c:360 i_dts %"PRIu64" i_pts %"PRIu64,
+                 p_buffer->i_dts, p_buffer->i_pts);
         rtmp_packet = rtmp_build_flv_over_rtmp( p_access->p_sys->p_thread, p_buffer );
 
         if( rtmp_packet )
@@ -367,6 +371,7 @@ msg_Warn(p_access, "rtmp.c:360 i_dts %d i_pts %d", p_buffer->i_dts, p_buffer->i_
  *****************************************************************************/
 static int Seek( sout_access_out_t *p_access, off_t i_pos )
 {
+    (void)i_pos;
     msg_Err( p_access, "RTMP sout access cannot seek" );
     return -1;
 }
@@ -381,7 +386,7 @@ static void ThreadControl( vlc_object_t *p_this )
 
     rtmp_init_handler( p_thread->rtmp_handler );
 
-    while( !p_thread->b_die )
+    while( vlc_object_alive (p_thread) )
     {
         rtmp_packet = rtmp_read_net_packet( p_thread );
         if( rtmp_packet != NULL )