-slight modification in ClockManageRef: after a synchro reinit, we still

do the mwait and re-init last-cr so that there no date irregularity.
Such a thing is necessary for dvd playback at cell change ; however,
Meuuh, could you look at that since you might think we should do
otherwise.

-turned the "bitsream callback discontinuity" message to debug.

-removed modification of the title environnement variable in input dvd
at title change since we no longer restart the input at title change.

diff --git a/plugins/dvd/input_dvd.c b/plugins/dvd/input_dvd.c
index 782c47ecfa0e5f4e1135c23750c02e4c64764968..08cc37b335d4eb41a77d7c679f198fa82a247b1b 100644 (file)
--- a/plugins/dvd/input_dvd.c
+++ b/plugins/dvd/input_dvd.c
@@ -10,7 +10,7 @@
  *  -dvd_udf to find files
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: input_dvd.c,v 1.52 2001/04/29 02:48:51 stef Exp $
+ * $Id: input_dvd.c,v 1.53 2001/04/29 14:52:42 stef Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -581,7 +581,7 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
 
         /* uodate title environnement variable so that we don't
          * loop on the same title forever */
-        main_PutIntVariable( INPUT_TITLE_VAR, p_dvd->i_title + 1 );
+//        main_PutIntVariable( INPUT_TITLE_VAR, p_dvd->i_title + 1 );
 
         /* ifo vts */
         if( IfoTitleSet( p_dvd->p_ifo ) < 0 )

diff --git a/src/input/input_clock.c b/src/input/input_clock.c
index d44ee411f01ad850d84029517ad4567e001001eb..bb4970d992eb7fe16145aab730bd01f2a200ab31 100644 (file)
--- a/src/input/input_clock.c
+++ b/src/input/input_clock.c
@@ -2,7 +2,7 @@
  * input_clock.c: Clock/System date convertions, stream management
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_clock.c,v 1.12 2001/04/28 23:19:19 henri Exp $
+ * $Id: input_clock.c,v 1.13 2001/04/29 14:52:42 stef Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -150,6 +150,13 @@ void input_ClockManageRef( input_thread_t * p_input,
         /* Feed synchro with a new reference point. */
         ClockNewRef( p_input, p_pgrm, i_clock, mdate() );
         p_pgrm->i_synchro_state = SYNCHRO_OK;
+
+        if( p_input->stream.b_pace_control
+             && p_input->stream.pp_programs[0] == p_pgrm )
+        {
+            p_pgrm->last_cr = i_clock;
+            mwait( ClockToSysdate( p_input, p_pgrm, i_clock ) );
+        }
     }
     else
     {

diff --git a/src/video_parser/video_parser.c b/src/video_parser/video_parser.c
index 7f324eec241e9c62117a15d0277819182198c121..d9ba15f423aa94fee035ed24aee24dbce21d0e05 100644 (file)
--- a/src/video_parser/video_parser.c
+++ b/src/video_parser/video_parser.c
@@ -2,7 +2,7 @@
  * video_parser.c : video parser thread
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_parser.c,v 1.80 2001/04/28 03:36:25 sam Exp $
+ * $Id: video_parser.c,v 1.81 2001/04/29 14:52:42 stef Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -535,7 +535,9 @@ static void BitstreamCallback ( bit_stream_t * p_bit_stream,
 
         if( DECODER_FIFO_START( *p_bit_stream->p_decoder_fifo )->b_discontinuity )
         {
-            intf_WarnMsg( 1, "Discontinuity in BitstreamCallback" );
+#ifdef TRACE_VPAR
+            intf_DbgMsg( "Discontinuity in BitstreamCallback" );
+#endif
             /* Escape the current picture and reset the picture predictors. */
             p_vpar->sequence.b_expect_discontinuity = 1;
             p_vpar->picture.b_error = 1;
@@ -544,7 +546,9 @@ static void BitstreamCallback ( bit_stream_t * p_bit_stream,
 
     if( p_bit_stream->p_data->b_discard_payload )
     {
-        intf_WarnMsg( 1, "Discard payload in BitstreamCallback" );
+#ifdef TRACE_VPAR
+        intf_DbgMsg( "Discard payload in BitstreamCallback" );
+#endif
         /* 1 packet messed up, trash the slice. */
         p_vpar->picture.b_error = 1;
     }