* Added debug messages in the video synchro

* Fixed a bug in the video synchro time scheduling
* Made the vout more precise on display dates

diff --git a/include/config.h.in b/include/config.h.in
index f94ca152b6df14222fd698ac0879d596bf6e172a..c7d65faf7dbd7045cf72c535801f23353e6278c7 100644 (file)
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -79,10 +79,11 @@
 
 /* Modules specific debugging - this will produce a lot of output, but can be
  * usefull to track a bug */
-#define DEBUG_INTF
-#define DEBUG_INPUT
-#define DEBUG_AUDIO
-//#define DEBUG_VIDEO
+//#define DEBUG_INTF
+//#define DEBUG_INPUT
+//#define DEBUG_AUDIO
+#define DEBUG_VOUT
+#define DEBUG_VPAR
 
 /* Debugging log file - if defined, a file can be used to store all messages. If
  * DEBUG_LOG_ONLY is defined, debug messages will only be printed to the log and

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 556193e7f81fd2bc70f995bb5a20490162fce861..7c7c06e9c60d77a35b432a8bcea5515c601eab58 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -328,7 +328,7 @@ void vout_DestroyThread( vout_thread_t *p_vout, int *pi_status )
  *****************************************************************************/
 void  vout_DisplaySubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic )
 {
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
     char        psz_begin_date[MSTRTIME_MAX_SIZE]; /* buffer for date string */
     char        psz_end_date[MSTRTIME_MAX_SIZE];   /* buffer for date string */
 #endif
@@ -345,7 +345,7 @@ void  vout_DisplaySubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic )
     /* Remove reservation flag */
     p_subpic->i_status = READY_SUBPICTURE;
 
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
     /* Send subpicture information */
     intf_DbgMsg("subpicture %p: type=%d, begin date=%s, end date=%s\n",
                 p_subpic, p_subpic->i_type,
@@ -388,7 +388,7 @@ subpicture_t *vout_CreateSubPicture( vout_thread_t *p_vout, int i_type,
                  * the best possible case, since no memory allocation needs
                  * to be done */
                 p_vout->p_subpicture[i_subpic].i_status = RESERVED_SUBPICTURE;
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
                 intf_DbgMsg("subpicture %p (in destroyed subpicture slot)\n",
                             &p_vout->p_subpicture[i_subpic] );
 #endif
@@ -463,7 +463,7 @@ subpicture_t *vout_CreateSubPicture( vout_thread_t *p_vout, int i_type,
             intf_ErrMsg("spu warning: %s\n", strerror( ENOMEM ) );
         }
 
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
         intf_DbgMsg("subpicture %p (in free subpicture slot)\n", p_free_subpic );
 #endif
         vlc_mutex_unlock( &p_vout->subpicture_lock );
@@ -497,7 +497,7 @@ void vout_DestroySubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic )
 
     p_subpic->i_status = DESTROYED_SUBPICTURE;
 
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
     intf_DbgMsg("subpicture %p\n", p_subpic);
 #endif
 }
@@ -527,7 +527,7 @@ void  vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic )
 #endif
     }
 
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
     intf_DbgMsg("picture %p\n", p_pic);
 #endif
     vlc_mutex_unlock( &p_vout->picture_lock );
@@ -542,7 +542,7 @@ void  vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic )
  *****************************************************************************/
 void  vout_DatePicture( vout_thread_t *p_vout, picture_t *p_pic, mtime_t date )
 {
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
     char        psz_date[MSTRTIME_MAX_SIZE];                         /* date */
 #endif
 
@@ -563,7 +563,7 @@ void  vout_DatePicture( vout_thread_t *p_vout, picture_t *p_pic, mtime_t date )
 #endif
     }
 
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
     intf_DbgMsg("picture %p, display date: %s\n", p_pic, mstrtime( psz_date, p_pic->date) );
 #endif
     vlc_mutex_unlock( &p_vout->picture_lock );
