[Mplayer-cvslog] CVS: main/libvo vo_fbdev.c,1.80,1.81

Joey Parrish CVS joey at mplayerhq.hu
Tue Aug 12 08:57:47 CEST 2003


Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv27476

Modified Files:
	vo_fbdev.c 
Log Message:
Changed all printf into mp_msg
Removed extern int verbose
Removed some unneeded includes
Removed swscale, because this should be done by vf layer instead
Removed weird video_out_png definition
There is no more flip, zoom, or geometry support, so I removed those.
Slices, stride support for all supported CSP.
Replaced draw_frame with a stub.
Removed: do { ... } while (0)
Removed unused dstFourcc.
Added DR support
Removed USE_CONVERT2FB, since we have real DR now
Simplified some color depth checks


Index: vo_fbdev.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- vo_fbdev.c	13 Jul 2003 23:33:56 -0000	1.80
+++ vo_fbdev.c	12 Aug 2003 06:57:19 -0000	1.81
@@ -4,18 +4,15 @@
  * (C) 2001
  * 
  * Some idea and code borrowed from Chris Lawrence's ppmtofb-0.27
+ * Some fixes and small improvements by Joey Parrish <joey at nicewarrior.org>
  */
 
-#define FBDEV "fbdev: "
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
[...970 lines suppressed...]
+	(mpi->flags & MP_IMGFLAG_YUV) ||
+	(mpi->width != in_width) ||
+	(mpi->height != in_height)
+       )
+    return(VO_FALSE);
+
+    mpi->planes[0] = center;
+    mpi->stride[0] = fb_line_len;
+    mpi->flags |= MP_IMGFLAG_DIRECT;
+    return(VO_TRUE);
+}
+
 static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
+  case VOCTRL_GET_IMAGE:
+    return get_image(data);
   case VOCTRL_QUERY_FORMAT:
     return query_format(*((uint32_t*)data));
   }



More information about the MPlayer-cvslog mailing list