#define CACHING_TEXT N_("Caching value (ms)")
#define CACHING_LONGTEXT N_( \
- "Allows you to modify the default caching value for UDP streams. This " \
- "value should be set in millisecond units." )
+ "Default caching value for outbound UDP streams. This " \
+ "value should be set in milliseconds." )
#define TTL_TEXT N_("Time-To-Live (TTL)")
-#define TTL_LONGTEXT N_("Allows you to define the Time-To-Live of the " \
+#define TTL_LONGTEXT N_("Time-To-Live of the " \
"outgoing stream.")
#define GROUP_TEXT N_("Group packets")
#define GROUP_LONGTEXT N_("Packets can be sent one by one at the right time " \
- "or by groups. This allows you to give the number " \
+ "or by groups. You can choose the number " \
"of packets that will be sent at a time. It " \
"helps reducing the scheduling load on " \
"heavily-loaded systems." )
#define RAW_TEXT N_("Raw write")
-#define RAW_LONGTEXT N_("If you enable this option, packets will be sent " \
+#define RAW_LONGTEXT N_("Packets will be sent " \
"directly, without trying to fill the MTU (ie, " \
"without trying to make the biggest possible packets " \
"in order to improve streaming)." )
int64_t i_caching;
int i_group;
- vlc_mutex_t blocks_lock;
- block_t *p_empty_blocks;
- int i_empty_depth;
+ block_fifo_t *p_empty_blocks;
} sout_access_thread_t;
return VLC_EGENERIC;
}
+ vlc_object_attach( p_sys->p_thread, p_access );
p_sys->p_thread->p_sout = p_access->p_sout;
p_sys->p_thread->b_die = 0;
p_sys->p_thread->b_error= 0;
p_sys->p_thread->p_fifo = block_FifoNew( p_access );
- p_sys->p_thread->p_empty_blocks = NULL;
- p_sys->p_thread->i_empty_depth = 0;
- vlc_mutex_init( p_access, &p_sys->p_thread->blocks_lock );
+ p_sys->p_thread->p_empty_blocks = block_FifoNew( p_access );
var_Get( p_access, SOUT_CFG_PREFIX "ttl", &val );
i_handle = net_ConnectUDP( p_this, psz_dst_addr, i_dst_port, val.i_int );
vlc_thread_join( p_sys->p_thread );
block_FifoRelease( p_sys->p_thread->p_fifo );
+ block_FifoRelease( p_sys->p_thread->p_empty_blocks );
if( p_sys->p_buffer ) block_Release( p_sys->p_buffer );
- while ( p_sys->p_thread->p_empty_blocks != NULL )
- {
- block_t *p_next = p_sys->p_thread->p_empty_blocks->p_next;
- block_Release( p_sys->p_thread->p_empty_blocks );
- p_sys->p_thread->p_empty_blocks = p_next;
- }
- vlc_mutex_destroy( &p_sys->p_thread->blocks_lock );
net_Close( p_sys->p_thread->i_handle );
+ vlc_object_detach( p_sys->p_thread );
+ vlc_object_destroy( p_sys->p_thread );
/* update p_sout->i_out_pace_nocontrol */
p_access->p_sout->i_out_pace_nocontrol--;
sout_access_out_sys_t *p_sys = p_access->p_sys;
block_t *p_buf;
- vlc_mutex_lock( &p_sys->p_thread->blocks_lock );
- while ( p_sys->p_thread->i_empty_depth >= MAX_EMPTY_BLOCKS )
+ while ( p_sys->p_thread->p_empty_blocks->i_depth >= MAX_EMPTY_BLOCKS )
{
- p_buf = p_sys->p_thread->p_empty_blocks;
- p_sys->p_thread->p_empty_blocks =
- p_sys->p_thread->p_empty_blocks->p_next;
- p_sys->p_thread->i_empty_depth--;
- vlc_mutex_unlock( &p_sys->p_thread->blocks_lock );
+ p_buf = block_FifoGet(p_sys->p_thread->p_empty_blocks);
block_Release( p_buf );
- vlc_mutex_lock( &p_sys->p_thread->blocks_lock );
}
- vlc_mutex_unlock( &p_sys->p_thread->blocks_lock );
block_FifoPut( p_sys->p_thread->p_fifo, p_buffer );
sout_access_out_sys_t *p_sys = p_access->p_sys;
block_t *p_buffer;
- vlc_mutex_lock( &p_sys->p_thread->blocks_lock );
- while ( p_sys->p_thread->i_empty_depth > MAX_EMPTY_BLOCKS )
+ while ( p_sys->p_thread->p_empty_blocks->i_depth > MAX_EMPTY_BLOCKS )
{
- p_buffer = p_sys->p_thread->p_empty_blocks;
- p_sys->p_thread->p_empty_blocks =
- p_sys->p_thread->p_empty_blocks->p_next;
- p_sys->p_thread->i_empty_depth--;
- vlc_mutex_unlock( &p_sys->p_thread->blocks_lock );
+ p_buffer = block_FifoGet( p_sys->p_thread->p_empty_blocks );
block_Release( p_buffer );
- vlc_mutex_lock( &p_sys->p_thread->blocks_lock );
}
- p_buffer = p_sys->p_thread->p_empty_blocks;
- if ( p_buffer != NULL )
+
+ if( p_sys->p_thread->p_empty_blocks->i_depth == 0 )
{
- p_sys->p_thread->p_empty_blocks =
- p_sys->p_thread->p_empty_blocks->p_next;
- p_sys->p_thread->i_empty_depth--;
- vlc_mutex_unlock( &p_sys->p_thread->blocks_lock );
- p_buffer->p_next = NULL;
- p_buffer->i_flags = 0;
- p_buffer = block_Realloc( p_buffer, 0, p_sys->i_mtu );
+ p_buffer = block_New( p_access->p_sout, p_sys->i_mtu );
}
else
{
- vlc_mutex_unlock( &p_sys->p_thread->blocks_lock );
- p_buffer = block_New( p_access->p_sout, p_sys->i_mtu );
+ p_buffer = block_FifoGet(p_sys->p_thread->p_empty_blocks );
+ p_buffer->i_flags = 0;
+ p_buffer = block_Realloc( p_buffer, 0, p_sys->i_mtu );
}
p_buffer->i_dts = i_dts;
{
block_t *p_pk;
mtime_t i_date, i_sent;
-
+#if 0
+ if( (i++ % 1000)==0 ) {
+ int i = 0;
+ int j = 0;
+ block_t *p_tmp = p_thread->p_empty_blocks->p_first;
+ while( p_tmp ) { p_tmp = p_tmp->p_next; i++;}
+ p_tmp = p_thread->p_fifo->p_first;
+ while( p_tmp ) { p_tmp = p_tmp->p_next; j++;}
+ msg_Err( p_thread, "fifo depth: %d/%d, empty blocks: %d/%d",
+ p_thread->p_fifo->i_depth, j,p_thread->p_empty_blocks->i_depth,i );
+ }
+#endif
p_pk = block_FifoGet( p_thread->p_fifo );
i_date = p_thread->i_caching + p_pk->i_dts;
msg_Dbg( p_thread, "mmh, hole ("I64Fd" > 2s) -> drop",
i_date - i_date_last );
- vlc_mutex_lock( &p_thread->blocks_lock );
- p_pk->p_next = p_thread->p_empty_blocks;
- p_thread->p_empty_blocks = p_pk;
- p_thread->i_empty_depth++;
- vlc_mutex_unlock( &p_thread->blocks_lock );
+ block_FifoPut( p_thread->p_empty_blocks, p_pk );
i_date_last = i_date;
i_dropped_packets++;
}
#endif
- vlc_mutex_lock( &p_thread->blocks_lock );
- p_pk->p_next = p_thread->p_empty_blocks;
- p_thread->p_empty_blocks = p_pk;
- p_thread->i_empty_depth++;
- vlc_mutex_unlock( &p_thread->blocks_lock );
+ block_FifoPut( p_thread->p_empty_blocks, p_pk );
i_date_last = i_date;
}