@@ -607,7 +607,7 @@ picture_t *vout_CreatePicture( vout_thread_t *p_vout, int i_type,
                  * memory allocation needs to be done */
                 p_vout->p_picture[i_picture].i_status = RESERVED_PICTURE;
                 p_vout->i_pictures++;
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
                 intf_DbgMsg("picture %p (in destroyed picture slot)\n",
                             &p_vout->p_picture[i_picture] );
 #endif
@@ -701,7 +701,7 @@ picture_t *vout_CreatePicture( vout_thread_t *p_vout, int i_type,
             intf_ErrMsg( "vout warning: %s\n", strerror( ENOMEM ) );
         }
 
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
         intf_DbgMsg("picture %p (in free picture slot)\n", p_free_picture );
 #endif
         vlc_mutex_unlock( &p_vout->picture_lock );
@@ -738,7 +738,7 @@ void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic )
    p_pic->i_status = DESTROYED_PICTURE;
    p_vout->i_pictures--;
 
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
    intf_DbgMsg("picture %p\n", p_pic);
 #endif
    vlc_mutex_unlock( &p_vout->picture_lock );
@@ -755,7 +755,7 @@ void vout_LinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
     vlc_mutex_lock( &p_vout->picture_lock );
     p_pic->i_refcount++;
 
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
     intf_DbgMsg("picture %p refcount=%d\n", p_pic, p_pic->i_refcount );
 #endif
 
@@ -772,7 +772,7 @@ void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
     vlc_mutex_lock( &p_vout->picture_lock );
     p_pic->i_refcount--;
 
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
     if( p_pic->i_refcount < 0 )
     {
         intf_DbgMsg("error: refcount < 0\n");
@@ -786,7 +786,7 @@ void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
         p_vout->i_pictures--;
     }
 
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
     intf_DbgMsg("picture %p refcount=%d\n", p_pic, p_pic->i_refcount );
 #endif
 
@@ -1006,7 +1006,7 @@ static void RunThread( vout_thread_t *p_vout)
             /* Computes FPS rate */
             p_vout->p_fps_sample[ p_vout->c_fps_samples++ % VOUT_FPS_SAMPLES ] = display_date;
 
