[Mplayer-cvslog] CVS: main/libvo vo_fbdev.c,1.17,1.18

[Szabolcs Berecz]

Update of /cvsroot/mplayer/main/libvo
In directory usw-pr-cvs1:/tmp/cvs-serv22565

Modified Files:
	vo_fbdev.c 
Log Message:
-fbdepth fix2

Index: vo_fbdev.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** vo_fbdev.c	2001/04/11 21:48:30	1.17
--- vo_fbdev.c	2001/04/11 21:54:34	1.18
***************
*** 342,346 ****
  static int fb_init_done = 0;
  static int fb_works = 0;
- char *fb_dev_name = NULL;
  static int fb_dev_fd;
  static size_t fb_size;
--- 342,345 ----
***************
*** 354,358 ****
--- 353,359 ----
  static int fb_bpp;		// 32: 32  24: 24  16: 16  15: 15
  static int fb_screen_width;
+ static int fb_orig_depth;
  
+ char *fb_dev_name = NULL;
  char *fb_mode_cfgfile = "/etc/fb.modes";
  char *fb_mode_name = NULL;
***************
*** 526,529 ****
--- 527,531 ----
  		fb_vinfo.vmode = fb_mode->vmode;
  	} else if (fb_mode_depth) {
+ 		fb_orig_depth = fb_vinfo.bits_per_pixel;
  		fb_vinfo.bits_per_pixel = fb_mode_depth;
  		switch (fb_mode_depth) {
***************
*** 830,834 ****
  	if (fb_switch_mode)
  		fb_vinfo = fb_orig_vinfo;
! 	else {
  		fb_vinfo.xres_virtual = fb_orig_vinfo.xres_virtual;
  		fb_vinfo.yres_virtual = fb_orig_vinfo.yres_virtual;
--- 832,871 ----
  	if (fb_switch_mode)
  		fb_vinfo = fb_orig_vinfo;
! 	else if (fb_mode_depth) {
! 		fb_vinfo.bits_per_pixel = fb_orig_depth;
! 		switch (fb_mode_depth) {
! 			case 32:
! 			case 24:
! 				fb_vinfo.red.offset = 16;
! 				fb_vinfo.red.length = 8;
! 				fb_vinfo.red.msb_right = 0;
! 				fb_vinfo.green.offset = 8;
! 				fb_vinfo.green.length = 8;
! 				fb_vinfo.green.msb_right = 0;
! 				fb_vinfo.blue.offset = 0;
! 				fb_vinfo.blue.length = 8;
! 				fb_vinfo.blue.msb_right = 0;
! 			case 16:
! 				fb_vinfo.red.offset = 11;
! 				fb_vinfo.red.length = 5;
! 				fb_vinfo.red.msb_right = 0;
! 				fb_vinfo.green.offset = 5;
! 				fb_vinfo.green.length = 6;
! 				fb_vinfo.green.msb_right = 0;
! 				fb_vinfo.blue.offset = 0;
! 				fb_vinfo.blue.length = 5;
! 				fb_vinfo.blue.msb_right = 0;
! 			case 15:
! 				fb_vinfo.red.offset = 10;
! 				fb_vinfo.red.length = 5;
! 				fb_vinfo.red.msb_right = 0;
! 				fb_vinfo.green.offset = 5;
! 				fb_vinfo.green.length = 5;
! 				fb_vinfo.green.msb_right = 0;
! 				fb_vinfo.blue.offset = 0;
! 				fb_vinfo.blue.length = 5;
! 				fb_vinfo.blue.msb_right = 0;
! 		}
! 	} else {
  		fb_vinfo.xres_virtual = fb_orig_vinfo.xres_virtual;
  		fb_vinfo.yres_virtual = fb_orig_vinfo.yres_virtual;


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog