-Added a SYNCHRO_START in DVDRead for each cell change to fix

[vlc] / src / video_parser / video_parser.c

diff --git a/src/video_parser/video_parser.c b/src/video_parser/video_parser.c
index fb17e3eac1a85af5fbfdf7c6a7ef28747d4b417f..52d56c4b898ae8862dc18f76c40bb84b40dca6ca 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.71 2001/02/07 15:32:26 massiot Exp $
+ * $Id: video_parser.c,v 1.78 2001/03/22 01:23:03 stef Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -40,7 +40,6 @@
 #include "common.h"
 #include "threads.h"
 #include "mtime.h"
-#include "plugins.h"
 #include "modules.h"
 
 #include "intf_msg.h"
@@ -104,7 +103,7 @@ vlc_thread_t vpar_CreateThread( vdec_config_t * p_config )
     /*
      * Choose the best motion compensation module
      */
-    p_vpar->p_motion_module = module_Need( p_main->p_module_bank,
+    p_vpar->p_motion_module = module_Need( p_main->p_bank,
                                            MODULE_CAPABILITY_MOTION, NULL );
 
     if( p_vpar->p_motion_module == NULL )
@@ -170,13 +169,13 @@ vlc_thread_t vpar_CreateThread( vdec_config_t * p_config )
      /*
       * Choose the best IDCT module
       */
-    p_vpar->p_idct_module = module_Need( p_main->p_module_bank,
+    p_vpar->p_idct_module = module_Need( p_main->p_bank,
                                          MODULE_CAPABILITY_IDCT, NULL );
 
     if( p_vpar->p_idct_module == NULL )
     {
         intf_ErrMsg( "vpar error: no suitable IDCT module" );
-        module_Unneed( p_main->p_module_bank, p_vpar->p_motion_module );
+        module_Unneed( p_main->p_bank, p_vpar->p_motion_module );
         free( p_vpar );
         return( 0 );
     }
@@ -193,8 +192,8 @@ vlc_thread_t vpar_CreateThread( vdec_config_t * p_config )
                             (vlc_thread_func_t)RunThread, (void *)p_vpar ) )
     {
         intf_ErrMsg("vpar error: can't spawn video parser thread");
-        module_Unneed( p_main->p_module_bank, p_vpar->p_idct_module );
-        module_Unneed( p_main->p_module_bank, p_vpar->p_motion_module );
+        module_Unneed( p_main->p_bank, p_vpar->p_idct_module );
+        module_Unneed( p_main->p_bank, p_vpar->p_motion_module );
         free( p_vpar );
         return( 0 );
     }
@@ -241,6 +240,7 @@ static int InitThread( vpar_thread_t *p_vpar )
     p_vpar->sequence.chroma_nonintra_quant.b_allocated = 0;
     p_vpar->sequence.i_matrix_coefficients = 1;
     p_vpar->sequence.next_pts = p_vpar->sequence.next_dts = 0;
+    p_vpar->sequence.b_expect_discontinuity = 0;
 
     /* Initialize copyright information */
     p_vpar->sequence.b_copyright_flag = 0;
@@ -287,20 +287,19 @@ static int InitThread( vpar_thread_t *p_vpar )
     p_vpar->pp_vdec[0]->b_error = 0;
     p_vpar->pp_vdec[0]->p_vpar = p_vpar;
 
-#   if VDEC_NICE
+#   ifndef SYS_BEOS
+#       if VDEC_NICE
     /* Re-nice ourself */
     if( nice(VDEC_NICE) == -1 )
     {
         intf_WarnMsg( 2, "vpar warning : couldn't nice() (%s)",
                       strerror(errno) );
     }
+#       endif
 #   endif
 #endif
 
     /* Initialize lookup tables */
-#if defined(MPEG2_COMPLIANT) && !defined(VDEC_DFT)
-    vpar_InitCrop( p_vpar );
-#endif
     vpar_InitMbAddrInc( p_vpar );
     vpar_InitDCTTables( p_vpar );
     vpar_InitPMBType( p_vpar );
@@ -425,6 +424,10 @@ static void EndThread( vpar_thread_t *p_vpar )
                           vpar_SynchroDate( p_vpar ) );
         vout_UnlinkPicture( p_vpar->p_vout, p_vpar->sequence.p_backward );
     }
+    if( p_vpar->picture.p_picture != NULL )
+    {
+        vout_DestroyPicture( p_vpar->p_vout, p_vpar->picture.p_picture );
+    }
 
 #ifdef STATS
     intf_Msg("vpar stats: %d loops among %d sequence(s)",
@@ -511,8 +514,8 @@ static void EndThread( vpar_thread_t *p_vpar )
     
     vlc_mutex_destroy( &(p_vpar->synchro.fifo_lock) );
     
-    module_Unneed( p_main->p_module_bank, p_vpar->p_idct_module );
-    module_Unneed( p_main->p_module_bank, p_vpar->p_motion_module );
+    module_Unneed( p_main->p_bank, p_vpar->p_idct_module );
+    module_Unneed( p_main->p_bank, p_vpar->p_motion_module );
 
     free( p_vpar );
 
@@ -537,5 +540,20 @@ static void BitstreamCallback ( bit_stream_t * p_bit_stream,
             DECODER_FIFO_START( *p_bit_stream->p_decoder_fifo )->i_dts;
         p_vpar->sequence.i_current_rate =
             DECODER_FIFO_START( *p_bit_stream->p_decoder_fifo )->i_rate;
+
+        if( DECODER_FIFO_START( *p_bit_stream->p_decoder_fifo )->b_discontinuity )
+        {
+            intf_WarnMsg( 1, "Discontinuity in BitstreamCallback" );
+            /* Escape the current picture and reset the picture predictors. */
+            p_vpar->sequence.b_expect_discontinuity = 1;
+            p_vpar->picture.b_error = 1;
+        }
+    }
+
+    if( p_bit_stream->p_data->b_discard_payload )
+    {
+        intf_WarnMsg( 1, "Discard payload in BitstreamCallback" );
+        /* 1 packet messed up, trash the slice. */
+        p_vpar->picture.b_error = 1;
     }
 }