# HG changeset patch # User alex # Date 1006960754 0 # Node ID 39f88ed93dd1654e6a194014e3738d9584987b1f # Parent ce9acee4e129059d288191229135a0d6880b3c06 added 32bpp output support diff -r ce9acee4e129 -r 39f88ed93dd1 msvidc.c --- a/msvidc.c Wed Nov 28 14:55:56 2001 +0000 +++ b/msvidc.c Wed Nov 28 15:19:14 2001 +0000 @@ -5,6 +5,8 @@ The description of the algorithm you can read here: http://www.pcisys.net/~melanson/video1.txt + + 32bpp support (c) alex */ #define LE_16(x) *(unsigned short *)(x) @@ -131,12 +133,16 @@ decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c1_r; decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c1_g; decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c1_b; + if (bytes_per_pixel == 4) /* 32bpp */ + pixel_ptr++; } else { decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c2_r; decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c2_g; decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c2_b; + if (bytes_per_pixel == 4) /* 32bpp */ + pixel_ptr++; } // get the next flag ready to go @@ -157,12 +163,16 @@ decoded[pixel_ptr++] = quad[0][0].c1_r; decoded[pixel_ptr++] = quad[0][0].c1_g; decoded[pixel_ptr++] = quad[0][0].c1_b; + if (bytes_per_pixel == 4) /* 32bpp */ + pixel_ptr++; } else { decoded[pixel_ptr++] = quad[0][0].c2_r; decoded[pixel_ptr++] = quad[0][0].c2_g; decoded[pixel_ptr++] = quad[0][0].c2_b; + if (bytes_per_pixel == 4) /* 32bpp */ + pixel_ptr++; } // get the next flag ready to go @@ -186,6 +196,8 @@ decoded[pixel_ptr++] = quad[0][0].c1_r; decoded[pixel_ptr++] = quad[0][0].c1_g; decoded[pixel_ptr++] = quad[0][0].c1_b; + if (bytes_per_pixel == 4) /* 32bpp */ + pixel_ptr++; } pixel_ptr -= row_dec; } @@ -275,12 +287,16 @@ decoded[pixel_ptr++] = quad[0][0].c1_r; decoded[pixel_ptr++] = quad[0][0].c1_g; decoded[pixel_ptr++] = quad[0][0].c1_b; + if (bytes_per_pixel == 4) /* 32bpp */ + pixel_ptr++; } else { decoded[pixel_ptr++] = quad[0][0].c2_r; decoded[pixel_ptr++] = quad[0][0].c2_g; decoded[pixel_ptr++] = quad[0][0].c2_b; + if (bytes_per_pixel == 4) /* 32bpp */ + pixel_ptr++; } // get the next flag ready to go @@ -319,12 +335,16 @@ decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c1_r; decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c1_g; decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c1_b; + if (bytes_per_pixel == 4) /* 32bpp */ + pixel_ptr++; } else { decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c2_r; decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c2_g; decoded[pixel_ptr++] = quad[pixel_x >> 1][pixel_y >> 1].c2_b; + if (bytes_per_pixel == 4) /* 32bpp */ + pixel_ptr++; } // get the next flag ready to go @@ -348,6 +368,8 @@ decoded[pixel_ptr++] = quad[0][0].c1_r; decoded[pixel_ptr++] = quad[0][0].c1_g; decoded[pixel_ptr++] = quad[0][0].c1_b; + if (bytes_per_pixel == 4) /* 32bpp */ + pixel_ptr++; } pixel_ptr -= row_dec; }