[Mplayer-cvslog] CVS: main/vidix/drivers radeon_vid.c,1.29,1.30

[Nick Kurshev]

Update of /cvsroot/mplayer/main/vidix/drivers
In directory mplayer:/var/tmp.root/cvs-serv32220/main/vidix/drivers

Modified Files:
	radeon_vid.c 
Log Message:
RGB15 experimental support

Index: radeon_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/radeon_vid.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- radeon_vid.c	30 Jan 2002 09:58:06 -0000	1.29
+++ radeon_vid.c	31 Jan 2002 08:53:37 -0000	1.30
@@ -711,6 +711,7 @@
 {
   IMGFMT_YV12, IMGFMT_I420, IMGFMT_IYUV, 
   IMGFMT_UYVY, IMGFMT_YUY2,
+  IMGFMT_RGB15, IMGFMT_BGR15,
   IMGFMT_RGB16, IMGFMT_BGR16,
   IMGFMT_RGB32, IMGFMT_BGR32
 };
@@ -840,11 +841,9 @@
 #endif
     switch(besr.fourcc)
     {
-/*
         case IMGFMT_RGB15:
         case IMGFMT_BGR15: bes_flags |= SCALER_SOURCE_15BPP; break;
-*/
-        case IMGFMT_RGB16:
+	case IMGFMT_RGB16:
 	case IMGFMT_BGR16: bes_flags |= SCALER_SOURCE_16BPP; break;
 /*
         case IMGFMT_RGB24:
@@ -919,7 +918,7 @@
 			  config->dest.pitch.v = best_pitch;
 			  break;
 	/* 4:2:2 */
-        default:
+        default: /* RGB15, RGB16 */
 	case IMGFMT_UYVY:
 	case IMGFMT_YUY2:
 			  pitch = ((src_w*2) + mpitch) & ~mpitch;
@@ -964,9 +963,11 @@
 	if(besr.fourcc == IMGFMT_I420 || besr.fourcc == IMGFMT_IYUV)
 	{
 	  uint32_t tmp;
+/*
 	  tmp = besr.vid_buf1_base_adrs;
 	  besr.vid_buf1_base_adrs = besr.vid_buf2_base_adrs;
 	  besr.vid_buf2_base_adrs = tmp;
+*/
 	  tmp = config->offset.u;
 	  config->offset.u = config->offset.v;
 	  config->offset.v = tmp;
@@ -1041,6 +1042,11 @@
     case IMGFMT_IYUV:
 		info->frame_size = awidth*info->src.h+(awidth*info->src.h)/2;
 		break;
+    case IMGFMT_RGB32:
+    case IMGFMT_BGR32:
+		info->frame_size = awidth*info->src.h*4;
+		break;
+    /* YUY2 YVYU, RGB15, RGB16 */
     default:	info->frame_size = awidth*info->src.h*2;
 		break;
   }