ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/utils/cfhq2xa.C
(Generate patch)

Comparing deliantra/server/utils/cfhq2xa.C (file contents):
Revision 1.6 by root, Mon Oct 12 14:01:00 2009 UTC vs.
Revision 1.16 by root, Sat Nov 17 23:40:05 2018 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
5 * Copyright (©) 2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2003,2007 MaxSt <maxst@hiend3d.com> 6 * Copyright (©) 2003 MaxSt <maxst@hiend3d.com>
6 * 7 *
7 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
8 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
9 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
10 * option) any later version. 11 * option) any later version.
11 * 12 *
12 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 16 * GNU General Public License for more details.
16 * 17 *
17 * You should have received a copy of the Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
18 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
19 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24// note: the original code was released under the LGPL version 2.1 25// note: the original code was released under the LGPL version 2.1
25 26
… …
53# define trY 0x30 54# define trY 0x30
54# define trU 0x11 55# define trU 0x11
55# define trV 0x10 56# define trV 0x10
56# define trA 0x40 57# define trA 0x40
57 58
59static int32_t
60udiff (uint32_t a, uint32_t b)
61{
62 return a > b ? a - b : b - a;
63
64}
65
58static inline pixel lerp (pixel c1, int w1, pixel c2, int w2, pixel c3, int w3, int shift) 66static inline pixel lerp (pixel c1, int w1, pixel c2, int w2, pixel c3, int w3, int shift)
59{ 67{
60#if 0 68#if 0
61 if (!(c1 >> Ashift) & Cmask) w1 = 0; 69 if (!(c1 >> Ashift) & Cmask) w1 = 0;
62 if (!(c2 >> Ashift) & Cmask) w2 = 0; 70 if (!(c2 >> Ashift) & Cmask) w2 = 0;
… …
66 int w = w1 + w2 + w3; 74 int w = w1 + w2 + w3;
67 75
68 return ((((c1 >> shift) & Cmask) * w1 + ((c2 >> shift) & Cmask) * w2 + ((c3 >> shift) & Cmask) * w3 + w / 2) / w) << shift; 76 return ((((c1 >> shift) & Cmask) * w1 + ((c2 >> shift) & Cmask) * w2 + ((c3 >> shift) & Cmask) * w3 + w / 2) / w) << shift;
69} 77}
70 78
71inline void lerp (unsigned char *pc, pixel c1, int w1, pixel c2, int w2, pixel c3 = 0, int w3 = 0) 79static inline void lerp (unsigned char *pc, pixel c1, int w1, pixel c2, int w2, pixel c3 = 0, int w3 = 0)
72{ 80{
73 *(pixel *)pc = lerp (c1, w1, c2, w2, c3, w3, Rshift) 81 *(pixel *)pc = lerp (c1, w1, c2, w2, c3, w3, Rshift)
74 | lerp (c1, w1, c2, w2, c3, w3, Gshift) 82 | lerp (c1, w1, c2, w2, c3, w3, Gshift)
75 | lerp (c1, w1, c2, w2, c3, w3, Bshift) 83 | lerp (c1, w1, c2, w2, c3, w3, Bshift)
76 | lerp (c1, w1, c2, w2, c3, w3, Ashift); 84 | lerp (c1, w1, c2, w2, c3, w3, Ashift);
77} 85}
78 86
79inline void Interp1 (unsigned char *pc, pixel c1, pixel c2) 87static inline void Interp1 (unsigned char *pc, pixel c1, pixel c2)
80{ 88{
81 lerp (pc, c1, 3, c2, 1); 89 lerp (pc, c1, 3, c2, 1);
82} 90}
83 91
84inline void Interp2 (unsigned char *pc, pixel c1, pixel c2, pixel c3) 92static inline void Interp2 (unsigned char *pc, pixel c1, pixel c2, pixel c3)
85{ 93{
86 lerp (pc, c1, 2, c2, 1, c3, 1); 94 lerp (pc, c1, 2, c2, 1, c3, 1);
87} 95}
88 96
89inline void Interp5 (unsigned char *pc, pixel c1, pixel c2) 97static inline void Interp5 (unsigned char *pc, pixel c1, pixel c2)
90{ 98{
91 lerp (pc, c1, 1, c2, 1); 99 lerp (pc, c1, 1, c2, 1);
92} 100}
93 101
94inline void Interp6 (unsigned char *pc, pixel c1, pixel c2, pixel c3) 102static inline void Interp6 (unsigned char *pc, pixel c1, pixel c2, pixel c3)
95{ 103{
96 lerp (pc, c1, 5, c2, 2, c3, 1); 104 lerp (pc, c1, 5, c2, 2, c3, 1);
97} 105}
98 106
99inline void Interp7 (unsigned char *pc, pixel c1, pixel c2, pixel c3) 107static inline void Interp7 (unsigned char *pc, pixel c1, pixel c2, pixel c3)
100{ 108{
101 lerp (pc, c1, 6, c2, 1, c3, 1); 109 lerp (pc, c1, 6, c2, 1, c3, 1);
102} 110}
103 111
104inline void Interp9 (unsigned char *pc, pixel c1, pixel c2, pixel c3) 112static inline void Interp9 (unsigned char *pc, pixel c1, pixel c2, pixel c3)
105{ 113{
106 lerp (pc, c1, 2, c2, 3, c2, 3); 114 lerp (pc, c1, 2, c2, 3, c2, 3);
107} 115}
108 116
109inline void Interp10 (unsigned char *pc, pixel c1, pixel c2, pixel c3) 117static inline void Interp10 (unsigned char *pc, pixel c1, pixel c2, pixel c3)
110{ 118{
111 lerp (pc, c1, 14, c2, 1, c3, 1); 119 lerp (pc, c1, 14, c2, 1, c3, 1);
112} 120}
113 121
114#define PIXEL00_0 *((pixel *)(pOut)) = w[5]; 122#define PIXEL00_0 *((pixel *)(pOut)) = w[5];
… …
158#define PIXEL11_61 Interp6(pOut+BpL + sizeof (pixel), w[5], w[6], w[8]); 166#define PIXEL11_61 Interp6(pOut+BpL + sizeof (pixel), w[5], w[6], w[8]);
159#define PIXEL11_70 Interp7(pOut+BpL + sizeof (pixel), w[5], w[6], w[8]); 167#define PIXEL11_70 Interp7(pOut+BpL + sizeof (pixel), w[5], w[6], w[8]);
160#define PIXEL11_90 Interp9(pOut+BpL + sizeof (pixel), w[5], w[6], w[8]); 168#define PIXEL11_90 Interp9(pOut+BpL + sizeof (pixel), w[5], w[6], w[8]);
161#define PIXEL11_100 Interp10(pOut+BpL + sizeof (pixel), w[5], w[6], w[8]); 169#define PIXEL11_100 Interp10(pOut+BpL + sizeof (pixel), w[5], w[6], w[8]);
162 170
163inline pixel RGBAtoYUVA (pixel w) 171static inline pixel RGBAtoYUVA (pixel w)
164{ 172{
165 int r = (w >> Rshift) & Cmask; 173 int r = (w >> Rshift) & Cmask;
166 int g = (w >> Gshift) & Cmask; 174 int g = (w >> Gshift) & Cmask;
167 int b = (w >> Bshift) & Cmask; 175 int b = (w >> Bshift) & Cmask;
168 int a = (w >> Ashift) & Cmask; 176 int a = (w >> Ashift) & Cmask;
… …
175 | (u << Gshift) 183 | (u << Gshift)
176 | (v << Bshift) 184 | (v << Bshift)
177 | (a << Ashift); 185 | (a << Ashift);
178} 186}
179 187
180inline bool Diff (pixel w1, pixel w2) 188static inline bool Diff (pixel w1, pixel w2)
181{ 189{
182 pixel YUV1 = RGBAtoYUVA (w1); 190 pixel YUV1 = RGBAtoYUVA (w1);
183 pixel YUV2 = RGBAtoYUVA (w2); 191 pixel YUV2 = RGBAtoYUVA (w2);
184 192
185 return ((abs (((YUV1 >> Rshift) & Cmask) - ((YUV2 >> Rshift) & Cmask)) > trY) || 193 return ((udiff ((YUV1 >> Rshift) & Cmask, (YUV2 >> Rshift) & Cmask) > trY) ||
186 (abs (((YUV1 >> Gshift) & Cmask) - ((YUV2 >> Gshift) & Cmask)) > trU) || 194 (udiff ((YUV1 >> Gshift) & Cmask, (YUV2 >> Gshift) & Cmask) > trU) ||
187 (abs (((YUV1 >> Bshift) & Cmask) - ((YUV2 >> Bshift) & Cmask)) > trV) || 195 (udiff ((YUV1 >> Bshift) & Cmask, (YUV2 >> Bshift) & Cmask) > trV) ||
188 (abs (((YUV1 >> Ashift) & Cmask) - ((YUV2 >> Ashift) & Cmask)) > trA) ); 196 (udiff ((YUV1 >> Ashift) & Cmask, (YUV2 >> Ashift) & Cmask) > trA) );
189} 197}
190 198
191void 199static void
192hq2x_32 (unsigned char *pIn, unsigned char *pOut, int Xres, int Yres, int BpL, bool wrap) 200hq2x_32 (unsigned char *pIn, unsigned char *pOut, int Xres, int Yres, int BpL, bool wrap)
193{ 201{
194 int i, j, k; 202 int i, j, k;
195 int prevline, nextline; 203 int prevline, nextline;
196 pixel w[10]; 204 pixel w[10];

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines