[Mplayer-cvslog] CVS: main/libmpcodecs vf_scale.c,1.20,1.21 mp_image.h,1.16,1.17 img_format.c,1.4,1.5 img_format.h,1.7,1.8

[Michael Niedermayer]

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

Modified Files:
	vf_scale.c mp_image.h img_format.c img_format.h 
Log Message:
planar yuv 444 422 411 support


Index: vf_scale.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_scale.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- vf_scale.c	18 Jul 2002 16:14:27 -0000	1.20
+++ vf_scale.c	1 Aug 2002 12:39:07 -0000	1.21
@@ -48,6 +48,9 @@
     IMGFMT_Y8,
     IMGFMT_YVU9,
     IMGFMT_IF09,
+    IMGFMT_444P,
+    IMGFMT_422P,
+    IMGFMT_411P,
     0
 };
 
@@ -202,6 +205,9 @@
     case IMGFMT_Y8: 
     case IMGFMT_YVU9: 
     case IMGFMT_IF09: 
+    case IMGFMT_444P: 
+    case IMGFMT_422P: 
+    case IMGFMT_411P: 
     {
 	unsigned int best=find_best_out(vf);
 	int flags;

Index: mp_image.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/mp_image.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mp_image.h	20 Jul 2002 16:26:49 -0000	1.16
+++ mp_image.h	1 Aug 2002 12:39:07 -0000	1.17
@@ -112,6 +112,30 @@
 	mpi->chroma_x_shift=2;
 	mpi->chroma_y_shift=2;
 	return;
+    case IMGFMT_444P:
+	mpi->flags|=MP_IMGFLAG_PLANAR;
+	mpi->bpp=24;
+	mpi->chroma_width=(mpi->width);
+	mpi->chroma_height=(mpi->height);
+	mpi->chroma_x_shift=0;
+	mpi->chroma_y_shift=0;
+	return;
+    case IMGFMT_422P:
+	mpi->flags|=MP_IMGFLAG_PLANAR;
+	mpi->bpp=16;
+	mpi->chroma_width=(mpi->width>>1);
+	mpi->chroma_height=(mpi->height);
+	mpi->chroma_x_shift=1;
+	mpi->chroma_y_shift=0;
+	return;
+    case IMGFMT_411P:
+	mpi->flags|=MP_IMGFLAG_PLANAR;
+	mpi->bpp=12;
+	mpi->chroma_width=(mpi->width>>2);
+	mpi->chroma_height=(mpi->height);
+	mpi->chroma_x_shift=2;
+	mpi->chroma_y_shift=0;
+	return;
     case IMGFMT_Y800:
     case IMGFMT_Y8:
 	/* they're planar ones, but for easier handling use them as packed */

Index: img_format.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/img_format.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- img_format.c	27 Jun 2002 17:35:37 -0000	1.4
+++ img_format.c	1 Aug 2002 12:39:07 -0000	1.5
@@ -26,6 +26,9 @@
 	case IMGFMT_CLPL: return("Planar CLPL");
 	case IMGFMT_Y800: return("Planar Y800");
 	case IMGFMT_Y8: return("Planar Y8");
+	case IMGFMT_444P: return("Planar 444P");
+	case IMGFMT_422P: return("Planar 422P");
+	case IMGFMT_411P: return("Planar 411P");
 	case IMGFMT_NV12: return("Planar NV12");
 	case IMGFMT_IUYV: return("Packed IUYV");
 	case IMGFMT_IY41: return("Packed IY41");

Index: img_format.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/img_format.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- img_format.h	27 Jun 2002 17:35:37 -0000	1.7
+++ img_format.h	1 Aug 2002 12:39:07 -0000	1.8
@@ -43,6 +43,11 @@
 #define IMGFMT_Y8   0x20203859
 #define IMGFMT_NV12 0x3231564E
 
+/* unofficial Planar Formats, FIXME if official 4CC exists */
+#define IMGFMT_444P 0x50343434
+#define IMGFMT_422P 0x50323234
+#define IMGFMT_411P 0x50313134
+
 /* Packed YUV Formats */
 
 #define IMGFMT_IUYV 0x56595549