* Moved video_decoder's headers from include/ to src/video_decoder.

* Temporarily removed b&w kludge.

diff --git a/include/video_output.h b/include/video_output.h
index 0326318f5b6d8362e12d9505b84fe96e759f4b0c..828ad6311b634ee13e09fccb0ebfb80e6b1930dc 100644 (file)
--- a/include/video_output.h
+++ b/include/video_output.h
@@ -117,10 +117,6 @@ typedef int  (yuv_sys_init_t)       ( p_vout_thread_t p_vout );
 typedef int  (yuv_sys_reset_t)      ( p_vout_thread_t p_vout );
 typedef void (yuv_sys_end_t)        ( p_vout_thread_t p_vout );
 
-struct macroblock_s;
-typedef void (vdec_DecodeMacroblock_t) ( struct vdec_thread_s *p_vdec,
-                                         struct macroblock_s *p_mb );
-
 typedef struct vout_thread_s
 {
     /* Thread properties and lock */
@@ -133,8 +129,6 @@ typedef struct vout_thread_s
     vlc_mutex_t         change_lock;                   /* thread change lock */
     int *               pi_status;                  /* temporary status flag */
     p_vout_sys_t        p_sys;                       /* system output method */
-    vdec_DecodeMacroblock_t *
-                        vdec_DecodeMacroblock;    /* decoder function to use */
                                                                    
     /* Current display properties */
     u16                 i_changes;             /* changes made to the thread */

diff --git a/src/video_decoder/vdec_idct.c b/src/video_decoder/vdec_idct.c
index 6fbfe8789cf9489208c65d49e2b6afe468bc0325..c4bc02697fd1e18f51ff483e3a4b2fec5d12b8a5 100644 (file)
--- a/src/video_decoder/vdec_idct.c
+++ b/src/video_decoder/vdec_idct.c
@@ -2,6 +2,7 @@
  * vdec_idct.c : IDCT functions
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: vdec_idct.c,v 1.22 2000/12/21 17:19:52 massiot Exp $
  *
  * Authors: Gaël Hendryckx <jimmy@via.ecp.fr>
  *

diff --git a/include/vdec_idct.h b/src/video_decoder/vdec_idct.h
similarity index 99%
rename from include/vdec_idct.h
rename to src/video_decoder/vdec_idct.h
index 001131d88ceb0ab314e34773c3e9f1b9a57a7c17..2de3e2a8764a7b0b52e5451d88937f673577762d 100644 (file)
--- a/include/vdec_idct.h
+++ b/src/video_decoder/vdec_idct.h
@@ -2,6 +2,7 @@
  * vdec_idct.h : types for the inverse discrete cosine transform
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: vdec_idct.h,v 1.1 2000/12/21 17:19:52 massiot Exp $
  *
  * Authors: Gaël Hendryckx <jimmy@via.ecp.fr>
  *          Christophe Massiot <massiot@via.ecp.fr>

diff --git a/src/video_decoder/vdec_idctmmx.S b/src/video_decoder/vdec_idctmmx.S
index 4897cfa62631008ddec8825c22a7dfee2326eaea..929399e17f9f4524c48e54cdec44e240ee81f266 100644 (file)
--- a/src/video_decoder/vdec_idctmmx.S
+++ b/src/video_decoder/vdec_idctmmx.S
@@ -2,6 +2,7 @@
  * vdec_idctmmx.S : MMX IDCT implementation
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: vdec_idctmmx.S,v 1.5 2000/12/21 17:19:52 massiot Exp $
  *
  * Authors:
  *

diff --git a/src/video_decoder/vdec_motion.c b/src/video_decoder/vdec_motion.c
index 2fe220ac26a8b03d9d5e44ee373e53c1d0efe034..6fad0eb66110b4e7dbef54b5da2e071f92d0b6a9 100644 (file)
--- a/src/video_decoder/vdec_motion.c
+++ b/src/video_decoder/vdec_motion.c
@@ -2,6 +2,7 @@
  * vdec_motion.c : motion compensation routines
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: vdec_motion.c,v 1.32 2000/12/21 17:19:52 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Jean-Marc Dressler <polux@via.ecp.fr>

diff --git a/include/vdec_motion.h b/src/video_decoder/vdec_motion.h
similarity index 97%
rename from include/vdec_motion.h
rename to src/video_decoder/vdec_motion.h
index 276ecf3cb5f533e4c7a7eab421a827257a8a1c28..e2934511c744a02b36a7107bdf6ab53101065457 100644 (file)
--- a/include/vdec_motion.h
+++ b/src/video_decoder/vdec_motion.h
@@ -2,6 +2,7 @@
  * vdec_motion.h : types for the motion compensation algorithm
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: vdec_motion.h,v 1.1 2000/12/21 17:19:52 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Jean-Marc Dressler <polux@via.ecp.fr>

diff --git a/src/video_decoder/vdec_motion_inner.c b/src/video_decoder/vdec_motion_inner.c
index aea6c14f13facb0a091faaee5624c0991f4122b5..d787c6502e2cd0a5b7d4cf1df3f181dae090e707 100644 (file)
--- a/src/video_decoder/vdec_motion_inner.c
+++ b/src/video_decoder/vdec_motion_inner.c
@@ -2,6 +2,7 @@
  * vdec_motion_inner.c : motion compensation inner routines
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: vdec_motion_inner.c,v 1.10 2000/12/21 17:19:52 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Jean-Marc Dressler <polux@via.ecp.fr>

diff --git a/src/video_decoder/vdec_motion_inner_mmx.c b/src/video_decoder/vdec_motion_inner_mmx.c
index 0951d3dcf40f3435d4c9f3da7b17e65a5e5f458a..347996d2d6a2bfc2ee05446d22626925861c51f3 100644 (file)
--- a/src/video_decoder/vdec_motion_inner_mmx.c
+++ b/src/video_decoder/vdec_motion_inner_mmx.c
@@ -3,6 +3,7 @@
  *                           MMX
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: vdec_motion_inner_mmx.c,v 1.5 2000/12/21 17:19:52 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>, largerly inspired by the
  *          work done by the livid project <http://www.linuxvideo.org/>

diff --git a/src/video_decoder/video_decoder.c b/src/video_decoder/video_decoder.c
index 3616832970aac9ed6f789cdef6a20478646ffe42..2ad3a5772c258ca3bcdc18279cd74da53c86d83e 100644 (file)
--- a/src/video_decoder/video_decoder.c
+++ b/src/video_decoder/video_decoder.c
@@ -2,6 +2,7 @@
  * video_decoder.c : video decoder thread
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: video_decoder.c,v 1.41 2000/12/21 17:19:52 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Gaël Hendryckx <jimmy@via.ecp.fr>
@@ -567,7 +568,7 @@ static void RunThread( vdec_thread_t *p_vdec )
 
         if( (p_mb = vpar_GetMacroblock( &p_vdec->p_vpar->vfifo )) != NULL )
         {
-            p_vdec->p_vpar->p_vout->vdec_DecodeMacroblock ( p_vdec, p_mb );
+            vdec_DecodeMacroblockC ( p_vdec, p_mb );
         }
     }
 

diff --git a/include/video_decoder.h b/src/video_decoder/video_decoder.h
similarity index 98%
rename from include/video_decoder.h
rename to src/video_decoder/video_decoder.h
index 4f9e630a8f29bfc3a3256b8f3ae284b823f96779..3533c1c1e7f0e25d1b9b6f7a71f3349c7117a620 100644 (file)
--- a/include/video_decoder.h
+++ b/src/video_decoder/video_decoder.h
@@ -2,6 +2,7 @@
  * video_decoder.h : video decoder thread
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: video_decoder.h,v 1.1 2000/12/21 17:19:52 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *

diff --git a/include/video_fifo.h b/src/video_decoder/video_fifo.h
similarity index 98%
rename from include/video_fifo.h
rename to src/video_decoder/video_fifo.h
index 8d4f02a214400c1f48ddddbf05455c747128c51a..a4cba928b049c124a0f572487205037eca1493aa 100644 (file)
--- a/include/video_fifo.h
+++ b/src/video_decoder/video_fifo.h
@@ -2,6 +2,7 @@
  * video_fifo.h : FIFO for the pool of video_decoders
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: video_fifo.h,v 1.1 2000/12/21 17:19:52 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -126,8 +127,7 @@ static __inline__ void vpar_DecodeMacroblock( video_fifo_t * p_fifo,
 
     vlc_mutex_unlock( &p_fifo->lock );
 #else
-    p_fifo->p_vpar->p_vout->vdec_DecodeMacroblock(
-            p_fifo->p_vpar->pp_vdec[0], p_mb );
+    vdec_DecodeMacroblockC( p_fifo->p_vpar->pp_vdec[0], p_mb );
 #endif
 }
 