-            if( display_date < current_date )
+            if( display_date < current_date - p_vout->render_time )
             {
                 /* Picture is late: it will be destroyed and the thread
                  * will sleep and go to next picture */
@@ -1164,7 +1164,7 @@ static void RunThread( vout_thread_t *p_vout)
         /* On awakening, take back lock and send immediately picture to display,
          * then swap buffers */
         vlc_mutex_lock( &p_vout->change_lock );
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
         intf_DbgMsg( "picture %p, subpicture %p in buffer %d, display=%d\n", p_pic, p_subpic,
                      p_vout->i_buffer_index, b_display /* && !(p_vout->i_changes & VOUT_NODISPLAY_CHANGE) */ );
 #endif
@@ -1388,7 +1388,7 @@ static void SetBufferArea( vout_thread_t *p_vout, int i_x, int i_y, int i_w, int
         }
         else
         {
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
             intf_DbgMsg("area overflow\n");
 #endif
             p_buffer->pi_area_end[VOUT_MAX_AREAS - 1] = i_h;
@@ -1412,7 +1412,7 @@ static void SetBufferArea( vout_thread_t *p_vout, int i_x, int i_y, int i_w, int
                  * move all old areas down */
                 if( p_buffer->i_areas == VOUT_MAX_AREAS )
                 {
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
                     intf_DbgMsg("areas overflow\n");
 #endif
                     p_buffer->pi_area_end[VOUT_MAX_AREAS - 2] = p_buffer->pi_area_end[VOUT_MAX_AREAS - 1];
@@ -1586,7 +1586,7 @@ static void SetBufferPicture( vout_thread_t *p_vout, picture_t *p_pic )
      */
     for( i_area = 0; i_area < p_buffer->i_areas; i_area++ )
     {
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
         intf_DbgMsg("clearing picture %p area in buffer %d: %d-%d\n", p_pic,
                     p_vout->i_buffer_index, p_buffer->pi_area_begin[i_area], p_buffer->pi_area_end[i_area] );
 #endif
@@ -1633,7 +1633,7 @@ static void SetBufferPicture( vout_thread_t *p_vout, picture_t *p_pic )
  *****************************************************************************/
 static void RenderPicture( vout_thread_t *p_vout, picture_t *p_pic )
 {
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
     char                psz_date[MSTRTIME_MAX_SIZE];         /* picture date */
     mtime_t             render_time;               /* picture rendering time */
 #endif
@@ -1645,7 +1645,7 @@ static void RenderPicture( vout_thread_t *p_vout, picture_t *p_pic )
     p_pic_data =        p_buffer->p_data +
                         p_buffer->i_pic_x * p_vout->i_bytes_per_pixel +
                         p_buffer->i_pic_y * p_vout->i_bytes_per_line;
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
     render_time = mdate();
 #endif
 
@@ -1685,7 +1685,7 @@ static void RenderPicture( vout_thread_t *p_vout, picture_t *p_pic )
 #endif
     }
 
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
     /* Print picture date and rendering time */
     intf_DbgMsg("picture %p rendered in buffer %d (%ld us), display date: %s\n", p_pic,
                 p_vout->i_buffer_index, (long) (mdate() - render_time),
@@ -2007,7 +2007,7 @@ static void RenderInterface( vout_thread_t *p_vout )
  *****************************************************************************/
 static int Manage( vout_thread_t *p_vout )
 {
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
     if( p_vout->i_changes )
     {
         intf_DbgMsg("changes: 0x%x (no display: 0x%x)\n", p_vout->i_changes,

diff --git a/src/video_parser/vpar_synchro.c b/src/video_parser/vpar_synchro.c
index b3ec2c4618e71ef0cea312cb98d186246baa1737..6d4a886a3b4d5ba332509c5715e3a6b9d1e4ec30 100644 (file)
--- a/src/video_parser/vpar_synchro.c
+++ b/src/video_parser/vpar_synchro.c
@@ -221,6 +221,9 @@ boolean_t vpar_SynchroChoose( vpar_thread_t * p_vpar, int i_coding_type,
         /* VPAR_SYNCHRO_DEFAULT */
         mtime_t         now, pts, period, tau_yuv;
         boolean_t       b_decode = 0;
+#ifdef DEBUG_VPAR
+        char            p_date[MSTRTIME_MAX_SIZE];
+#endif
 
         now = mdate();
         period = 1000000 / (p_vpar->sequence.i_frame_rate) * 1001;
@@ -244,7 +247,12 @@ boolean_t vpar_SynchroChoose( vpar_thread_t * p_vpar, int i_coding_type,
             }
             else
             {
-                pts = S.current_pts + period * S.i_n_b;
+                /* displaying order : B B P B B I
+                 *                      ^       ^
+                 *                      |       +- current picture
+                 *                      +- current PTS
+                 */
+                pts = S.current_pts + period * (S.i_n_b + 2);
             }
 
             if( (1 + S.i_n_p * (S.i_n_b + 1)) * period >
@@ -273,7 +281,7 @@ boolean_t vpar_SynchroChoose( vpar_thread_t * p_vpar, int i_coding_type,
             }
             else
             {
-                pts = S.current_pts + period * S.i_n_b;
+                pts = S.current_pts + period * (S.i_n_b + 2);
             }
 
             if( (1 + S.i_n_p * (S.i_n_b + 1)) * period >
@@ -306,7 +314,7 @@ boolean_t vpar_SynchroChoose( vpar_thread_t * p_vpar, int i_coding_type,
             if( S.i_eta_b + 1 > S.i_n_b )
                 S.i_n_b++;
 
-            pts = S.current_pts;
+            pts = S.current_pts + period;
 
             if( (S.i_n_b + 1) * period > S.p_tau[P_CODING_TYPE] )
             {
@@ -326,6 +334,13 @@ boolean_t vpar_SynchroChoose( vpar_thread_t * p_vpar, int i_coding_type,
         }
 
         vlc_mutex_unlock( &p_vpar->synchro.fifo_lock );
+#ifdef DEBUG_VPAR
+        intf_DbgMsg("vpar synchro debug: %s picture scheduled for %s, %s (%lld)\n",
+                    i_coding_type == B_CODING_TYPE ? "B" :
+                    (i_coding_type == P_CODING_TYPE ? "P" : "I"),
+                    mstrtime(p_date, pts), b_decode ? "decoding" : "trashed",
+                    S.p_tau[i_coding_type]);
+#endif
         return( b_decode );
 #undef S
 #undef TAU_PRIME
@@ -394,6 +409,11 @@ void vpar_SynchroEnd( vpar_thread_t * p_vpar, int i_garbage )
         {
             p_vpar->synchro.pi_meaningful[i_coding_type]++;
         }
+#ifdef DEBUG_VPAR
+        intf_DbgMsg("vpar synchro debug: finished decoding %s (%lld)\n",
+                    i_coding_type == B_CODING_TYPE ? "B" :
+                    (i_coding_type == P_CODING_TYPE ? "P" : "I"), tau);
+#endif
     }
 
     FIFO_INCREMENT( i_start );