Mercurial > mplayer.hg

changeset 4186:f5c38da17b59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bpp != depth
author arpi
date Wed, 16 Jan 2002 01:19:22 +0000
parents 85c90bb8729a
children 82a4c1c80021
files mp_image.h
diffstat 1 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mp_image.h	Wed Jan 16 00:14:59 2002 +0000
+++ b/mp_image.h	Wed Jan 16 01:19:22 2002 +0000
@@ -13,9 +13,14 @@
 // set if it's swapped plane/byteorder
 #define MP_IMGFLAG_SWAPPED 0x40
 
+#define MP_IMGTYPE_EXPORT 0
+#define MP_IMGTYPE_STATIC 1
+#define MP_IMGTYPE_TEMP 2
+
 typedef struct mp_image_s {
     unsigned short flags;
-    unsigned short bpp;
+    unsigned char type;
+    unsigned char bpp;  // bits/pixel. NOT depth! for RGB it will be n*8
     unsigned int imgfmt;
     int width,height;  // stored dimensions
     int x,y,w,h;  // visible dimensions
@@ -30,11 +35,11 @@
     mpi->flags&=~(MP_IMGFLAG_PLANAR|MP_IMGFLAG_YUV|MP_IMGFLAG_SWAPPED);
     mpi->out_fmt=out_fmt;
     if( (out_fmt&IMGFMT_RGB_MASK) == IMGFMT_RGB ){
-	mpi->bpp=out_fmt&255;
+	mpi->bpp=((out_fmt&255)+7)&(~7);
 	return;
     }
     if( (out_fmt&IMGFMT_BGR_MASK) == IMGFMT_BGR ){
-	mpi->bpp=out_fmt&255;
+	mpi->bpp=((out_fmt&255)+7)&(~7);
 	mpi->flags|=MP_IMGFLAG_SWAPPED;
 	return;
     }