diff --git a/include/video_parser.h b/src/video_decoder/video_parser.h
similarity index 99%
rename from include/video_parser.h
rename to src/video_decoder/video_parser.h
index 33c5008b398f00d4f282d3bd9803f0dbd77ae75c..691d134e4d2a3784cadc34a90dfc74bdcf23c097 100644 (file)
--- a/include/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.32 2000/12/21 13:25:50 massiot Exp $
+ * $Id: video_parser.h,v 1.1 2000/12/21 17:19:52 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *

diff --git a/include/vpar_blocks.h b/src/video_decoder/vpar_blocks.h
similarity index 99%
rename from include/vpar_blocks.h
rename to src/video_decoder/vpar_blocks.h
index 4862b942cb1044fbaf99a5c5a2dcd7d38267b095..99236d45647f4bfa7ed9dae5298ee8f86c9750da 100644 (file)
--- a/include/vpar_blocks.h
+++ b/src/video_decoder/vpar_blocks.h
@@ -2,6 +2,7 @@
  * vpar_blocks.h : video parser blocks management
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: vpar_blocks.h,v 1.1 2000/12/21 17:19:52 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Jean-Marc Dressler <polux@via.ecp.fr>

diff --git a/include/vpar_headers.h b/src/video_decoder/vpar_headers.h
similarity index 99%
rename from include/vpar_headers.h
rename to src/video_decoder/vpar_headers.h
index 51b87615947fc5c20726607315ac9d87b08af266..758a7e61eddf64e4c4a6e1b7e0eda89693b46d48 100644 (file)
--- a/include/vpar_headers.h
+++ b/src/video_decoder/vpar_headers.h
@@ -2,6 +2,7 @@
  * vpar_headers.h : video parser : headers parsing
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: vpar_headers.h,v 1.1 2000/12/21 17:19:52 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Stéphane Borel <stef@via.ecp.fr>

diff --git a/include/vpar_synchro.h b/src/video_decoder/vpar_synchro.h
similarity index 98%
rename from include/vpar_synchro.h
rename to src/video_decoder/vpar_synchro.h
index 3b371ec5c9df0ae0421e0a73e5568eb151ffd1fb..f5ada16b44807755d0e7e7024e448421664e9bfc 100644 (file)
--- a/include/vpar_synchro.h
+++ b/src/video_decoder/vpar_synchro.h
@@ -2,6 +2,7 @@
  * vpar_synchro.h : video parser blocks management
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: vpar_synchro.h,v 1.1 2000/12/21 17:19:52 massiot Exp $
  *
  * Author: Christophe Massiot <massiot@via.ecp.fr>
  *

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 27fabbc701dc3440a2d4f027527efb61f24ff30b..e5bcf70f8d361117aaafd9200407bf8449b4bf80 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -51,9 +51,6 @@
 #include "intf_msg.h"
 #include "main.h"
 
