Synchronisation vlc-DR2/CVS

* Makefile : nouvelles options d'optimisation, d�codeur vid�o ;
* config.h : FIFOs et netlist plus longues ;
* input_psi.c : Suppression de messages de debug ;

--Meuuh

diff --git a/Makefile b/Makefile
index bce8891d56c69bd6555d34de1759d94794a70e93..4fe0ef2d03a03104e07d223d4707a86382806943 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,10 +40,14 @@ CCFLAGS += -D_REENTRANT
 CCFLAGS += -D_GNU_SOURCE
 
 # Optimizations : don't compile debug versions with them
-#CCFLAGS += -O2
-#CCFLAGS += -O8
-#CCFLAGS += -s -fargument-noalias-global -fexpensive-optimizations -ffast-math -funroll-loops -fomit-frame-pointer #-march=pentiumpro
-#(Uncomment -march=pentiumpro if it applies)
+CCFLAGS += -O3
+CCFLAGS += -ffast-math -funroll-loops -fno-function-cse -fargument-noalias-global
+#CCFLAGS += -fomit-frame-pointer -s
+#CCFLAGS += -malign-double
+#CCFLAGS += -march=pentiumpro
+#CCFLAGS += -march=pentium
+#CCFLAGS += -mcpu=604e -mmultiple -mhard-float -mstring
+#LCFLAGS += -s
 
 #
 # C compiler flags: dependancies
@@ -87,10 +91,10 @@ FFILTER = grep -v "intf_.*Msg.*\.\.\."
 #
 # Debugging settings: electric fence, debuging symbols and profiling support. 
 # Note that electric fence and accurate profiling are quite uncompatible.
-CCFLAGS += -g
-CCFLAGS += -pg
-LCFLAGS += -g
-LCFLAGS += -pg
+#CCFLAGS += -g
+#CCFLAGS += -pg
+#LCFLAGS += -g
+#LCFLAGS += -pg
 #LIB += -ldmalloc
 #LIB += -lefence
 
@@ -128,9 +132,19 @@ video_output_obj =                 video_output/video_output.o \
 audio_decoder_obj =            audio_decoder/audio_decoder.o \
                                                audio_decoder/audio_math.o
 
-generic_decoder_obj =          generic_decoder/generic_decoder.o
-
-video_decoder_obj =            video_decoder/video_decoder.o
+#generic_decoder_obj =         generic_decoder/generic_decoder.o
+
+video_decoder_obj =            video_decoder_ref/video_decoder.o \
+                                               video_decoder_ref/display.o \
+                                               video_decoder_ref/getblk.o \
+                                               video_decoder_ref/gethdr.o \
+                                               video_decoder_ref/getpic.o \
+                                               video_decoder_ref/getvlc.o \
+                                               video_decoder_ref/idct.o \
+                                               video_decoder_ref/motion.o \
+                                               video_decoder_ref/mpeg2dec.o \
+                                               video_decoder_ref/recon.o \
+                                               video_decoder_ref/spatscal.o
 
 misc_obj =                     misc/mtime.o \
                                                misc/xutils.o \

diff --git a/include/config.h b/include/config.h
index 63720dba45b3190cb9651e2bbeab53d0f5917783..da76a180680fc400628ca9510eb116eeee49c3d2 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -79,7 +79,7 @@
  */
 
 /* Size of the FIFO. FIFO_SIZE+1 must be a multiple of 2 */
-#define FIFO_SIZE                       511
+#define FIFO_SIZE                       1023
 
 /*******************************************************************************
  * Input thread configuration
@@ -115,7 +115,7 @@
  * INPUT_MAX_TS + 1 must be a power of 2, to optimize the %(INPUT_MAX_TS+1)
  * operation with a &INPUT_MAX_TS in the case of a fifo netlist.
  * It should be > number of fifos * FIFO_SIZE to avoid input deadlock. */
-#define INPUT_MAX_TS                    16383      /* INPUT_MAX_TS + 1 = 2^14 */
+#define INPUT_MAX_TS                    32767      /* INPUT_MAX_TS + 1 = 2^15 */
 
 /* Same thing with PES packets */
 #define INPUT_MAX_PES                   16383
@@ -137,7 +137,7 @@
 
 
 /* Default input method */
-#define INPUT_DEFAULT_METHOD            20 /* unicast (debug) */
+#define INPUT_DEFAULT_METHOD            INPUT_METHOD_TS_UCAST
 
 /* Default remote server */
 #define VIDEOLAN_DEFAULT_SERVER         "vod.via.ecp.fr"

