* libdvdcss enhancements by Billy Biggs <vektor@dumbterm.net>. This breaks

[vlc] / src / video_parser / vpar_synchro.c

diff --git a/src/video_parser/vpar_synchro.c b/src/video_parser/vpar_synchro.c
index b50207cd484a9d30383101672b853e63474e2794..4633896c154cdbae96af1846da780befd3f0cb39 100644 (file)
--- a/src/video_parser/vpar_synchro.c
+++ b/src/video_parser/vpar_synchro.c
@@ -2,7 +2,7 @@
  * vpar_synchro.c : frame dropping routines
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vpar_synchro.c,v 1.87 2001/04/06 09:15:48 sam Exp $
+ * $Id: vpar_synchro.c,v 1.91 2001/07/11 02:01:05 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -113,12 +113,11 @@
 
 #include "video_decoder.h"
 #include "vdec_motion.h"
-#include "../video_decoder/vdec_idct.h"
 
 #include "vpar_blocks.h"
-#include "../video_decoder/vpar_headers.h"
-#include "../video_decoder/vpar_synchro.h"
-#include "../video_decoder/video_parser.h"
+#include "vpar_headers.h"
+#include "vpar_synchro.h"
+#include "video_parser.h"
 
 #include "main.h"
 
@@ -224,7 +223,7 @@ boolean_t vpar_SynchroChoose( vpar_thread_t * p_vpar, int i_coding_type,
         mtime_t         now, period, tau_yuv;
         mtime_t         pts = 0;
         boolean_t       b_decode = 0;
-#ifdef DEBUG_VPAR
+#ifdef TRACE_VPAR
         char            p_date[MSTRTIME_MAX_SIZE];
 #endif
 
@@ -266,7 +265,7 @@ boolean_t vpar_SynchroChoose( vpar_thread_t * p_vpar, int i_coding_type,
                 b_decode = (pts - now) > (TAU_PRIME(I_CODING_TYPE) + DELTA);
             }
             if( !b_decode )
-                intf_WarnMsg( 3, "vpar synchro warning: trashing I (%lld)",
+                intf_WarnMsg( 1, "vpar synchro warning: trashing I (%lld)",
                              pts - now);
             break;
 
@@ -321,7 +320,7 @@ boolean_t vpar_SynchroChoose( vpar_thread_t * p_vpar, int i_coding_type,
 #ifdef VDEC_SMP
         vlc_mutex_unlock( &p_vpar->synchro.fifo_lock );
 #endif
-#ifdef DEBUG_VPAR
+#ifdef TRACE_VPAR
         intf_DbgMsg("vpar synchro debug: %s picture scheduled for %s, %s (%lld)",
                     i_coding_type == B_CODING_TYPE ? "B" :
                     (i_coding_type == P_CODING_TYPE ? "P" : "I"),
@@ -414,7 +413,7 @@ void vpar_SynchroEnd( vpar_thread_t * p_vpar, int i_garbage )
             }
         }
 
-#ifdef DEBUG_VPAR
+#ifdef TRACE_VPAR
         intf_DbgMsg("vpar synchro debug: finished decoding %s (%lld)",
                     i_coding_type == B_CODING_TYPE ? "B" :
                     (i_coding_type == P_CODING_TYPE ? "P" : "I"), tau);
@@ -459,9 +458,10 @@ void vpar_SynchroNewPicture( vpar_thread_t * p_vpar, int i_coding_type,
     {
     case I_CODING_TYPE:
         if( p_vpar->synchro.i_eta_p
-                && p_vpar->synchro.i_eta_p != p_vpar->synchro.i_n_p )
+             && p_vpar->synchro.i_eta_p != p_vpar->synchro.i_n_p )
         {
-            intf_WarnMsg( 1, "Stream periodicity changed from P[%d] to P[%d]",
+            intf_WarnMsg( 3, "vpar info: stream periodicity changed "
+                          "from P[%d] to P[%d]",
                           p_vpar->synchro.i_n_p, p_vpar->synchro.i_eta_p );
             p_vpar->synchro.i_n_p = p_vpar->synchro.i_eta_p;
         }
@@ -488,9 +488,10 @@ void vpar_SynchroNewPicture( vpar_thread_t * p_vpar, int i_coding_type,
     case P_CODING_TYPE:
         p_vpar->synchro.i_eta_p++;
         if( p_vpar->synchro.i_eta_b
-                && p_vpar->synchro.i_eta_b != p_vpar->synchro.i_n_b )
+             && p_vpar->synchro.i_eta_b != p_vpar->synchro.i_n_b )
         {
-            intf_WarnMsg( 1, "Stream periodicity changed from B[%d] to B[%d]",
+            intf_WarnMsg( 3, "vpar info: stream periodicity changed "
+                          "from B[%d] to B[%d]",
                           p_vpar->synchro.i_n_b, p_vpar->synchro.i_eta_b );
             p_vpar->synchro.i_n_b = p_vpar->synchro.i_eta_b;
         }