# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <sys/types.h>
#include <sys/stat.h>
"of packets that will be sent at a time. It " \
"helps reducing the scheduling load on " \
"heavily-loaded systems." )
-#define AUTO_MCAST_TEXT N_("Automatic multicast streaming")
-#define AUTO_MCAST_LONGTEXT N_("Allocates an outbound multicast address " \
- "automatically.")
vlc_module_begin();
- set_description( _("UDP stream output") );
+ set_description( N_("UDP stream output") );
set_shortname( "UDP" );
set_category( CAT_SOUT );
set_subcategory( SUBCAT_SOUT_ACO );
true );
add_obsolete_integer( SOUT_CFG_PREFIX "late" );
add_obsolete_bool( SOUT_CFG_PREFIX "raw" );
- add_bool( SOUT_CFG_PREFIX "auto-mcast", false, NULL, AUTO_MCAST_TEXT,
- AUTO_MCAST_LONGTEXT, true );
set_capability( "sout access", 100 );
add_shortcut( "udp" );
*****************************************************************************/
static const char *const ppsz_sout_options[] = {
- "auto-mcast",
"caching",
"group",
NULL
static ssize_t Write ( sout_access_out_t *, block_t * );
static int Seek ( sout_access_out_t *, off_t );
+static int Control( sout_access_out_t *, int, va_list );
-static void ThreadWrite( vlc_object_t * );
+static void* ThreadWrite( vlc_object_t * );
static block_t *NewUDPPacket( sout_access_out_t *, mtime_t );
-static const char *MakeRandMulticast (int family, char *buf, size_t buflen);
typedef struct sout_access_thread_t
{
VLC_COMMON_MEMBERS
- sout_instance_t *p_sout;
-
block_fifo_t *p_fifo;
int i_handle;
}
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;
i_dst_port = DEFAULT_PORT;
- if (var_GetBool (p_access, SOUT_CFG_PREFIX"auto-mcast"))
+ char *psz_parser = psz_dst_addr = strdup( p_access->psz_path );
+ if( !psz_dst_addr )
{
- char buf[INET6_ADDRSTRLEN];
- if (MakeRandMulticast (AF_INET, buf, sizeof (buf)) != NULL)
- psz_dst_addr = strdup (buf);
+ free( p_sys );
+ return VLC_ENOMEM;
}
- else
- {
- char *psz_parser = psz_dst_addr = strdup( p_access->psz_path );
- if (psz_parser[0] == '[')
- psz_parser = strchr (psz_parser, ']');
+ if (psz_parser[0] == '[')
+ psz_parser = strchr (psz_parser, ']');
- psz_parser = strchr (psz_parser ?: psz_dst_addr, ':');
- if (psz_parser != NULL)
- {
- *psz_parser++ = '\0';
- i_dst_port = atoi (psz_parser);
- }
+ psz_parser = strchr (psz_parser ?: psz_dst_addr, ':');
+ if (psz_parser != NULL)
+ {
+ *psz_parser++ = '\0';
+ i_dst_port = atoi (psz_parser);
}
p_sys->p_thread =
vlc_object_create( p_access, sizeof( sout_access_thread_t ) );
if( !p_sys->p_thread )
{
- msg_Err( p_access, "out of memory" );
free (p_sys);
free (psz_dst_addr);
return VLC_ENOMEM;
}
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();
if( vlc_thread_create( p_sys->p_thread, "sout write thread", ThreadWrite,
VLC_THREAD_PRIORITY_HIGHEST, false ) )
{
- msg_Err( p_access->p_sout, "cannot spawn sout access thread" );
+ msg_Err( p_access, "cannot spawn sout access thread" );
net_Close (i_handle);
vlc_object_release( p_sys->p_thread );
free (p_sys);
p_access->pf_write = Write;
p_access->pf_seek = Seek;
-
- /* update p_sout->i_out_pace_nocontrol */
- p_access->p_sout->i_out_pace_nocontrol++;
+ p_access->pf_control = Control;
return VLC_SUCCESS;
}
int i;
vlc_object_kill( p_sys->p_thread );
- block_FifoWake( p_sys->p_thread->p_fifo );
for( i = 0; i < 10; i++ )
{
vlc_object_detach( p_sys->p_thread );
vlc_object_release( p_sys->p_thread );
- /* update p_sout->i_out_pace_nocontrol */
- p_access->p_sout->i_out_pace_nocontrol--;
msg_Dbg( p_access, "UDP access output closed" );
free( p_sys );
}
+static int Control( sout_access_out_t *p_access, int i_query, va_list args )
+{
+ (void)p_access;
+
+ switch( i_query )
+ {
+ case ACCESS_OUT_CONTROLS_PACE:
+ *va_arg( args, bool * ) = false;
+ break;
+
+ default:
+ return VLC_EGENERIC;
+ }
+ return VLC_SUCCESS;
+}
+
/*****************************************************************************
* Write: standard write on a file descriptor.
*****************************************************************************/
if( block_FifoCount( p_sys->p_thread->p_empty_blocks ) == 0 )
{
- p_buffer = block_New( p_access->p_sout, p_sys->i_mtu );
+ p_buffer = block_Alloc( p_sys->i_mtu );
}
else
{
/*****************************************************************************
* ThreadWrite: Write a packet on the network at the good time.
*****************************************************************************/
-static void ThreadWrite( vlc_object_t *p_this )
+static void* ThreadWrite( vlc_object_t *p_this )
{
sout_access_thread_t *p_thread = (sout_access_thread_t*)p_this;
mtime_t i_date_last = -1;
mtime_t i_to_send = p_thread->i_group;
int i_dropped_packets = 0;
- while( !p_thread->b_die )
+ for (;;)
{
block_t *p_pk;
mtime_t i_date, i_sent;
}
#endif
p_pk = block_FifoGet( p_thread->p_fifo );
- if( p_pk == NULL )
- continue; /* forced wake-up */
i_date = p_thread->i_caching + p_pk->i_dts;
if( i_date_last > 0 )
}
}
+ block_cleanup_push( p_pk );
i_to_send--;
if( !i_to_send || (p_pk->i_flags & BLOCK_FLAG_CLOCK) )
{
mwait( i_date );
i_to_send = p_thread->i_group;
}
- ssize_t val = send( p_thread->i_handle, p_pk->p_buffer,
- p_pk->i_buffer, 0 );
- if (val == -1)
- {
+ if ( send( p_thread->i_handle, p_pk->p_buffer,
+ p_pk->i_buffer, 0 ) == -1 )
msg_Warn( p_thread, "send error: %m" );
- }
+ vlc_cleanup_pop();
if( i_dropped_packets )
{
i_date_last = i_date;
}
-}
-
-
-static const char *MakeRandMulticast (int family, char *buf, size_t buflen)
-{
- uint32_t rand = (getpid() & 0xffff)
- | (uint32_t)(((mdate () >> 10) & 0xffff) << 16);
-
- switch (family)
- {
-#ifdef AF_INET6
- case AF_INET6:
- {
- struct in6_addr addr;
- memcpy (&addr, "\xff\x38\x00\x00" "\x00\x00\x00\x00"
- "\x00\x00\x00\x00", 12);
- rand |= 0x80000000;
- memcpy (addr.s6_addr + 12, &(uint32_t){ htonl (rand) }, 4);
- return inet_ntop (family, &addr, buf, buflen);
- }
-#endif
-
- case AF_INET:
- {
- struct in_addr addr;
- addr.s_addr = htonl ((rand & 0xffffff) | 0xe8000000);
- return inet_ntop (family, &addr, buf, buflen);
- }
- }
-#ifdef EAFNOSUPPORT
- errno = EAFNOSUPPORT;
-#endif
return NULL;
}
projects / vlc / blobdiff