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

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

Diff Legend

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