-#include "vdec_idct.h"
-#include "video_decoder.h"
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
@@ -166,7 +163,6 @@ vout_thread_t * vout_CreateThread   ( char *psz_display, int i_root_window,
 
     p_vout->b_grayscale           = main_GetIntVariable( VOUT_GRAYSCALE_VAR,
                                                        VOUT_GRAYSCALE_DEFAULT );
-    p_vout->vdec_DecodeMacroblock = vdec_DecodeMacroblockC;
     p_vout->b_info                = 0;
     p_vout->b_interface           = 0;
     p_vout->b_scale               = 1;
@@ -2047,15 +2043,6 @@ static int Manage( vout_thread_t *p_vout )
     if( p_vout->i_changes & (VOUT_GAMMA_CHANGE | VOUT_GRAYSCALE_CHANGE |
                              VOUT_YUV_CHANGE) )
     {
-        /* Change vdec_DecodeMacroblock when switching between BW and C */
-        if( !p_vout->b_grayscale ) 
-        {
-            p_vout->vdec_DecodeMacroblock = vdec_DecodeMacroblockC;
-        }
-        else if( p_vout->b_grayscale)
-        {
-            p_vout->vdec_DecodeMacroblock = vdec_DecodeMacroblockBW;
-        }  
         if( vout_ResetYUV( p_vout ) )
         {
             intf_ErrMsg("error: can't rebuild convertion tables\n");

diff --git a/src/video_parser/video_fifo.c b/src/video_parser/video_fifo.c
index 16eaddb7fa93c6a846d7a0fde6cf9ece9f5c2dce..575d142011beced5997a6667e1639b483e2f3eab 100644 (file)
--- a/src/video_parser/video_fifo.c
+++ b/src/video_parser/video_fifo.c
@@ -2,6 +2,7 @@
  * video_fifo.c : video FIFO management
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: video_fifo.c,v 1.24 2000/12/21 17:19:54 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -35,7 +36,6 @@
 #include "plugins.h"
 
 #include "intf_msg.h"
-#include "debug.h"                 /* XXX?? temporaire, requis par netlist.h */
 
 #include "stream_control.h"
 #include "input_ext-dec.h"
@@ -43,15 +43,15 @@
 #include "video.h"
 #include "video_output.h"
 
-#include "vdec_idct.h"
-#include "video_decoder.h"
-#include "vdec_motion.h"
+#include "../video_decoder/vdec_idct.h"
+#include "../video_decoder/video_decoder.h"
+#include "../video_decoder/vdec_motion.h"
 
-#include "vpar_blocks.h"
-#include "vpar_headers.h"
-#include "vpar_synchro.h"
-#include "video_parser.h"
-#include "video_fifo.h"
+#include "../video_decoder/vpar_blocks.h"
+#include "../video_decoder/vpar_headers.h"
+#include "../video_decoder/vpar_synchro.h"
+#include "../video_decoder/video_parser.h"
+#include "../video_decoder/video_fifo.h"
 
 /*****************************************************************************
  * vpar_InitFIFO : initialize the video FIFO

diff --git a/src/video_parser/video_parser.c b/src/video_parser/video_parser.c
index d733def903c05ac2c82c9ecc84040afc7644373d..3d6e871c457e6aed0f525dd09c6ba7e7a59c9f7b 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.56 2000/12/21 14:18:15 massiot Exp $
+ * $Id: video_parser.c,v 1.57 2000/12/21 17:19:54 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -22,8 +22,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-/* FIXME: passer en terminate/destroy avec les signaux supplémentaires ?? */
-
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
@@ -47,7 +45,6 @@
 #include "plugins.h"
 
 #include "intf_msg.h"
-#include "debug.h"                 /* XXX?? temporaire, requis par netlist.h */
 
 #include "stream_control.h"
 #include "input_ext-dec.h"
@@ -55,15 +52,15 @@
 #include "video.h"
 #include "video_output.h"
 
-#include "vdec_idct.h"
-#include "video_decoder.h"
-#include "vdec_motion.h"
+#include "../video_decoder/vdec_idct.h"
+#include "../video_decoder/video_decoder.h"
+#include "../video_decoder/vdec_motion.h"
 
-#include "vpar_blocks.h"
-#include "vpar_headers.h"
-#include "vpar_synchro.h"
-#include "video_parser.h"
-#include "video_fifo.h"
+#include "../video_decoder/vpar_blocks.h"
+#include "../video_decoder/vpar_headers.h"
+#include "../video_decoder/vpar_synchro.h"
+#include "../video_decoder/video_parser.h"
+#include "../video_decoder/video_fifo.h"
 
 /*
  * Local prototypes

diff --git a/src/video_parser/vpar_blocks.c b/src/video_parser/vpar_blocks.c
index 59572922deaae690723caa74a4e3633859ea10b4..f37e439c6b530bd4137484edd1b3b911b4d242f4 100644 (file)
--- a/src/video_parser/vpar_blocks.c
+++ b/src/video_parser/vpar_blocks.c
@@ -2,6 +2,7 @@
  * vpar_blocks.c : blocks parsing
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: vpar_blocks.c,v 1.67 2000/12/21 17:19:54 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Jean-Marc Dressler <polux@via.ecp.fr>
@@ -38,7 +39,6 @@
 #include "plugins.h"
 
 #include "intf_msg.h"
-#include "debug.h"                 /* XXX?? temporaire, requis par netlist.h */
 
 #include "stream_control.h"
 #include "input_ext-dec.h"
@@ -46,15 +46,15 @@
 #include "video.h"
 #include "video_output.h"
 
-#include "vdec_idct.h"
-#include "video_decoder.h"
-#include "vdec_motion.h"
+#include "../video_decoder/vdec_idct.h"
+#include "../video_decoder/video_decoder.h"
+#include "../video_decoder/vdec_motion.h"
 
-#include "vpar_blocks.h"
-#include "vpar_headers.h"
-#include "vpar_synchro.h"
-#include "video_parser.h"
-#include "video_fifo.h"
+#include "../video_decoder/vpar_blocks.h"
+#include "../video_decoder/vpar_headers.h"
+#include "../video_decoder/vpar_synchro.h"
+#include "../video_decoder/video_parser.h"
+#include "../video_decoder/video_fifo.h"
 
 /*
  * Welcome to vpar_blocks.c ! Here's where the heavy processor-critical parsing

diff --git a/src/video_parser/vpar_headers.c b/src/video_parser/vpar_headers.c
index dc3c8eea402f40c5e9b6e953351dd27734746bdd..299eb5eac6e6211264f1343f9bb70b74116ed446 100644 (file)
--- a/src/video_parser/vpar_headers.c
+++ b/src/video_parser/vpar_headers.c
@@ -2,7 +2,7 @@
  * vpar_headers.c : headers parsing
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vpar_headers.c,v 1.60 2000/12/21 13:25:51 massiot Exp $
+ * $Id: vpar_headers.c,v 1.61 2000/12/21 17:19:54 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -45,15 +45,15 @@
 #include "video.h"
 #include "video_output.h"
 
-#include "vdec_idct.h"
-#include "video_decoder.h"
-#include "vdec_motion.h"
+#include "../video_decoder/vdec_idct.h"
+#include "../video_decoder/video_decoder.h"
+#include "../video_decoder/vdec_motion.h"
 
-#include "vpar_blocks.h"
-#include "vpar_headers.h"
-#include "vpar_synchro.h"
-#include "video_parser.h"
-#include "video_fifo.h"
+#include "../video_decoder/vpar_blocks.h"
+#include "../video_decoder/vpar_headers.h"
+#include "../video_decoder/vpar_synchro.h"
+#include "../video_decoder/video_parser.h"
+#include "../video_decoder/video_fifo.h"
 
 /*
  * Local prototypes

diff --git a/src/video_parser/vpar_synchro.c b/src/video_parser/vpar_synchro.c
index e28cac538aa88b00bfc4b1ae5ee740bfff27bd7e..e54801992a7d0e09781b45dfea0b80fd5f80225b 100644 (file)
--- a/src/video_parser/vpar_synchro.c
+++ b/src/video_parser/vpar_synchro.c
@@ -2,6 +2,7 @@
  * vpar_synchro.c : frame dropping routines
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: vpar_synchro.c,v 1.62 2000/12/21 17:19:54 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -96,10 +97,6 @@
  *****************************************************************************/
 #include "defs.h"
 
-#include <stdlib.h>                                                /* free() */
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                            /* "input.h" */
-
 #include "config.h"
 #include "common.h"
 #include "threads.h"
@@ -114,14 +111,14 @@
 #include "video.h"
 #include "video_output.h"
 
-#include "vdec_idct.h"
-#include "video_decoder.h"
-#include "vdec_motion.h"
+#include "../video_decoder/vdec_idct.h"
+#include "../video_decoder/video_decoder.h"
+#include "../video_decoder/vdec_motion.h"
 
-#include "vpar_blocks.h"
-#include "vpar_headers.h"
-#include "vpar_synchro.h"
-#include "video_parser.h"
+#include "../video_decoder/vpar_blocks.h"
+#include "../video_decoder/vpar_headers.h"
+#include "../video_decoder/vpar_synchro.h"
+#include "../video_decoder/video_parser.h"
 
 #include "main.h"