#define SOUT_CFG_PREFIX "sout-rtmp-"
-vlc_module_begin();
- set_description( N_("RTMP stream output") );
- set_shortname( "RTMP" );
- set_capability( "sout access", 50 );
- set_category( CAT_SOUT );
- set_subcategory( SUBCAT_SOUT_STREAM );
- add_shortcut( "rtmp" );
- set_callbacks( Open, Close );
+vlc_module_begin ()
+ set_description( N_("RTMP stream output") )
+ set_shortname( N_("RTMP" ) )
+ set_capability( "sout access", 0 )
+ set_category( CAT_SOUT )
+ 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();
+ RTMP_CONNECT_LONGTEXT, false )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
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 * );
+static void* ThreadControl( void * );
struct sout_access_out_sys_t
{
int i;
if( !( p_sys = calloc ( 1, sizeof( sout_access_out_sys_t ) ) ) )
- {
- msg_Err( p_access, "not enough memory" );
return VLC_ENOMEM;
- }
p_access->p_sys = p_sys;
p_sys->p_thread =
vlc_object_create( p_access, sizeof( rtmp_control_thread_t ) );
if( !p_sys->p_thread )
{
- msg_Err( p_access, "out of memory" );
+ free( p_sys );
return VLC_ENOMEM;
}
vlc_object_attach( p_sys->p_thread, p_access );
}
length_path = strlen( p_sys->p_thread->url.psz_path );
- length_media_name = strlen( strrchr( p_sys->p_thread->url.psz_path, '/' ) ) - 1;
+ char* psz_tmp = strrchr( p_sys->p_thread->url.psz_path, '/' );
+ if( !psz_tmp )
+ goto error;
+ length_media_name = strlen( psz_tmp ) - 1;
p_sys->p_thread->psz_application = strndup( p_sys->p_thread->url.psz_path + 1, length_path - length_media_name - 2 );
p_sys->p_thread->psz_media = strdup( p_sys->p_thread->url.psz_path + ( length_path - length_media_name ) );
if( p_sys->p_thread->url.psz_username && *p_sys->p_thread->url.psz_username )
{
- msg_Dbg( p_access, " user='%s', pwd='%s'",
- p_sys->p_thread->url.psz_username, p_sys->p_thread->url.psz_password );
+ msg_Dbg( p_access, " user='%s'", p_sys->p_thread->url.psz_username );
}
/* Initialize thread variables */
- p_sys->p_thread->b_die = 0;
p_sys->p_thread->b_error= 0;
p_sys->p_thread->p_fifo_input = block_FifoNew();
p_sys->p_thread->p_empty_blocks = block_FifoNew();
p_sys->p_thread->rtmp_headers_send[i].body = NULL;
}
- vlc_cond_init( p_sys->p_thread, &p_sys->p_thread->wait );
+ vlc_cond_init( &p_sys->p_thread->wait );
vlc_mutex_init( &p_sys->p_thread->lock );
p_sys->p_thread->result_connect = 1;
}
do
- p_sys->p_thread->fd = net_Accept( p_access, p_fd_listen, -1 );
+ p_sys->p_thread->fd = net_Accept( p_access, p_fd_listen );
while( p_sys->p_thread->fd == -1 );
net_ListenClose( p_fd_listen );
}
}
- if( vlc_thread_create( p_sys->p_thread, "rtmp control thread", ThreadControl,
- VLC_THREAD_PRIORITY_INPUT, false ) )
+ if( vlc_clone( &p_sys->p_thread->thread, ThreadControl, p_sys->p_thread,
+ VLC_THREAD_PRIORITY_INPUT ) )
{
msg_Err( p_access, "cannot spawn rtmp control thread" );
goto error2;
if( rtmp_connect_passive( p_sys->p_thread ) < 0 )
{
msg_Err( p_access, "connect passive failed");
+ vlc_cancel( p_sys->p_thread->thread );
+ vlc_join( p_sys->p_thread->thread, NULL );
goto error2;
}
}
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 );
-
vlc_UrlClean( &p_sys->p_thread->url );
+ vlc_object_release( p_sys->p_thread );
free( p_sys );
return VLC_EGENERIC;
sout_access_out_sys_t *p_sys = p_access->p_sys;
int i;
-// p_sys->p_thread->b_die = true;
- vlc_object_kill( p_sys->p_thread );
- block_FifoWake( p_sys->p_thread->p_fifo_input );
- block_FifoWake( p_sys->p_thread->p_empty_blocks );
-
- vlc_thread_join( p_sys->p_thread );
+ vlc_cancel( p_sys->p_thread->thread );
+ vlc_join( p_sys->p_thread->thread, NULL );
vlc_cond_destroy( &p_sys->p_thread->wait );
vlc_mutex_destroy( &p_sys->p_thread->lock );
net_Close( p_sys->p_thread->fd );
- vlc_object_detach( p_sys->p_thread );
vlc_object_release( p_sys->p_thread );
vlc_UrlClean( &p_sys->p_thread->url );
/*****************************************************************************
* ThreadControl: manage control messages and pipe media to Read
*****************************************************************************/
-static void ThreadControl( vlc_object_t *p_this )
+static void* ThreadControl( void *p_this )
{
- rtmp_control_thread_t *p_thread = (rtmp_control_thread_t *) p_this;
+ rtmp_control_thread_t *p_thread = p_this;
rtmp_packet_t *rtmp_packet;
+ int canc = vlc_savecancel ();
rtmp_init_handler( p_thread->rtmp_handler );
- while( vlc_object_alive (p_thread) )
+ for( ;; )
{
+ vlc_restorecancel( canc );
rtmp_packet = rtmp_read_net_packet( p_thread );
+ canc = vlc_savecancel( );
if( rtmp_packet != NULL )
{
if( rtmp_packet->content_type < 0x01 /* RTMP_CONTENT_TYPE_CHUNK_SIZE */
else
{
/* Sometimes server close connection too soon */
+#warning Locking bug here.
if( p_thread->result_connect )
{
vlc_mutex_lock( &p_thread->lock );
vlc_cond_signal( &p_thread->wait );
vlc_mutex_unlock( &p_thread->lock );
}
-
- p_thread->b_die = 1;
+ break;
}
}
+ vlc_restorecancel (canc);
+ return NULL;
}