diff --git a/src/input/input_psi.c b/src/input/input_psi.c
index cae2e381ba0bf23e14843692ddb0a0f7afeba486..bbf4cbeb6cf37c12a7d2ef6b78c51d4c96e4479b 100644 (file)
--- a/src/input/input_psi.c
+++ b/src/input/input_psi.c
@@ -174,12 +174,12 @@ void input_PsiRead( input_thread_t *p_input /* ??? */ )
   for( i_index = 0; i_index < p_input->p_stream->i_pgrm_number; i_index++ )
   {
     p_pgrm = p_input->p_stream->ap_programs[i_index];
-    intf_Msg("Printing info for program %d\n", p_pgrm->i_number );
+    intf_DbgMsg("Printing info for program %d\n", p_pgrm->i_number );
     intf_IntfMsg("Printing info for program %d\n", p_pgrm->i_number );
 
     for( i_index2 = 0; i_index2 < p_pgrm->i_es_number; i_index2++ )
     {
-      intf_Msg( " ->Pid %d: type %d, PCR: %d, PSI: %d\n", p_pgrm->ap_es[i_index2]->i_id,
+      intf_DbgMsg( " ->Pid %d: type %d, PCR: %d, PSI: %d\n", p_pgrm->ap_es[i_index2]->i_id,
                     p_pgrm->ap_es[i_index2]->i_type, p_pgrm->ap_es[i_index2]->b_pcr,
                     p_pgrm->ap_es[i_index2]->b_psi);
 
@@ -294,7 +294,7 @@ static void DecodePgrmAssocSection(u8* p_pas, input_thread_t *p_input )
       /* This can either mean that the PSI decoder has just started or that
          the stream has changed */
       if( p_descr->i_PAT_version== PSI_UNINITIALISED )
-        intf_Msg("Building Program Association table\n");
+        intf_DbgMsg("Building Program Association table\n");
       else
         intf_ErrMsg( "Stream Id has suddently changed ! Rebuilding PAT\n" );
 
@@ -306,7 +306,7 @@ static void DecodePgrmAssocSection(u8* p_pas, input_thread_t *p_input )
       /* Stream has not changed, test if the PMT is up to date */
       if( p_descr->i_PAT_version != i_version )
       {
-        intf_Msg("PAT has been updated, rebuilding it\n");
+        intf_DbgMsg("PAT has been updated, rebuilding it\n");
         /* Ask the PSI decoder to rebuild the table */
         b_is_invalid = 1;
       }
@@ -402,7 +402,7 @@ static void DecodePgrmAssocSection(u8* p_pas, input_thread_t *p_input )
                (Network information table) */
             if( i_pgrm_id != 0 )
             {
-              intf_Msg("Adding program %d to the Program Map Table\n", i_pgrm_id);
+              intf_DbgMsg("Adding program %d to the Program Map Table\n", i_pgrm_id);
               AddPgrmDescr(p_descr, i_pgrm_id);
             }
           }
@@ -485,7 +485,7 @@ static void DecodePgrmMapSection( u8* p_pms, input_thread_t* p_input )
   i_version = (p_pms[5] >> 1) && 0x1F;
     if( p_pgrm->i_version != i_version )
     {
-        intf_Msg("Updating PMT for program %d\n", i_pgrm_number);
+        intf_DbgMsg("Updating PMT for program %d\n", i_pgrm_number);
 
         for( i_index = 0; i_index < p_pgrm->i_es_number; i_index++ )
         {
@@ -493,7 +493,7 @@ static void DecodePgrmMapSection( u8* p_pms, input_thread_t* p_input )
              normally used by the interface to manage this */
           if( input_IsElemRecv(p_input, p_pgrm->ap_es[i_index]->i_id) )
           {
-            intf_Msg( "PID %d is no more valid: stopping its reception\n",
+            intf_DbgMsg( "PID %d is no more valid: stopping its reception\n",
                       p_pgrm->ap_es[i_index]->i_id );
             input_DelPgrmElem( p_input, p_pgrm->ap_es[i_index]->i_id );
           }
@@ -599,7 +599,7 @@ static void DecodePgrmMapSection( u8* p_pms, input_thread_t* p_input )
           }
 
           /* We now know the info carried in this section */
-          intf_Msg("Description of program %d complete\n", p_pgrm->i_number);
+          intf_DbgMsg("Description of program %d complete\n", p_pgrm->i_number);
           p_pgrm->b_is_ok = 1;
           Set_known(p_descr->a_known_PMT_sections, i_current_section);
         
@@ -682,7 +682,7 @@ void DecodeSrvDescrSection( byte_t* p_sdt, input_thread_t *p_input )
      /* Section applyies to our TS, test if the SDT is up to date */
      if( p_stream->i_SDT_version != i_version )
      {
-       intf_Msg("SDT has been updated, NOT YET IMPLEMENTED\n");
+       intf_DbgMsg("SDT has been updated, NOT YET IMPLEMENTED\n");
 
        /* Ask the PSI decoder to rebuild the table */
         b_must_update = 1;
@@ -706,7 +706,7 @@ void DecodeSrvDescrSection( byte_t* p_sdt, input_thread_t *p_input )
          if( p_stream->ap_programs[i_index]->i_number == U16_AT(&p_sdt[i_offset]) )
          {
            /* Here we are */
-           intf_Msg("FOUND: %d\n", p_stream->ap_programs[i_index]->i_number);
+           intf_DbgMsg("FOUND: %d\n", p_stream->ap_programs[i_index]->i_number);
            break;
          }
        }
@@ -778,7 +778,7 @@ static void DecodePgrmDescriptor( byte_t* p_descriptor, pgrm_descriptor_t* p_pgr
 #endif
     default:
 //        intf_DbgMsg("Unhandled program descriptor received (type: %d)\n", i_type);
-//        intf_Msg("Unhandled ES descriptor received (type: %d)\n", i_type);
+//        intf_DbgMsg("Unhandled ES descriptor received (type: %d)\n", i_type);
     }
 }
 
@@ -824,7 +824,7 @@ static void DecodeESDescriptor( byte_t* p_descriptor, es_descriptor_t* p_es )
     }
     default:
 //        intf_DbgMsg("Unhandled ES descriptor received (type: %d)\n", i_type);
-//        intf_Msg("Unhandled ES descriptor received (type: %d)\n", i_type);
+//        intf_DbgMsg("Unhandled ES descriptor received (type: %d)\n", i_type);
     }
 }