mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-23 11:04:44 +00:00
Basic 2xSaI support. A little buggy. Use by starting with a -g1 parameter.
svn-id: r3716
This commit is contained in:
James Brown
parent
5facf1a034
commit
174acc4594
10
scumm.h
10
scumm.h
@ -826,12 +826,17 @@ enum WhereIsObject {
|
||||
WIO_ROOM = 1,
|
||||
WIO_GLOBAL = 2,
|
||||
WIO_LOCAL = 3,
|
||||
WIO_FLOBJECT = 4,
|
||||
WIO_FLOBJECT = 4
|
||||
};
|
||||
|
||||
enum MouseButtonStatus {
|
||||
msDown = 1,
|
||||
msClicked = 2,
|
||||
msClicked = 2
|
||||
};
|
||||
|
||||
enum VideoMode {
|
||||
VIDEO_SCALE = 0,
|
||||
VIDEO_2XSAI = 1
|
||||
};
|
||||
|
||||
struct BoxCoords {
|
||||
@ -975,6 +980,7 @@ struct Scumm {
|
||||
uint32 _minHeapThreshold;
|
||||
|
||||
bool _fullScreen;
|
||||
int _videoMode;
|
||||
|
||||
byte _bkColor;
|
||||
uint16 _lastXstart;
|
||||
|
||||
10
scummvm.cpp
10
scummvm.cpp
@ -200,6 +200,7 @@ void Scumm::scummMain(int argc, char **argv) {
|
||||
|
||||
_gameDataPath = NULL;
|
||||
_gameTempo = 0;
|
||||
_videoMode = 0;
|
||||
|
||||
parseCommandLine(argc, argv);
|
||||
|
||||
@ -418,7 +419,8 @@ int Scumm::scummLoop(int delta) {
|
||||
"\ts<num> - Set scale factor to <num> (1, 2, or 3 - 2 by default)\n" \
|
||||
"\tp<path> - look for game in <path>\n" \
|
||||
"\tm<num> - Set music volume to <num> (0-100)\n" \
|
||||
"\tf - fullscreen mode\n"
|
||||
"\tf - fullscreen mode\n" \
|
||||
"\tg - graphics mode. 1 for 2xSai anti-aliasing\n"
|
||||
|
||||
void Scumm::parseCommandLine(int argc, char **argv) {
|
||||
#if !defined(__APPLE__CW)
|
||||
@ -490,6 +492,12 @@ void Scumm::parseCommandLine(int argc, char **argv) {
|
||||
se->set_music_volume(atoi(s+1));
|
||||
goto NextArg;
|
||||
}
|
||||
case 'g':
|
||||
if (*(s+1) == '\0')
|
||||
goto ShowHelpAndExit;
|
||||
_videoMode = atoi(s+1);
|
||||
goto NextArg;
|
||||
|
||||
default:
|
||||
ShowHelpAndExit:;
|
||||
printf( USAGE_STRING );
|
||||
|
||||
945
sdl.cpp
945
sdl.cpp
@ -39,6 +39,12 @@ SOUND_DRIVER_TYPE snd_driv;
|
||||
static SDL_Surface *screen;
|
||||
static SDL_CD *cdrom;
|
||||
|
||||
/* For 2xSAI */
|
||||
static SDL_Surface *sdl_hwscreen;
|
||||
static SDL_Surface *sdl_tmpscreen;
|
||||
int Init_2xSaI (uint32 BitFormat);
|
||||
void _2xSaI (uint8 *srcPtr, uint32 srcPitch, uint8 *deltaPtr, uint8 *dstPtr, uint32 dstPitch, int width, int height);
|
||||
|
||||
static int current_shake_pos;
|
||||
|
||||
void resetCursor(void) {
|
||||
@ -387,8 +393,77 @@ void blitToScreen(Scumm *s, byte *src,int x, int y, int w, int h) {
|
||||
SDL_UnlockSurface(screen);
|
||||
}
|
||||
|
||||
void updateScreen(Scumm *s) {
|
||||
void Draw2xSaI(SDL_Rect *r) {
|
||||
if (SDL_BlitSurface(screen, r, sdl_tmpscreen, r) != 0)
|
||||
error("SDL_BlitSurface failed");
|
||||
|
||||
SDL_LockSurface(sdl_tmpscreen);
|
||||
SDL_LockSurface(sdl_hwscreen);
|
||||
|
||||
/* Apply the 2xsai algorithm */
|
||||
_2xSaI((byte*)sdl_tmpscreen->pixels + r->x*2 + r->y*640, 640, NULL,
|
||||
(byte*)sdl_hwscreen->pixels + r->x*4 + r->y*640*4, 640*2, r->w, r->h);
|
||||
|
||||
/* scale the rect to fit in SDL_UpdateRects */
|
||||
r->x <<= 1;
|
||||
r->y <<= 1;
|
||||
r->w <<= 1;
|
||||
r->h <<= 1;
|
||||
|
||||
SDL_UnlockSurface(sdl_tmpscreen);
|
||||
SDL_UnlockSurface(sdl_hwscreen);
|
||||
SDL_UpdateRect(sdl_hwscreen, r->x, r->y, r->w, r->h);
|
||||
}
|
||||
|
||||
void updateScreen2xSaI(Scumm *s) {
|
||||
SDL_Rect r;
|
||||
|
||||
if (s->_fastMode&2)
|
||||
return;
|
||||
|
||||
if (hide_mouse) {
|
||||
hide_mouse = false;
|
||||
s->drawMouse();
|
||||
}
|
||||
|
||||
if(s->_palDirtyMax != -1)
|
||||
updatePalette(s);
|
||||
|
||||
if (fullRedraw) {
|
||||
r.x = 0;
|
||||
r.y = 0;
|
||||
r.w = 320;
|
||||
r.h = 200;
|
||||
Draw2xSaI(&r);
|
||||
fullRedraw = false;
|
||||
|
||||
return;
|
||||
} else if (numDirtyRects) {
|
||||
SDL_Rect *dr;
|
||||
int i;
|
||||
|
||||
for (i = 0; i <= numDirtyRects; i++) {
|
||||
dr = &dirtyRects[i];
|
||||
Draw2xSaI(dr);
|
||||
}
|
||||
}
|
||||
|
||||
numDirtyRects = 0;
|
||||
}
|
||||
|
||||
|
||||
void updateScreenScale(Scumm *s) {
|
||||
if (fullRedraw) {
|
||||
SDL_UpdateRect(screen, 0,0,0,0);
|
||||
fullRedraw = false;
|
||||
} else if (numDirtyRects) {
|
||||
SDL_UpdateRects(screen, numDirtyRects, dirtyRects);
|
||||
}
|
||||
|
||||
numDirtyRects = 0;
|
||||
}
|
||||
|
||||
void updateScreen(Scumm *s) {
|
||||
if (s->_fastMode&2)
|
||||
return;
|
||||
|
||||
@ -400,24 +475,13 @@ void updateScreen(Scumm *s) {
|
||||
if(s->_palDirtyMax != -1) {
|
||||
updatePalette(s);
|
||||
}
|
||||
if (fullRedraw) {
|
||||
SDL_UpdateRect(screen, 0,0,0,0);
|
||||
fullRedraw = false;
|
||||
#if defined(SHOW_AREA)
|
||||
debug(2,"update area 100 %%");
|
||||
#endif
|
||||
} else if (numDirtyRects) {
|
||||
#if defined(SHOW_AREA)
|
||||
int area = 0,i;
|
||||
for (i=0; i<numDirtyRects; i++)
|
||||
area += (dirtyRects[i].w * dirtyRects[i].h);
|
||||
debug(2,"update area %f %%", (float)area/(640*400/100));
|
||||
#endif
|
||||
|
||||
SDL_UpdateRects(screen, numDirtyRects, dirtyRects);
|
||||
}
|
||||
|
||||
numDirtyRects = 0;
|
||||
if (s->_videoMode == VIDEO_SCALE)
|
||||
updateScreenScale(s);
|
||||
else if (s->_videoMode == VIDEO_2XSAI)
|
||||
updateScreen2xSaI(s);
|
||||
else
|
||||
error("Unknown graphics mode!");
|
||||
}
|
||||
|
||||
void drawMouse(Scumm *s, int xdraw, int ydraw, int w, int h, byte *buf, bool visible) {
|
||||
@ -648,18 +712,20 @@ void initGraphics(Scumm *s, bool fullScreen, unsigned int scaleFactor) {
|
||||
/* Create Music Thread */
|
||||
SDL_CreateThread((int (*)(void *))&music_thread, &scumm);
|
||||
}
|
||||
|
||||
|
||||
if (scale == 3)
|
||||
{
|
||||
screen = SDL_SetVideoMode(960, 600, 8, fullScreen ? (SDL_SWSURFACE | SDL_FULLSCREEN) : (SDL_SWSURFACE | SDL_DOUBLEBUF));
|
||||
} else
|
||||
if (scale == 2)
|
||||
{
|
||||
screen = SDL_SetVideoMode(640, 400, 8, fullScreen ? (SDL_SWSURFACE | SDL_FULLSCREEN) : (SDL_SWSURFACE | SDL_DOUBLEBUF));
|
||||
} else
|
||||
{
|
||||
screen = SDL_SetVideoMode(320, 200, 8, fullScreen ? (SDL_SWSURFACE | SDL_FULLSCREEN) : (SDL_SWSURFACE | SDL_DOUBLEBUF));
|
||||
if (s->_videoMode == VIDEO_2XSAI) {
|
||||
uint16 *tmp_screen = (uint16*)calloc(320*202 + 8,sizeof(uint16));
|
||||
Init_2xSaI(565);
|
||||
|
||||
screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 320, 200, 8, 0, 0, 0, 0);
|
||||
sdl_hwscreen = SDL_SetVideoMode(640, 400, 16, fullScreen ? (SDL_SWSURFACE | SDL_FULLSCREEN) : (SDL_SWSURFACE | SDL_DOUBLEBUF));
|
||||
sdl_tmpscreen = SDL_CreateRGBSurfaceFrom(tmp_screen + 320 + 4, 320, 200, 16, 320*2, 0,0,0,0);
|
||||
if (sdl_tmpscreen == NULL)
|
||||
error("sdl_tmpscreen failed");
|
||||
|
||||
scale = 1;
|
||||
} else {
|
||||
screen = SDL_SetVideoMode(320 * scale, 200 * scale, 8, fullScreen ? (SDL_SWSURFACE | SDL_FULLSCREEN) : (SDL_SWSURFACE | SDL_DOUBLEBUF));
|
||||
}
|
||||
|
||||
// SDL_SWSURFACE 0x00000000 /* Surface is in system memory */
|
||||
@ -965,3 +1031,824 @@ void BoxTest(int num) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/********** 2XSAI Filter *****************/
|
||||
static uint32 colorMask = 0xF7DEF7DE;
|
||||
static uint32 lowPixelMask = 0x08210821;
|
||||
static uint32 qcolorMask = 0xE79CE79C;
|
||||
static uint32 qlowpixelMask = 0x18631863;
|
||||
static uint32 redblueMask = 0xF81F;
|
||||
static uint32 greenMask = 0x7E0;
|
||||
|
||||
int Init_2xSaI (uint32 BitFormat)
|
||||
{
|
||||
if (BitFormat == 565)
|
||||
{
|
||||
colorMask = 0xF7DEF7DE;
|
||||
lowPixelMask = 0x08210821;
|
||||
qcolorMask = 0xE79CE79C;
|
||||
qlowpixelMask = 0x18631863;
|
||||
redblueMask = 0xF81F;
|
||||
greenMask = 0x7E0;
|
||||
}
|
||||
else if (BitFormat == 555)
|
||||
{
|
||||
colorMask = 0x7BDE7BDE;
|
||||
lowPixelMask = 0x04210421;
|
||||
qcolorMask = 0x739C739C;
|
||||
qlowpixelMask = 0x0C630C63;
|
||||
redblueMask = 0x7C1F;
|
||||
greenMask = 0x3E0;
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static inline int GetResult1 (uint32 A, uint32 B, uint32 C, uint32 D,
|
||||
uint32 /* E */)
|
||||
{
|
||||
int x = 0;
|
||||
int y = 0;
|
||||
int r = 0;
|
||||
|
||||
if (A == C)
|
||||
x += 1;
|
||||
else if (B == C)
|
||||
y += 1;
|
||||
if (A == D)
|
||||
x += 1;
|
||||
else if (B == D)
|
||||
y += 1;
|
||||
if (x <= 1)
|
||||
r += 1;
|
||||
if (y <= 1)
|
||||
r -= 1;
|
||||
return r;
|
||||
}
|
||||
|
||||
static inline int GetResult2 (uint32 A, uint32 B, uint32 C, uint32 D,
|
||||
uint32 /* E */)
|
||||
{
|
||||
int x = 0;
|
||||
int y = 0;
|
||||
int r = 0;
|
||||
|
||||
if (A == C)
|
||||
x += 1;
|
||||
else if (B == C)
|
||||
y += 1;
|
||||
if (A == D)
|
||||
x += 1;
|
||||
else if (B == D)
|
||||
y += 1;
|
||||
if (x <= 1)
|
||||
r -= 1;
|
||||
if (y <= 1)
|
||||
r += 1;
|
||||
return r;
|
||||
}
|
||||
|
||||
static inline int GetResult (uint32 A, uint32 B, uint32 C, uint32 D)
|
||||
{
|
||||
int x = 0;
|
||||
int y = 0;
|
||||
int r = 0;
|
||||
|
||||
if (A == C)
|
||||
x += 1;
|
||||
else if (B == C)
|
||||
y += 1;
|
||||
if (A == D)
|
||||
x += 1;
|
||||
else if (B == D)
|
||||
y += 1;
|
||||
if (x <= 1)
|
||||
r += 1;
|
||||
if (y <= 1)
|
||||
r -= 1;
|
||||
return r;
|
||||
}
|
||||
|
||||
static inline uint32 INTERPOLATE (uint32 A, uint32 B)
|
||||
{
|
||||
if (A != B)
|
||||
{
|
||||
return (((A & colorMask) >> 1) + ((B & colorMask) >> 1) +
|
||||
(A & B & lowPixelMask));
|
||||
}
|
||||
else
|
||||
return A;
|
||||
}
|
||||
|
||||
static inline uint32 Q_INTERPOLATE (uint32 A, uint32 B, uint32 C, uint32 D)
|
||||
{
|
||||
register uint32 x = ((A & qcolorMask) >> 2) +
|
||||
((B & qcolorMask) >> 2) +
|
||||
((C & qcolorMask) >> 2) + ((D & qcolorMask) >> 2);
|
||||
register uint32 y = (A & qlowpixelMask) +
|
||||
(B & qlowpixelMask) + (C & qlowpixelMask) + (D & qlowpixelMask);
|
||||
|
||||
y = (y >> 2) & qlowpixelMask;
|
||||
return x + y;
|
||||
}
|
||||
|
||||
#define BLUE_MASK565 0x001F001F
|
||||
#define RED_MASK565 0xF800F800
|
||||
#define GREEN_MASK565 0x07E007E0
|
||||
|
||||
#define BLUE_MASK555 0x001F001F
|
||||
#define RED_MASK555 0x7C007C00
|
||||
#define GREEN_MASK555 0x03E003E0
|
||||
|
||||
void Super2xSaI (uint8 *srcPtr, uint32 srcPitch,
|
||||
uint8 *deltaPtr, uint8 *dstPtr, uint32 dstPitch,
|
||||
int width, int height)
|
||||
{
|
||||
uint16 *bP;
|
||||
uint8 *dP;
|
||||
uint32 inc_bP;
|
||||
|
||||
{
|
||||
uint32 Nextline = srcPitch >> 1;
|
||||
inc_bP = 1;
|
||||
|
||||
while (height--)
|
||||
{
|
||||
bP = (uint16 *) srcPtr;
|
||||
dP = (uint8 *) dstPtr;
|
||||
|
||||
for (uint32 finish = width; finish; finish -= inc_bP)
|
||||
{
|
||||
uint32 color4, color5, color6;
|
||||
uint32 color1, color2, color3;
|
||||
uint32 colorA0, colorA1, colorA2, colorA3,
|
||||
colorB0, colorB1, colorB2, colorB3, colorS1, colorS2;
|
||||
uint32 product1a, product1b, product2a, product2b;
|
||||
|
||||
//--------------------------------------- B1 B2
|
||||
// 4 5 6 S2
|
||||
// 1 2 3 S1
|
||||
// A1 A2
|
||||
|
||||
colorB0 = *(bP - Nextline - 1);
|
||||
colorB1 = *(bP - Nextline);
|
||||
colorB2 = *(bP - Nextline + 1);
|
||||
colorB3 = *(bP - Nextline + 2);
|
||||
|
||||
color4 = *(bP - 1);
|
||||
color5 = *(bP);
|
||||
color6 = *(bP + 1);
|
||||
colorS2 = *(bP + 2);
|
||||
|
||||
color1 = *(bP + Nextline - 1);
|
||||
color2 = *(bP + Nextline);
|
||||
color3 = *(bP + Nextline + 1);
|
||||
colorS1 = *(bP + Nextline + 2);
|
||||
|
||||
colorA0 = *(bP + Nextline + Nextline - 1);
|
||||
colorA1 = *(bP + Nextline + Nextline);
|
||||
colorA2 = *(bP + Nextline + Nextline + 1);
|
||||
colorA3 = *(bP + Nextline + Nextline + 2);
|
||||
|
||||
//--------------------------------------
|
||||
if (color2 == color6 && color5 != color3)
|
||||
{
|
||||
product2b = product1b = color2;
|
||||
}
|
||||
else if (color5 == color3 && color2 != color6)
|
||||
{
|
||||
product2b = product1b = color5;
|
||||
}
|
||||
else if (color5 == color3 && color2 == color6)
|
||||
{
|
||||
register int r = 0;
|
||||
|
||||
r += GetResult (color6, color5, color1, colorA1);
|
||||
r += GetResult (color6, color5, color4, colorB1);
|
||||
r += GetResult (color6, color5, colorA2, colorS1);
|
||||
r += GetResult (color6, color5, colorB2, colorS2);
|
||||
|
||||
if (r > 0)
|
||||
product2b = product1b = color6;
|
||||
else if (r < 0)
|
||||
product2b = product1b = color5;
|
||||
else
|
||||
{
|
||||
product2b = product1b = INTERPOLATE (color5, color6);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (color6 == color3 && color3 == colorA1
|
||||
&& color2 != colorA2 && color3 != colorA0)
|
||||
product2b =
|
||||
Q_INTERPOLATE (color3, color3, color3, color2);
|
||||
else if (color5 == color2 && color2 == colorA2
|
||||
&& colorA1 != color3 && color2 != colorA3)
|
||||
product2b =
|
||||
Q_INTERPOLATE (color2, color2, color2, color3);
|
||||
else
|
||||
product2b = INTERPOLATE (color2, color3);
|
||||
|
||||
if (color6 == color3 && color6 == colorB1
|
||||
&& color5 != colorB2 && color6 != colorB0)
|
||||
product1b =
|
||||
Q_INTERPOLATE (color6, color6, color6, color5);
|
||||
else if (color5 == color2 && color5 == colorB2
|
||||
&& colorB1 != color6 && color5 != colorB3)
|
||||
product1b =
|
||||
Q_INTERPOLATE (color6, color5, color5, color5);
|
||||
else
|
||||
product1b = INTERPOLATE (color5, color6);
|
||||
}
|
||||
|
||||
if (color5 == color3 && color2 != color6 && color4 == color5
|
||||
&& color5 != colorA2)
|
||||
product2a = INTERPOLATE (color2, color5);
|
||||
else
|
||||
if (color5 == color1 && color6 == color5
|
||||
&& color4 != color2 && color5 != colorA0)
|
||||
product2a = INTERPOLATE (color2, color5);
|
||||
else
|
||||
product2a = color2;
|
||||
|
||||
if (color2 == color6 && color5 != color3 && color1 == color2
|
||||
&& color2 != colorB2)
|
||||
product1a = INTERPOLATE (color2, color5);
|
||||
else
|
||||
if (color4 == color2 && color3 == color2
|
||||
&& color1 != color5 && color2 != colorB0)
|
||||
product1a = INTERPOLATE (color2, color5);
|
||||
else
|
||||
product1a = color5;
|
||||
|
||||
product1a = product1a | (product1b << 16);
|
||||
product2a = product2a | (product2b << 16);
|
||||
|
||||
*((uint32 *) dP) = product1a;
|
||||
*((uint32 *) (dP + dstPitch)) = product2a;
|
||||
|
||||
bP += inc_bP;
|
||||
dP += sizeof (uint32);
|
||||
} // end of for ( finish= width etc..)
|
||||
|
||||
srcPtr += srcPitch;
|
||||
dstPtr += dstPitch * 2;
|
||||
deltaPtr += srcPitch;
|
||||
} // while (height--)
|
||||
}
|
||||
}
|
||||
|
||||
void SuperEagle (uint8 *srcPtr, uint32 srcPitch, uint8 *deltaPtr,
|
||||
uint8 *dstPtr, uint32 dstPitch, int width, int height)
|
||||
{
|
||||
uint8 *dP;
|
||||
uint16 *bP;
|
||||
uint16 *xP;
|
||||
uint32 inc_bP;
|
||||
|
||||
{
|
||||
inc_bP = 1;
|
||||
|
||||
uint32 Nextline = srcPitch >> 1;
|
||||
|
||||
while (height--)
|
||||
{
|
||||
bP = (uint16 *) srcPtr;
|
||||
xP = (uint16 *) deltaPtr;
|
||||
dP = dstPtr;
|
||||
for (uint32 finish = width; finish; finish -= inc_bP)
|
||||
{
|
||||
uint32 color4, color5, color6;
|
||||
uint32 color1, color2, color3;
|
||||
uint32 colorA1, colorA2, colorB1, colorB2, colorS1, colorS2;
|
||||
uint32 product1a, product1b, product2a, product2b;
|
||||
|
||||
colorB1 = *(bP - Nextline);
|
||||
colorB2 = *(bP - Nextline + 1);
|
||||
|
||||
color4 = *(bP - 1);
|
||||
color5 = *(bP);
|
||||
color6 = *(bP + 1);
|
||||
colorS2 = *(bP + 2);
|
||||
|
||||
color1 = *(bP + Nextline - 1);
|
||||
color2 = *(bP + Nextline);
|
||||
color3 = *(bP + Nextline + 1);
|
||||
colorS1 = *(bP + Nextline + 2);
|
||||
|
||||
colorA1 = *(bP + Nextline + Nextline);
|
||||
colorA2 = *(bP + Nextline + Nextline + 1);
|
||||
|
||||
// --------------------------------------
|
||||
if (color2 == color6 && color5 != color3)
|
||||
{
|
||||
product1b = product2a = color2;
|
||||
if ((color1 == color2) || (color6 == colorB2))
|
||||
{
|
||||
product1a = INTERPOLATE (color2, color5);
|
||||
product1a = INTERPOLATE (color2, product1a);
|
||||
// product1a = color2;
|
||||
}
|
||||
else
|
||||
{
|
||||
product1a = INTERPOLATE (color5, color6);
|
||||
}
|
||||
|
||||
if ((color6 == colorS2) || (color2 == colorA1))
|
||||
{
|
||||
product2b = INTERPOLATE (color2, color3);
|
||||
product2b = INTERPOLATE (color2, product2b);
|
||||
// product2b = color2;
|
||||
}
|
||||
else
|
||||
{
|
||||
product2b = INTERPOLATE (color2, color3);
|
||||
}
|
||||
}
|
||||
else if (color5 == color3 && color2 != color6)
|
||||
{
|
||||
product2b = product1a = color5;
|
||||
|
||||
if ((colorB1 == color5) || (color3 == colorS1))
|
||||
{
|
||||
product1b = INTERPOLATE (color5, color6);
|
||||
product1b = INTERPOLATE (color5, product1b);
|
||||
// product1b = color5;
|
||||
}
|
||||
else
|
||||
{
|
||||
product1b = INTERPOLATE (color5, color6);
|
||||
}
|
||||
|
||||
if ((color3 == colorA2) || (color4 == color5))
|
||||
{
|
||||
product2a = INTERPOLATE (color5, color2);
|
||||
product2a = INTERPOLATE (color5, product2a);
|
||||
// product2a = color5;
|
||||
}
|
||||
else
|
||||
{
|
||||
product2a = INTERPOLATE (color2, color3);
|
||||
}
|
||||
|
||||
}
|
||||
else if (color5 == color3 && color2 == color6)
|
||||
{
|
||||
register int r = 0;
|
||||
|
||||
r += GetResult (color6, color5, color1, colorA1);
|
||||
r += GetResult (color6, color5, color4, colorB1);
|
||||
r += GetResult (color6, color5, colorA2, colorS1);
|
||||
r += GetResult (color6, color5, colorB2, colorS2);
|
||||
|
||||
if (r > 0)
|
||||
{
|
||||
product1b = product2a = color2;
|
||||
product1a = product2b = INTERPOLATE (color5, color6);
|
||||
}
|
||||
else if (r < 0)
|
||||
{
|
||||
product2b = product1a = color5;
|
||||
product1b = product2a = INTERPOLATE (color5, color6);
|
||||
}
|
||||
else
|
||||
{
|
||||
product2b = product1a = color5;
|
||||
product1b = product2a = color2;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
product2b = product1a = INTERPOLATE (color2, color6);
|
||||
product2b =
|
||||
Q_INTERPOLATE (color3, color3, color3, product2b);
|
||||
product1a =
|
||||
Q_INTERPOLATE (color5, color5, color5, product1a);
|
||||
|
||||
product2a = product1b = INTERPOLATE (color5, color3);
|
||||
product2a =
|
||||
Q_INTERPOLATE (color2, color2, color2, product2a);
|
||||
product1b =
|
||||
Q_INTERPOLATE (color6, color6, color6, product1b);
|
||||
|
||||
// product1a = color5;
|
||||
// product1b = color6;
|
||||
// product2a = color2;
|
||||
// product2b = color3;
|
||||
}
|
||||
product1a = product1a | (product1b << 16);
|
||||
product2a = product2a | (product2b << 16);
|
||||
|
||||
*((uint32 *) dP) = product1a;
|
||||
*((uint32 *) (dP + dstPitch)) = product2a;
|
||||
*xP = color5;
|
||||
|
||||
bP += inc_bP;
|
||||
xP += inc_bP;
|
||||
dP += sizeof (uint32);
|
||||
} // end of for ( finish= width etc..)
|
||||
|
||||
srcPtr += srcPitch;
|
||||
dstPtr += dstPitch * 2;
|
||||
deltaPtr += srcPitch;
|
||||
} // endof: while (height--)
|
||||
}
|
||||
}
|
||||
|
||||
void _2xSaI (uint8 *srcPtr, uint32 srcPitch, uint8 *deltaPtr,
|
||||
uint8 *dstPtr, uint32 dstPitch, int width, int height)
|
||||
{
|
||||
uint8 *dP;
|
||||
uint16 *bP;
|
||||
uint32 inc_bP;
|
||||
|
||||
|
||||
{
|
||||
inc_bP = 1;
|
||||
|
||||
uint32 Nextline = srcPitch >> 1;
|
||||
|
||||
while (height--)
|
||||
{
|
||||
bP = (uint16 *) srcPtr;
|
||||
dP = dstPtr;
|
||||
|
||||
for (uint32 finish = width; finish; finish -= inc_bP)
|
||||
{
|
||||
|
||||
register uint32 colorA, colorB;
|
||||
uint32 colorC, colorD,
|
||||
colorE, colorF, colorG, colorH,
|
||||
colorI, colorJ, colorK, colorL,
|
||||
|
||||
colorM, colorN, colorO, colorP;
|
||||
uint32 product, product1, product2;
|
||||
|
||||
//---------------------------------------
|
||||
// Map of the pixels: I|E F|J
|
||||
// G|A B|K
|
||||
// H|C D|L
|
||||
// M|N O|P
|
||||
colorI = *(bP - Nextline - 1);
|
||||
colorE = *(bP - Nextline);
|
||||
colorF = *(bP - Nextline + 1);
|
||||
colorJ = *(bP - Nextline + 2);
|
||||
|
||||
colorG = *(bP - 1);
|
||||
colorA = *(bP);
|
||||
colorB = *(bP + 1);
|
||||
colorK = *(bP + 2);
|
||||
|
||||
colorH = *(bP + Nextline - 1);
|
||||
colorC = *(bP + Nextline);
|
||||
colorD = *(bP + Nextline + 1);
|
||||
colorL = *(bP + Nextline + 2);
|
||||
|
||||
colorM = *(bP + Nextline + Nextline - 1);
|
||||
colorN = *(bP + Nextline + Nextline);
|
||||
colorO = *(bP + Nextline + Nextline + 1);
|
||||
colorP = *(bP + Nextline + Nextline + 2);
|
||||
|
||||
if ((colorA == colorD) && (colorB != colorC))
|
||||
{
|
||||
if (((colorA == colorE) && (colorB == colorL)) ||
|
||||
((colorA == colorC) && (colorA == colorF)
|
||||
&& (colorB != colorE) && (colorB == colorJ)))
|
||||
{
|
||||
product = colorA;
|
||||
}
|
||||
else
|
||||
{
|
||||
product = INTERPOLATE (colorA, colorB);
|
||||
}
|
||||
|
||||
if (((colorA == colorG) && (colorC == colorO)) ||
|
||||
((colorA == colorB) && (colorA == colorH)
|
||||
&& (colorG != colorC) && (colorC == colorM)))
|
||||
{
|
||||
product1 = colorA;
|
||||
}
|
||||
else
|
||||
{
|
||||
product1 = INTERPOLATE (colorA, colorC);
|
||||
}
|
||||
product2 = colorA;
|
||||
}
|
||||
else if ((colorB == colorC) && (colorA != colorD))
|
||||
{
|
||||
if (((colorB == colorF) && (colorA == colorH)) ||
|
||||
((colorB == colorE) && (colorB == colorD)
|
||||
&& (colorA != colorF) && (colorA == colorI)))
|
||||
{
|
||||
product = colorB;
|
||||
}
|
||||
else
|
||||
{
|
||||
product = INTERPOLATE (colorA, colorB);
|
||||
}
|
||||
|
||||
if (((colorC == colorH) && (colorA == colorF)) ||
|
||||
((colorC == colorG) && (colorC == colorD)
|
||||
&& (colorA != colorH) && (colorA == colorI)))
|
||||
{
|
||||
product1 = colorC;
|
||||
}
|
||||
else
|
||||
{
|
||||
product1 = INTERPOLATE (colorA, colorC);
|
||||
}
|
||||
product2 = colorB;
|
||||
}
|
||||
else if ((colorA == colorD) && (colorB == colorC))
|
||||
{
|
||||
if (colorA == colorB)
|
||||
{
|
||||
product = colorA;
|
||||
product1 = colorA;
|
||||
product2 = colorA;
|
||||
}
|
||||
else
|
||||
{
|
||||
register int r = 0;
|
||||
|
||||
product1 = INTERPOLATE (colorA, colorC);
|
||||
product = INTERPOLATE (colorA, colorB);
|
||||
|
||||
r +=
|
||||
GetResult1 (colorA, colorB, colorG, colorE,
|
||||
colorI);
|
||||
r +=
|
||||
GetResult2 (colorB, colorA, colorK, colorF,
|
||||
colorJ);
|
||||
r +=
|
||||
GetResult2 (colorB, colorA, colorH, colorN,
|
||||
colorM);
|
||||
r +=
|
||||
GetResult1 (colorA, colorB, colorL, colorO,
|
||||
colorP);
|
||||
|
||||
if (r > 0)
|
||||
product2 = colorA;
|
||||
else if (r < 0)
|
||||
product2 = colorB;
|
||||
else
|
||||
{
|
||||
product2 =
|
||||
Q_INTERPOLATE (colorA, colorB, colorC,
|
||||
colorD);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
product2 = Q_INTERPOLATE (colorA, colorB, colorC, colorD);
|
||||
|
||||
if ((colorA == colorC) && (colorA == colorF)
|
||||
&& (colorB != colorE) && (colorB == colorJ))
|
||||
{
|
||||
product = colorA;
|
||||
}
|
||||
else
|
||||
if ((colorB == colorE) && (colorB == colorD)
|
||||
&& (colorA != colorF) && (colorA == colorI))
|
||||
{
|
||||
product = colorB;
|
||||
}
|
||||
else
|
||||
{
|
||||
product = INTERPOLATE (colorA, colorB);
|
||||
}
|
||||
|
||||
if ((colorA == colorB) && (colorA == colorH)
|
||||
&& (colorG != colorC) && (colorC == colorM))
|
||||
{
|
||||
product1 = colorA;
|
||||
}
|
||||
else
|
||||
if ((colorC == colorG) && (colorC == colorD)
|
||||
&& (colorA != colorH) && (colorA == colorI))
|
||||
{
|
||||
product1 = colorC;
|
||||
}
|
||||
else
|
||||
{
|
||||
product1 = INTERPOLATE (colorA, colorC);
|
||||
}
|
||||
}
|
||||
|
||||
product = colorA | (product << 16);
|
||||
product1 = product1 | (product2 << 16);
|
||||
*((int32 *) dP) = product;
|
||||
*((uint32 *) (dP + dstPitch)) = product1;
|
||||
|
||||
bP += inc_bP;
|
||||
dP += sizeof (uint32);
|
||||
} // end of for ( finish= width etc..)
|
||||
|
||||
srcPtr += srcPitch;
|
||||
dstPtr += dstPitch * 2;
|
||||
deltaPtr += srcPitch;
|
||||
} // endof: while (height--)
|
||||
}
|
||||
}
|
||||
|
||||
static uint32 Bilinear (uint32 A, uint32 B, uint32 x)
|
||||
{
|
||||
unsigned long areaA, areaB;
|
||||
unsigned long result;
|
||||
|
||||
if (A == B)
|
||||
return A;
|
||||
|
||||
areaB = (x >> 11) & 0x1f; // reduce 16 bit fraction to 5 bits
|
||||
areaA = 0x20 - areaB;
|
||||
|
||||
A = (A & redblueMask) | ((A & greenMask) << 16);
|
||||
B = (B & redblueMask) | ((B & greenMask) << 16);
|
||||
|
||||
result = ((areaA * A) + (areaB * B)) >> 5;
|
||||
|
||||
return (result & redblueMask) | ((result >> 16) & greenMask);
|
||||
|
||||
}
|
||||
|
||||
static uint32 Bilinear4 (uint32 A, uint32 B, uint32 C, uint32 D, uint32 x,
|
||||
uint32 y)
|
||||
{
|
||||
unsigned long areaA, areaB, areaC, areaD;
|
||||
unsigned long result, xy;
|
||||
|
||||
x = (x >> 11) & 0x1f;
|
||||
y = (y >> 11) & 0x1f;
|
||||
xy = (x * y) >> 5;
|
||||
|
||||
A = (A & redblueMask) | ((A & greenMask) << 16);
|
||||
B = (B & redblueMask) | ((B & greenMask) << 16);
|
||||
C = (C & redblueMask) | ((C & greenMask) << 16);
|
||||
D = (D & redblueMask) | ((D & greenMask) << 16);
|
||||
|
||||
areaA = 0x20 + xy - x - y;
|
||||
areaB = x - xy;
|
||||
areaC = y - xy;
|
||||
areaD = xy;
|
||||
|
||||
result = ((areaA * A) + (areaB * B) + (areaC * C) + (areaD * D)) >> 5;
|
||||
|
||||
return (result & redblueMask) | ((result >> 16) & greenMask);
|
||||
}
|
||||
|
||||
void Scale_2xSaI (uint8 *srcPtr, uint32 srcPitch, uint8 * /* deltaPtr */,
|
||||
uint8 *dstPtr, uint32 dstPitch,
|
||||
uint32 dstWidth, uint32 dstHeight, int width, int height)
|
||||
{
|
||||
uint8 *dP;
|
||||
uint16 *bP;
|
||||
|
||||
uint32 w;
|
||||
uint32 h;
|
||||
uint32 dw;
|
||||
uint32 dh;
|
||||
uint32 hfinish;
|
||||
uint32 wfinish;
|
||||
|
||||
uint32 Nextline = srcPitch >> 1;
|
||||
|
||||
wfinish = (width - 1) << 16; // convert to fixed point
|
||||
dw = wfinish / (dstWidth - 1);
|
||||
hfinish = (height - 1) << 16; // convert to fixed point
|
||||
dh = hfinish / (dstHeight - 1);
|
||||
|
||||
for (h = 0; h < hfinish; h += dh)
|
||||
{
|
||||
uint32 y1, y2;
|
||||
|
||||
y1 = h & 0xffff; // fraction part of fixed point
|
||||
bP = (uint16 *) (srcPtr + ((h >> 16) * srcPitch));
|
||||
dP = dstPtr;
|
||||
y2 = 0x10000 - y1;
|
||||
|
||||
w = 0;
|
||||
|
||||
for (; w < wfinish;)
|
||||
{
|
||||
uint32 A, B, C, D;
|
||||
uint32 E, F, G, H;
|
||||
uint32 I, J, K, L;
|
||||
uint32 x1, x2, a1, f1, f2;
|
||||
uint32 position, product1;
|
||||
|
||||
position = w >> 16;
|
||||
A = bP[position]; // current pixel
|
||||
B = bP[position + 1]; // next pixel
|
||||
C = bP[position + Nextline];
|
||||
D = bP[position + Nextline + 1];
|
||||
E = bP[position - Nextline];
|
||||
F = bP[position - Nextline + 1];
|
||||
G = bP[position - 1];
|
||||
H = bP[position + Nextline - 1];
|
||||
I = bP[position + 2];
|
||||
J = bP[position + Nextline + 2];
|
||||
K = bP[position + Nextline + Nextline];
|
||||
L = bP[position + Nextline + Nextline + 1];
|
||||
|
||||
x1 = w & 0xffff; // fraction part of fixed point
|
||||
x2 = 0x10000 - x1;
|
||||
|
||||
/*0*/
|
||||
if (A == B && C == D && A == C)
|
||||
product1 = A;
|
||||
else
|
||||
/*1*/
|
||||
if (A == D && B != C)
|
||||
{
|
||||
f1 = (x1 >> 1) + (0x10000 >> 2);
|
||||
f2 = (y1 >> 1) + (0x10000 >> 2);
|
||||
if (y1 <= f1 && A == J && A != E) // close to B
|
||||
{
|
||||
a1 = f1 - y1;
|
||||
product1 = Bilinear (A, B, a1);
|
||||
}
|
||||
else if (y1 >= f1 && A == G && A != L) // close to C
|
||||
{
|
||||
a1 = y1 - f1;
|
||||
product1 = Bilinear (A, C, a1);
|
||||
}
|
||||
else if (x1 >= f2 && A == E && A != J) // close to B
|
||||
{
|
||||
a1 = x1 - f2;
|
||||
product1 = Bilinear (A, B, a1);
|
||||
}
|
||||
else if (x1 <= f2 && A == L && A != G) // close to C
|
||||
{
|
||||
a1 = f2 - x1;
|
||||
product1 = Bilinear (A, C, a1);
|
||||
}
|
||||
else if (y1 >= x1) // close to C
|
||||
{
|
||||
a1 = y1 - x1;
|
||||
product1 = Bilinear (A, C, a1);
|
||||
}
|
||||
else if (y1 <= x1) // close to B
|
||||
{
|
||||
a1 = x1 - y1;
|
||||
product1 = Bilinear (A, B, a1);
|
||||
}
|
||||
}
|
||||
else
|
||||
/*2*/
|
||||
if (B == C && A != D)
|
||||
{
|
||||
f1 = (x1 >> 1) + (0x10000 >> 2);
|
||||
f2 = (y1 >> 1) + (0x10000 >> 2);
|
||||
if (y2 >= f1 && B == H && B != F) // close to A
|
||||
{
|
||||
a1 = y2 - f1;
|
||||
product1 = Bilinear (B, A, a1);
|
||||
}
|
||||
else if (y2 <= f1 && B == I && B != K) // close to D
|
||||
{
|
||||
a1 = f1 - y2;
|
||||
product1 = Bilinear (B, D, a1);
|
||||
}
|
||||
else if (x2 >= f2 && B == F && B != H) // close to A
|
||||
{
|
||||
a1 = x2 - f2;
|
||||
product1 = Bilinear (B, A, a1);
|
||||
}
|
||||
else if (x2 <= f2 && B == K && B != I) // close to D
|
||||
{
|
||||
a1 = f2 - x2;
|
||||
product1 = Bilinear (B, D, a1);
|
||||
}
|
||||
else if (y2 >= x1) // close to A
|
||||
{
|
||||
a1 = y2 - x1;
|
||||
product1 = Bilinear (B, A, a1);
|
||||
}
|
||||
else if (y2 <= x1) // close to D
|
||||
{
|
||||
a1 = x1 - y2;
|
||||
product1 = Bilinear (B, D, a1);
|
||||
}
|
||||
}
|
||||
/*3*/
|
||||
else
|
||||
{
|
||||
product1 = Bilinear4 (A, B, C, D, x1, y1);
|
||||
}
|
||||
|
||||
//end First Pixel
|
||||
*(uint32 *) dP = product1;
|
||||
dP += 2;
|
||||
w += dw;
|
||||
}
|
||||
dstPtr += dstPitch;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user