From cd4cd776565550a76a8bb7af7e1c500aa238e439 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Mon, 18 Aug 2003 17:30:48 +0000 Subject: [PATCH] * udp: udp-sout-caching is now also accessible by instance variable "caching". (ex: udp{caching=ms}) --- modules/access_output/udp.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c index 034119e8e4..956a19d948 100644 --- a/modules/access_output/udp.c +++ b/modules/access_output/udp.c @@ -2,7 +2,7 @@ * udp.c ***************************************************************************** * Copyright (C) 2001, 2002 VideoLAN - * $Id: udp.c,v 1.12 2003/08/01 19:38:48 fenrir Exp $ + * $Id: udp.c,v 1.13 2003/08/18 17:30:48 fenrir Exp $ * * Authors: Laurent Aimar * Eric Petit @@ -96,6 +96,8 @@ typedef struct sout_access_thread_s int i_handle; + int64_t i_caching; + } sout_access_thread_t; struct sout_access_out_sys_t @@ -209,6 +211,11 @@ static int Open( vlc_object_t *p_this ) module_Unneed( p_sys->p_thread, p_network ); p_sys->p_thread->i_handle = socket_desc.i_handle; + p_sys->p_thread->i_caching = config_GetInt( p_this, "udp-sout-caching" ) * 1000; + if( ( val = sout_cfg_find_value( p_access->p_cfg, "caching" ) ) ) + { + p_sys->p_thread->i_caching = atoll( val ) * 1000; + } p_sys->i_mtu = socket_desc.i_mtu; if( vlc_thread_create( p_sys->p_thread, "sout write thread", ThreadWrite, @@ -380,12 +387,8 @@ static void ThreadWrite( vlc_object_t *p_this ) { sout_access_thread_t *p_thread = (sout_access_thread_t*)p_this; sout_instance_t *p_sout = p_thread->p_sout; - mtime_t i_pts_delay; mtime_t i_date_last = -1; - /* Get the i_pts_delay value */ - i_pts_delay = config_GetInt( p_this, "udp-sout-caching" ) * 1000; - while( ! p_thread->b_die ) { sout_buffer_t *p_pk; @@ -393,7 +396,7 @@ static void ThreadWrite( vlc_object_t *p_this ) p_pk = sout_FifoGet( p_thread->p_fifo ); - i_date = i_pts_delay + p_pk->i_dts; + i_date = p_thread->i_caching + p_pk->i_dts; if( i_date_last > 0 ) { if( i_date - i_date_last > 2000000 ) -- 2.20.1