[vlc-devel] commit: Obsolete auto-adjust-pts-delay. (Laurent Aimar )
git version control
git at videolan.org
Thu Oct 9 00:14:23 CEST 2008
vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Tue Oct 7 19:45:45 2008 +0200| [aa4b437134fac4d57a8b04f91631a283f215d8b1] | committer: Laurent Aimar
Obsolete auto-adjust-pts-delay.
The implementation design was broken. I will fix it once clock/decoder
API is more stable.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=aa4b437134fac4d57a8b04f91631a283f215d8b1
---
src/input/decoder.c | 101 --------------------------------------------
src/input/input.c | 3 +-
src/input/input_internal.h | 8 ----
src/input/var.c | 2 -
src/libvlc-module.c | 9 +----
5 files changed, 2 insertions(+), 121 deletions(-)
diff --git a/src/input/decoder.c b/src/input/decoder.c
index c7d1ec8..ce73258 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1106,105 +1106,6 @@ static void VoutFlushPicture( vout_thread_t *p_vout, mtime_t i_max_date )
vlc_mutex_unlock( &p_vout->picture_lock );
}
-#if 0
-static void DecoderOptimizePtsDelay( decoder_t *p_dec )
-{
- input_thread_t *p_input = p_dec->p_owner->p_input;
- vout_thread_t *p_vout = p_dec->p_owner->p_vout;
- input_thread_private_t *p_priv = p_input->p;
-
- picture_t *p_old = NULL;
- picture_t *p_young = NULL;
- int i;
-
- /* Enable with --auto-adjust-pts-delay */
- if( !p_priv->pts_adjust.b_auto_adjust )
- return;
-
- for( i = 0; i < I_RENDERPICTURES; i++ )
- {
- picture_t *p_pic = PP_RENDERPICTURE[i];
-
- if( p_pic->i_status != READY_PICTURE )
- continue;
-
- if( !p_old || p_pic->date < p_old->date )
- p_old = p_pic;
- if( !p_young || p_pic->date > p_young->date )
- p_young = p_pic;
- }
-
- if( !p_young || !p_old )
- return;
-
- /* Try to find if we can reduce the pts
- * This first draft is way too simple, and we can't say if the
- * algo will converge. It's also full of constants.
- * But this simple algo allows to reduce the latency
- * to the minimum.
- * The whole point of this, is to bypass the pts_delay set
- * by the access but also the delay arbitraly set by
- * the remote server.
- * Actually the remote server's muxer may set up a
- * pts<->dts delay in the muxed stream. That is
- * why we may end up in having a negative pts_delay,
- * to compensate that artificial delay. */
- const mtime_t i_buffer_length = p_young->date - p_old->date;
- int64_t i_pts_slide = 0;
- if( i_buffer_length < 10000 )
- {
- if( p_priv->pts_adjust.i_num_faulty > 10 )
- {
- i_pts_slide = __MAX(p_input->i_pts_delay *3 / 2, 10000);
- p_priv->pts_adjust.i_num_faulty = 0;
- }
- if( p_priv->pts_adjust.b_to_high )
- {
- p_priv->pts_adjust.b_to_high = !p_priv->pts_adjust.b_to_high;
- p_priv->pts_adjust.i_num_faulty = 0;
- }
- p_priv->pts_adjust.i_num_faulty++;
- }
- else if( i_buffer_length > 100000 )
- {
- if( p_priv->pts_adjust.i_num_faulty > 25 )
- {
- i_pts_slide = -i_buffer_length/2;
- p_priv->pts_adjust.i_num_faulty = 0;
- }
- if( p_priv->pts_adjust.b_to_high )
- {
- p_priv->pts_adjust.b_to_high = !p_priv->pts_adjust.b_to_high;
- p_priv->pts_adjust.i_num_faulty = 0;
- }
- p_priv->pts_adjust.i_num_faulty++;
- }
- if( i_pts_slide != 0 )
- {
- const mtime_t i_pts_delay_org = p_input->i_pts_delay;
-
- p_input->i_pts_delay += i_pts_slide;
-
- /* Don't play with the pts delay for more than -2<->3sec */
- if( p_input->i_pts_delay < -2000000 )
- p_input->i_pts_delay = -2000000;
- else if( p_input->i_pts_delay > 3000000 )
- p_input->i_pts_delay = 3000000;
- i_pts_slide = p_input->i_pts_delay - i_pts_delay_org;
-
- msg_Dbg( p_input, "Sliding the pts by %dms pts delay at %dms picture buffer was %dms",
- (int)i_pts_slide/1000, (int)p_input->i_pts_delay/1000, (int)i_buffer_length/1000);
-
- vlc_mutex_lock( &p_vout->picture_lock );
- /* Slide all the picture */
- for( i = 0; i < I_RENDERPICTURES; i++ )
- PP_RENDERPICTURE[i]->date += i_pts_slide;
- /* FIXME: slide aout/spu */
- vlc_mutex_unlock( &p_vout->picture_lock );
- }
-}
-#endif
-
static void DecoderDecodeVideo( decoder_t *p_dec, block_t *p_block )
{
decoder_owner_sys_t *p_owner = p_dec->p_owner;
@@ -1273,8 +1174,6 @@ static void DecoderDecodeVideo( decoder_t *p_dec, block_t *p_block )
vout_DatePicture( p_vout, p_pic, p_pic->date );
- /* Re-enable it but do it right this time */
- //DecoderOptimizePtsDelay( p_dec );
vout_DisplayPicture( p_vout, p_pic );
}
else
diff --git a/src/input/input.c b/src/input/input.c
index 9e39fee..5c63147 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -245,7 +245,6 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
input_ControlVarInit( p_input );
/* */
- p_input->p->pts_adjust.b_auto_adjust = var_GetBool( p_input, "auto-adjust-pts-delay" );
p_input->p->input.i_cr_average = var_GetInteger( p_input, "cr-average" );
if( !p_input->b_preparsing )
@@ -782,7 +781,7 @@ static void MainLoop( input_thread_t *p_input )
if( !p_input->b_eof && !p_input->b_error && p_input->p->input.b_eof )
{
/* We have finish to demux data but not to play them */
- while( !p_input->b_die )
+ while( vlc_object_alive( p_input ) )
{
if( input_EsOutDecodersEmpty( p_input->p->p_es_out ) )
break;
diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index 4e11ed1..4ba8701 100644
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -117,14 +117,6 @@ struct input_thread_private_t
int i_slave;
input_source_t **slave;
- /* pts delay fixup */
- struct
- {
- int i_num_faulty;
- bool b_to_high;
- bool b_auto_adjust;
- } pts_adjust;
-
/* Stats counters */
struct {
counter_t *p_read_packets;
diff --git a/src/input/var.c b/src/input/var.c
index b44757f..13f0436 100644
--- a/src/input/var.c
+++ b/src/input/var.c
@@ -463,8 +463,6 @@ void input_ConfigVarInit ( input_thread_t *p_input )
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_input, "clock-synchro",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
- var_Create( p_input, "auto-adjust-pts-delay",
- VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
}
var_Create( p_input, "seekable", VLC_VAR_BOOL );
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 76c7ca0..6d45ab0 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1028,12 +1028,6 @@ static const char *const ppsz_clock_descriptions[] =
"This option is useful if you want to lower the latency when " \
"reading a stream")
-#define AUTO_ADJUST_PTS_DELAY N_("(Experimental) Minimize latency when" \
- "reading live stream.")
-#define AUTO_ADJUST_PTS_DELAY_LONGTEXT N_( \
- "This option is useful if you want to lower the latency when " \
- "reading a stream")
-
#define PLUGIN_PATH_TEXT N_("Modules search path")
#define PLUGIN_PATH_LONGTEXT N_( \
"Additional path for VLC to look for its modules. You can add " \
@@ -1885,8 +1879,7 @@ vlc_module_begin();
add_bool( "use-stream-immediate", false, NULL,
USE_STREAM_IMMEDIATE, USE_STREAM_IMMEDIATE_LONGTEXT, true );
- add_bool( "auto-adjust-pts-delay", false, NULL,
- AUTO_ADJUST_PTS_DELAY, AUTO_ADJUST_PTS_DELAY_LONGTEXT, true );
+ add_obsolete_bool( "auto-adjust-pts-delay" );
#if !defined(__APPLE__) && !defined(SYS_BEOS) && defined(LIBVLC_USE_PTHREAD)
add_bool( "rt-priority", false, NULL, RT_PRIORITY_TEXT,
More information about the vlc-devel
mailing list