Dramatically improve compilation time, with a negligible performance

tradeoff.

diff --git a/include/config.h.in b/include/config.h.in
index cd8772c709befadb6fc7ea52fb042fdb9d93d606..ed69ec8e4820e88732ff78a217a05e6f8354e827 100644 (file)
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -421,7 +421,7 @@
 
 /* Optimization level, from 0 to 2 - 1 is generally a good compromise. Remember
  * that raising this level dramatically lengthens the compilation time. */
-#define VPAR_OPTIM_LEVEL                2
+#define VPAR_OPTIM_LEVEL                1
 
 /* Maximum number of macroblocks in a picture. */
 #define MAX_MB                          2048

diff --git a/src/video_decoder/video_parser.h b/src/video_decoder/video_parser.h
index d6d441f33fbc50f583c8e0d9260a826e47e44a60..1e653ec4f02daaa378799a9148903280b011551b 100644 (file)
--- a/src/video_decoder/video_parser.h
+++ b/src/video_decoder/video_parser.h
@@ -2,7 +2,7 @@
  * video_parser.h : video parser thread
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_parser.h,v 1.14 2001/10/01 16:18:49 massiot Exp $
+ * $Id: video_parser.h,v 1.15 2001/10/01 16:44:07 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Jean-Marc Dressler <polux@via.ecp.fr>
@@ -68,10 +68,6 @@ void FUNCNAME( struct vpar_thread_s * p_vpar );
 
 PROTO_PICD( vpar_PictureDataGENERIC )
 #if (VPAR_OPTIM_LEVEL > 0)
-PROTO_PICD( vpar_PictureData1I )
-PROTO_PICD( vpar_PictureData1P )
-PROTO_PICD( vpar_PictureData1B )
-PROTO_PICD( vpar_PictureData1D )
 PROTO_PICD( vpar_PictureData2IF )
 PROTO_PICD( vpar_PictureData2PF )
 PROTO_PICD( vpar_PictureData2BF )
@@ -83,6 +79,10 @@ PROTO_PICD( vpar_PictureData2BT )
 PROTO_PICD( vpar_PictureData2IB )
 PROTO_PICD( vpar_PictureData2PB )
 PROTO_PICD( vpar_PictureData2BB )
+PROTO_PICD( vpar_PictureData1I )
+PROTO_PICD( vpar_PictureData1P )
+PROTO_PICD( vpar_PictureData1B )
+PROTO_PICD( vpar_PictureData1D )
 #endif
 
 

diff --git a/src/video_decoder/vpar_blocks.c b/src/video_decoder/vpar_blocks.c
index 7f21afca9437a29c63b46248e053e189cbd20d04..7b50e53f0f02a2eb0b36bdfbbb3375d15e465d90 100644 (file)
--- a/src/video_decoder/vpar_blocks.c
+++ b/src/video_decoder/vpar_blocks.c
@@ -2,7 +2,7 @@
  * vpar_blocks.c : blocks parsing
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vpar_blocks.c,v 1.11 2001/10/01 10:27:17 massiot Exp $
+ * $Id: vpar_blocks.c,v 1.12 2001/10/01 16:44:07 massiot Exp $
  *
  * Authors: Michel Lespinasse <walken@zoy.org>
  *          Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
@@ -2176,10 +2176,6 @@ void FUNCNAME( vpar_thread_t * p_vpar )                                     \
 DECLARE_PICD( vpar_PictureDataGENERIC, p_vpar->sequence.b_mpeg2,
               p_vpar->picture.i_coding_type, p_vpar->picture.i_structure );
 #if (VPAR_OPTIM_LEVEL > 0)
-DECLARE_PICD( vpar_PictureData1I, 0, I_CODING_TYPE, FRAME_STRUCTURE );
-DECLARE_PICD( vpar_PictureData1P, 0, P_CODING_TYPE, FRAME_STRUCTURE );
-DECLARE_PICD( vpar_PictureData1B, 0, B_CODING_TYPE, FRAME_STRUCTURE );
-DECLARE_PICD( vpar_PictureData1D, 0, D_CODING_TYPE, FRAME_STRUCTURE );
 DECLARE_PICD( vpar_PictureData2IF, 1, I_CODING_TYPE, FRAME_STRUCTURE );
 DECLARE_PICD( vpar_PictureData2PF, 1, P_CODING_TYPE, FRAME_STRUCTURE );
 DECLARE_PICD( vpar_PictureData2BF, 1, B_CODING_TYPE, FRAME_STRUCTURE );
@@ -2191,6 +2187,10 @@ DECLARE_PICD( vpar_PictureData2BT, 1, B_CODING_TYPE, TOP_FIELD );
 DECLARE_PICD( vpar_PictureData2IB, 1, I_CODING_TYPE, BOTTOM_FIELD );
 DECLARE_PICD( vpar_PictureData2PB, 1, P_CODING_TYPE, BOTTOM_FIELD );
 DECLARE_PICD( vpar_PictureData2BB, 1, B_CODING_TYPE, BOTTOM_FIELD );
+DECLARE_PICD( vpar_PictureData1I, 0, I_CODING_TYPE, FRAME_STRUCTURE );
+DECLARE_PICD( vpar_PictureData1P, 0, P_CODING_TYPE, FRAME_STRUCTURE );
+DECLARE_PICD( vpar_PictureData1B, 0, B_CODING_TYPE, FRAME_STRUCTURE );
+DECLARE_PICD( vpar_PictureData1D, 0, D_CODING_TYPE, FRAME_STRUCTURE );
 #endif
 
 #undef DECLARE_PICD

diff --git a/src/video_decoder/vpar_headers.c b/src/video_decoder/vpar_headers.c
index d59fcbb9ca1ba0d8c237045d8c089af9914590dc..bbbab23d50c646079fc2d2fc5bf9141bb313cd03 100644 (file)
--- a/src/video_decoder/vpar_headers.c
+++ b/src/video_decoder/vpar_headers.c
@@ -2,7 +2,7 @@
  * vpar_headers.c : headers parsing
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vpar_headers.c,v 1.10 2001/10/01 16:18:49 massiot Exp $
+ * $Id: vpar_headers.c,v 1.11 2001/10/01 16:44:07 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -794,7 +794,7 @@ static void PictureHeader( vpar_thread_t * p_vpar )
     }
     else
     {
-#if (VPAR_OPTIM_LEVEL > 0)
+#if (VPAR_OPTIM_LEVEL > 1)
         static f_picture_data_t pf_picture_data[5] =
         { NULL, vpar_PictureData1I, vpar_PictureData1P, vpar_PictureData1B,
           vpar_PictureData1D };