Modifs diverses et variees. Le mode FB compile (mais ne fait rien).

diff --git a/Makefile b/Makefile
index 150d8f6f2dfbad3ca631c74bda8b1ff506966628..f656b00c7c8e360aa728430a4f92e5a72cdcaf62 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -198,10 +198,12 @@ video_decoder_obj =               video_decoder_ref/video_decoder.o \
 #                                              video_decoder/vdec_motion.o
 
 misc_obj =                     misc/mtime.o \
-                                               misc/xutils.o \
                                                misc/rsc_files.o \
                                                misc/netutils.o
 
+ifeq ($(VIDEO),X11)
+misc_obj+=                     misc/xutils.o
+endif
 
 ifeq ($(ARCH),MMX)
 ASM_OBJ =                      video_decoder_ref/idctmmx.o \

diff --git a/include/video.h b/include/video.h
index 8d613647f1830c0d65373b54737f5a50168840b1..127f753d1870dc5e0e81e7a6473d7cc0707166e7 100644 (file)
--- a/include/video.h
+++ b/include/video.h
@@ -11,6 +11,11 @@
  *  "mtime.h"
  *******************************************************************************/
 
+/*******************************************************************************
+ * yuv_data_t: type for storing one Y, U or V sample.
+ *******************************************************************************/
+typedef s16 yuv_data_t;
+
 /*******************************************************************************
  * picture_t: video picture                                            
  *******************************************************************************
@@ -47,16 +52,16 @@ typedef struct
      * p_v data pointers refers to different areas of p_data, and should not
      * be freed */   
     byte_t *        p_data;                                    /* picture data */
-    byte_t *        p_y;          /* pointer to beginning of Y image in p_data */
-    byte_t *        p_u;          /* pointer to beginning of U image in p_data */
-    byte_t *        p_v;          /* pointer to beginning of V image in p_data */
+    yuv_data_t *    p_y;          /* pointer to beginning of Y image in p_data */
+    yuv_data_t *    p_u;          /* pointer to beginning of U image in p_data */
+    yuv_data_t *    p_v;          /* pointer to beginning of V image in p_data */
 } picture_t;
 
 
 /* Pictures types */
 #define EMPTY_PICTURE           0       /* picture slot is empty and available */
-#define YUV_422_PICTURE         100                       /* 4:2:2 YUV picture */
-#define YUV_442_PICTURE         101                       /* 4:4:2 YUV picture */
+#define YUV_420_PICTURE         100                       /* 4:2:0 YUV picture */
+#define YUV_422_PICTURE         101                       /* 4:2:2 YUV picture */
 #define YUV_444_PICTURE         102                       /* 4:4:4 YUV picture */
 
 /* Pictures status */

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 2b1e008d7337b72220820b61a1b4f78368065827..6dfd3f9c5657d0eaf70e852a629538c62c1cfb06 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -248,13 +248,13 @@ picture_t *vout_CreatePicture( vout_thread_t *p_vout, int i_type,
         /* Allocate memory */
         switch( i_type )
         {
-        case YUV_422_PICTURE:           /* YUV picture: 3*16 ?? bits per pixel */
-        case YUV_442_PICTURE:
+        case YUV_420_PICTURE:           /* YUV picture: 3*16 ?? bits per pixel */
+        case YUV_422_PICTURE:
         case YUV_444_PICTURE:
             p_free_picture->p_data = malloc( 3 * i_height * i_bytes_per_line );                
             p_free_picture->p_y = p_free_picture->p_data;
-            p_free_picture->p_u = (byte_t *)p_free_picture->p_data + i_height * i_bytes_per_line;
-            p_free_picture->p_v = (byte_t *)p_free_picture->p_data + i_height * i_bytes_per_line * 2;
+            p_free_picture->p_u = p_free_picture->p_data + i_height * i_bytes_per_line;
+            p_free_picture->p_v = p_free_picture->p_data + i_height * i_bytes_per_line * 2;
             break;                
 #ifdef DEBUG
         default: