Mercurial > mplayer.hg
annotate libmpcodecs/vf_gradfun.c @ 35728:168aae142525
Redefine PACK_RGB16 and PACK_RGB15.
First and third parameter were mixed up
which resulted in confusing calls.
author | ib |
---|---|
date | Tue, 22 Jan 2013 15:37:17 +0000 |
parents | d206960484fe |
children |
rev | line source |
---|---|
29371 | 1 /* |
2 * Copyright (C) 2009 Loren Merritt <lorenm@u.washignton.edu> | |
3 * | |
4 * This file is part of MPlayer. | |
5 * | |
6 * MPlayer is free software; you can redistribute it and/or modify | |
7 * it under the terms of the GNU General Public License as published by | |
8 * the Free Software Foundation; either version 2 of the License, or | |
9 * (at your option) any later version. | |
10 * | |
11 * MPlayer is distributed in the hope that it will be useful, | |
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 * GNU General Public License for more details. | |
15 * | |
16 * You should have received a copy of the GNU General Public License along | |
17 * with MPlayer; if not, write to the Free Software Foundation, Inc., | |
18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | |
19 */ | |
20 | |
21 /* | |
22 * Debanding algorithm (from gradfun2db by prunedtree): | |
23 * Boxblur. | |
24 * Foreach pixel, if it's within threshold of the blurred value, make it closer. | |
25 * So now we have a smoothed and higher bitdepth version of all the shallow | |
26 * gradients, while leaving detailed areas untouched. | |
27 * Dither it back to 8bit. | |
28 */ | |
29 | |
30 #include <stdio.h> | |
31 #include <stdlib.h> | |
32 #include <string.h> | |
33 #include <inttypes.h> | |
34 | |
35 #include "config.h" | |
36 #include "cpudetect.h" | |
37 #include "img_format.h" | |
38 #include "mp_image.h" | |
39 #include "vf.h" | |
40 #include "libvo/fastmemcpy.h" | |
41 #include "libavutil/avutil.h" | |
35712
d206960484fe
Add a number of missing libavutil header #includes.
diego
parents:
35705
diff
changeset
|
42 #include "libavutil/common.h" |
d206960484fe
Add a number of missing libavutil header #includes.
diego
parents:
35705
diff
changeset
|
43 #include "libavutil/mem.h" |
35705
b4ce15212bfc
Replace obsolete x86_cpu.h #includes by the correct header.
diego
parents:
30983
diff
changeset
|
44 #include "libavutil/x86/asm.h" |
29371 | 45 |
46 struct vf_priv_s { | |
47 int thresh; | |
48 int radius; | |
49 uint16_t *buf; | |
50 void (*filter_line)(uint8_t *dst, uint8_t *src, uint16_t *dc, | |
51 int width, int thresh, const uint16_t *dithers); | |
52 void (*blur_line)(uint16_t *dc, uint16_t *buf, uint16_t *buf1, | |
53 uint8_t *src, int sstride, int width); | |
54 }; | |
55 | |
56 static const uint16_t __attribute__((aligned(16))) pw_7f[8] = {127,127,127,127,127,127,127,127}; | |
57 static const uint16_t __attribute__((aligned(16))) pw_ff[8] = {255,255,255,255,255,255,255,255}; | |
58 static const uint16_t __attribute__((aligned(16))) dither[8][8] = { | |
59 { 0, 96, 24,120, 6,102, 30,126 }, | |
60 { 64, 32, 88, 56, 70, 38, 94, 62 }, | |
61 { 16,112, 8,104, 22,118, 14,110 }, | |
62 { 80, 48, 72, 40, 86, 54, 78, 46 }, | |
63 { 4,100, 28,124, 2, 98, 26,122 }, | |
64 { 68, 36, 92, 60, 66, 34, 90, 58 }, | |
65 { 20,116, 12,108, 18,114, 10,106 }, | |
66 { 84, 52, 76, 44, 82, 50, 74, 42 }, | |
67 }; | |
68 | |
69 static void filter_line_c(uint8_t *dst, uint8_t *src, uint16_t *dc, | |
70 int width, int thresh, const uint16_t *dithers) | |
71 { | |
72 int x; | |
73 for (x=0; x<width; x++, dc+=x&1) { | |
74 int pix = src[x]<<7; | |
75 int delta = dc[0] - pix; | |
76 int m = abs(delta) * thresh >> 16; | |
77 m = FFMAX(0, 127-m); | |
78 m = m*m*delta >> 14; | |
79 pix += m + dithers[x&7]; | |
80 dst[x] = av_clip_uint8(pix>>7); | |
81 } | |
82 } | |
83 | |
84 static void blur_line_c(uint16_t *dc, uint16_t *buf, uint16_t *buf1, | |
85 uint8_t *src, int sstride, int width) | |
86 { | |
87 int x, v, old; | |
88 for (x=0; x<width; x++) { | |
89 v = buf1[x] + src[2*x] + src[2*x+1] + src[2*x+sstride] + src[2*x+1+sstride]; | |
90 old = buf[x]; | |
91 buf[x] = v; | |
92 dc[x] = v - old; | |
93 } | |
94 } | |
95 | |
30976
6955998c187e
Change ifdefs to make more sense: HAVE_SSSE3 should only be around SSSE3-code,
reimar
parents:
30920
diff
changeset
|
96 #if HAVE_MMX2 |
29371 | 97 static void filter_line_mmx2(uint8_t *dst, uint8_t *src, uint16_t *dc, |
98 int width, int thresh, const uint16_t *dithers) | |
99 { | |
100 intptr_t x; | |
101 if (width&3) { | |
102 x = width&~3; | |
103 filter_line_c(dst+x, src+x, dc+x/2, width-x, thresh, dithers); | |
104 width = x; | |
105 } | |
106 x = -width; | |
30920 | 107 __asm__ volatile( |
29371 | 108 "movd %4, %%mm5 \n" |
109 "pxor %%mm7, %%mm7 \n" | |
110 "pshufw $0, %%mm5, %%mm5 \n" | |
111 "movq %6, %%mm6 \n" | |
112 "movq %5, %%mm4 \n" | |
113 "1: \n" | |
114 "movd (%2,%0), %%mm0 \n" | |
115 "movd (%3,%0), %%mm1 \n" | |
116 "punpcklbw %%mm7, %%mm0 \n" | |
117 "punpcklwd %%mm1, %%mm1 \n" | |
118 "psllw $7, %%mm0 \n" | |
119 "pxor %%mm2, %%mm2 \n" | |
120 "psubw %%mm0, %%mm1 \n" // delta = dc - pix | |
121 "psubw %%mm1, %%mm2 \n" | |
122 "pmaxsw %%mm1, %%mm2 \n" | |
123 "pmulhuw %%mm5, %%mm2 \n" // m = abs(delta) * thresh >> 16 | |
124 "psubw %%mm6, %%mm2 \n" | |
125 "pminsw %%mm7, %%mm2 \n" // m = -max(0, 127-m) | |
126 "pmullw %%mm2, %%mm2 \n" | |
127 "paddw %%mm4, %%mm0 \n" // pix += dither | |
128 "pmulhw %%mm2, %%mm1 \n" | |
129 "psllw $2, %%mm1 \n" // m = m*m*delta >> 14 | |
130 "paddw %%mm1, %%mm0 \n" // pix += m | |
131 "psraw $7, %%mm0 \n" | |
132 "packuswb %%mm0, %%mm0 \n" | |
133 "movd %%mm0, (%1,%0) \n" // dst = clip(pix>>7) | |
134 "add $4, %0 \n" | |
135 "jl 1b \n" | |
136 "emms \n" | |
137 :"+r"(x) | |
138 :"r"(dst+width), "r"(src+width), "r"(dc+width/2), | |
139 "rm"(thresh), "m"(*dithers), "m"(*pw_7f) | |
140 :"memory" | |
141 ); | |
142 } | |
30976
6955998c187e
Change ifdefs to make more sense: HAVE_SSSE3 should only be around SSSE3-code,
reimar
parents:
30920
diff
changeset
|
143 #endif |
29371 | 144 |
30976
6955998c187e
Change ifdefs to make more sense: HAVE_SSSE3 should only be around SSSE3-code,
reimar
parents:
30920
diff
changeset
|
145 #if HAVE_SSSE3 |
29371 | 146 static void filter_line_ssse3(uint8_t *dst, uint8_t *src, uint16_t *dc, |
147 int width, int thresh, const uint16_t *dithers) | |
148 { | |
149 intptr_t x; | |
150 if (width&7) { | |
151 // could be 10% faster if I somehow eliminated this | |
152 x = width&~7; | |
153 filter_line_c(dst+x, src+x, dc+x/2, width-x, thresh, dithers); | |
154 width = x; | |
155 } | |
156 x = -width; | |
30920 | 157 __asm__ volatile( |
29371 | 158 "movd %4, %%xmm5 \n" |
159 "pxor %%xmm7, %%xmm7 \n" | |
160 "pshuflw $0,%%xmm5, %%xmm5 \n" | |
161 "movdqa %6, %%xmm6 \n" | |
162 "punpcklqdq %%xmm5, %%xmm5 \n" | |
163 "movdqa %5, %%xmm4 \n" | |
164 "1: \n" | |
165 "movq (%2,%0), %%xmm0 \n" | |
166 "movq (%3,%0), %%xmm1 \n" | |
167 "punpcklbw %%xmm7, %%xmm0 \n" | |
168 "punpcklwd %%xmm1, %%xmm1 \n" | |
169 "psllw $7, %%xmm0 \n" | |
170 "psubw %%xmm0, %%xmm1 \n" // delta = dc - pix | |
171 "pabsw %%xmm1, %%xmm2 \n" | |
172 "pmulhuw %%xmm5, %%xmm2 \n" // m = abs(delta) * thresh >> 16 | |
173 "psubw %%xmm6, %%xmm2 \n" | |
174 "pminsw %%xmm7, %%xmm2 \n" // m = -max(0, 127-m) | |
175 "pmullw %%xmm2, %%xmm2 \n" | |
176 "psllw $1, %%xmm2 \n" | |
177 "paddw %%xmm4, %%xmm0 \n" // pix += dither | |
178 "pmulhrsw %%xmm2, %%xmm1 \n" // m = m*m*delta >> 14 | |
179 "paddw %%xmm1, %%xmm0 \n" // pix += m | |
180 "psraw $7, %%xmm0 \n" | |
181 "packuswb %%xmm0, %%xmm0 \n" | |
182 "movq %%xmm0, (%1,%0) \n" // dst = clip(pix>>7) | |
183 "add $8, %0 \n" | |
184 "jl 1b \n" | |
185 :"+&r"(x) | |
186 :"r"(dst+width), "r"(src+width), "r"(dc+width/2), | |
187 "rm"(thresh), "m"(*dithers), "m"(*pw_7f) | |
188 :"memory" | |
189 ); | |
190 } | |
30976
6955998c187e
Change ifdefs to make more sense: HAVE_SSSE3 should only be around SSSE3-code,
reimar
parents:
30920
diff
changeset
|
191 #endif // HAVE_SSSE3 |
29371 | 192 |
30983
8b6727d2d479
cosmetics: Reorder some x86-related preprocessor conditionals.
diego
parents:
30976
diff
changeset
|
193 #if HAVE_SSE2 && HAVE_6REGS |
29371 | 194 #define BLURV(load)\ |
195 intptr_t x = -2*width;\ | |
30920 | 196 __asm__ volatile(\ |
29371 | 197 "movdqa %6, %%xmm7 \n"\ |
198 "1: \n"\ | |
199 load" (%4,%0), %%xmm0 \n"\ | |
200 load" (%5,%0), %%xmm1 \n"\ | |
201 "movdqa %%xmm0, %%xmm2 \n"\ | |
202 "movdqa %%xmm1, %%xmm3 \n"\ | |
203 "psrlw $8, %%xmm0 \n"\ | |
204 "psrlw $8, %%xmm1 \n"\ | |
205 "pand %%xmm7, %%xmm2 \n"\ | |
206 "pand %%xmm7, %%xmm3 \n"\ | |
207 "paddw %%xmm1, %%xmm0 \n"\ | |
208 "paddw %%xmm3, %%xmm2 \n"\ | |
209 "paddw %%xmm2, %%xmm0 \n"\ | |
210 "paddw (%2,%0), %%xmm0 \n"\ | |
211 "movdqa (%1,%0), %%xmm1 \n"\ | |
212 "movdqa %%xmm0, (%1,%0) \n"\ | |
213 "psubw %%xmm1, %%xmm0 \n"\ | |
214 "movdqa %%xmm0, (%3,%0) \n"\ | |
215 "add $16, %0 \n"\ | |
216 "jl 1b \n"\ | |
217 :"+&r"(x)\ | |
218 :"r"(buf+width),\ | |
219 "r"(buf1+width),\ | |
220 "r"(dc+width),\ | |
221 "r"(src+width*2),\ | |
222 "r"(src+width*2+sstride),\ | |
223 "m"(*pw_ff)\ | |
224 :"memory"\ | |
225 ); | |
226 | |
227 static void blur_line_sse2(uint16_t *dc, uint16_t *buf, uint16_t *buf1, | |
228 uint8_t *src, int sstride, int width) | |
229 { | |
230 if (((intptr_t)src|sstride)&15) { | |
231 BLURV("movdqu"); | |
232 } else { | |
233 BLURV("movdqa"); | |
234 } | |
235 } | |
30976
6955998c187e
Change ifdefs to make more sense: HAVE_SSSE3 should only be around SSSE3-code,
reimar
parents:
30920
diff
changeset
|
236 #endif // HAVE_6REGS && HAVE_SSE2 |
29371 | 237 |
238 static void filter(struct vf_priv_s *ctx, uint8_t *dst, uint8_t *src, | |
239 int width, int height, int dstride, int sstride, int r) | |
240 { | |
241 int bstride = ((width+15)&~15)/2; | |
242 int y; | |
243 uint32_t dc_factor = (1<<21)/(r*r); | |
244 uint16_t *dc = ctx->buf+16; | |
245 uint16_t *buf = ctx->buf+bstride+32; | |
246 int thresh = ctx->thresh; | |
247 | |
248 memset(dc, 0, (bstride+16)*sizeof(*buf)); | |
249 for (y=0; y<r; y++) | |
250 ctx->blur_line(dc, buf+y*bstride, buf+(y-1)*bstride, src+2*y*sstride, sstride, width/2); | |
251 for (;;) { | |
252 if (y < height-r) { | |
253 int mod = ((y+r)/2)%r; | |
254 uint16_t *buf0 = buf+mod*bstride; | |
255 uint16_t *buf1 = buf+(mod?mod-1:r-1)*bstride; | |
256 int x, v; | |
257 ctx->blur_line(dc, buf0, buf1, src+(y+r)*sstride, sstride, width/2); | |
258 for (x=v=0; x<r; x++) | |
259 v += dc[x]; | |
260 for (; x<width/2; x++) { | |
261 v += dc[x] - dc[x-r]; | |
262 dc[x-r] = v * dc_factor >> 16; | |
263 } | |
264 for (; x<(width+r+1)/2; x++) | |
265 dc[x-r] = v * dc_factor >> 16; | |
266 for (x=-r/2; x<0; x++) | |
267 dc[x] = dc[0]; | |
268 } | |
269 if (y == r) { | |
270 for (y=0; y<r; y++) | |
271 ctx->filter_line(dst+y*dstride, src+y*sstride, dc-r/2, width, thresh, dither[y&7]); | |
272 } | |
273 ctx->filter_line(dst+y*dstride, src+y*sstride, dc-r/2, width, thresh, dither[y&7]); | |
274 if (++y >= height) break; | |
275 ctx->filter_line(dst+y*dstride, src+y*sstride, dc-r/2, width, thresh, dither[y&7]); | |
276 if (++y >= height) break; | |
277 } | |
278 } | |
279 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30638
diff
changeset
|
280 static void get_image(struct vf_instance *vf, mp_image_t *mpi) |
29371 | 281 { |
282 if (mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change | |
283 // ok, we can do pp in-place: | |
284 vf->dmpi = vf_get_image(vf->next, mpi->imgfmt, | |
285 mpi->type, mpi->flags, mpi->width, mpi->height); | |
286 mpi->planes[0] = vf->dmpi->planes[0]; | |
287 mpi->stride[0] = vf->dmpi->stride[0]; | |
288 mpi->width = vf->dmpi->width; | |
289 if (mpi->flags&MP_IMGFLAG_PLANAR){ | |
290 mpi->planes[1] = vf->dmpi->planes[1]; | |
291 mpi->planes[2] = vf->dmpi->planes[2]; | |
292 mpi->stride[1] = vf->dmpi->stride[1]; | |
293 mpi->stride[2] = vf->dmpi->stride[2]; | |
294 } | |
295 mpi->flags |= MP_IMGFLAG_DIRECT; | |
296 } | |
297 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30638
diff
changeset
|
298 static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) |
29371 | 299 { |
300 mp_image_t *dmpi = vf->dmpi; | |
301 int p; | |
302 | |
303 if (!(mpi->flags&MP_IMGFLAG_DIRECT)) { | |
304 // no DR, so get a new image. hope we'll get DR buffer: | |
305 dmpi = vf_get_image(vf->next,mpi->imgfmt, MP_IMGTYPE_TEMP, | |
306 MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE, | |
307 mpi->w, mpi->h); | |
308 } | |
309 vf_clone_mpi_attributes(dmpi, mpi); | |
310 | |
311 for (p=0; p<mpi->num_planes; p++) { | |
312 int w = mpi->w; | |
313 int h = mpi->h; | |
314 int r = vf->priv->radius; | |
315 if (p) { | |
316 w >>= mpi->chroma_x_shift; | |
317 h >>= mpi->chroma_y_shift; | |
318 r = ((r>>mpi->chroma_x_shift) + (r>>mpi->chroma_y_shift)) / 2; | |
319 r = av_clip((r+1)&~1,4,32); | |
320 } | |
321 if (FFMIN(w,h) > 2*r) | |
322 filter(vf->priv, dmpi->planes[p], mpi->planes[p], w, h, | |
323 dmpi->stride[p], mpi->stride[p], r); | |
324 else if (dmpi->planes[p] != mpi->planes[p]) | |
325 memcpy_pic(dmpi->planes[p], mpi->planes[p], w, h, | |
326 dmpi->stride[p], mpi->stride[p]); | |
327 } | |
328 | |
329 return vf_next_put_image(vf, dmpi, pts); | |
330 } | |
331 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30638
diff
changeset
|
332 static int query_format(struct vf_instance *vf, unsigned int fmt) |
29371 | 333 { |
334 switch (fmt){ | |
335 case IMGFMT_YVU9: | |
336 case IMGFMT_IF09: | |
337 case IMGFMT_YV12: | |
338 case IMGFMT_I420: | |
339 case IMGFMT_IYUV: | |
340 case IMGFMT_CLPL: | |
341 case IMGFMT_Y800: | |
342 case IMGFMT_Y8: | |
343 case IMGFMT_NV12: | |
344 case IMGFMT_NV21: | |
345 case IMGFMT_444P: | |
346 case IMGFMT_422P: | |
347 case IMGFMT_411P: | |
348 case IMGFMT_HM12: | |
349 return vf_next_query_format(vf,fmt); | |
350 } | |
351 return 0; | |
352 } | |
353 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30638
diff
changeset
|
354 static int config(struct vf_instance *vf, |
29371 | 355 int width, int height, int d_width, int d_height, |
356 unsigned int flags, unsigned int outfmt) | |
357 { | |
358 free(vf->priv->buf); | |
359 vf->priv->buf = av_mallocz((((width+15)&~15)*(vf->priv->radius+1)/2+32)*sizeof(uint16_t)); | |
360 return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); | |
361 } | |
362 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30638
diff
changeset
|
363 static void uninit(struct vf_instance *vf) |
29371 | 364 { |
365 if (!vf->priv) return; | |
366 av_free(vf->priv->buf); | |
367 free(vf->priv); | |
368 vf->priv = NULL; | |
369 } | |
370 | |
30638
a7b908875c14
Rename open() vf initialization function to vf_open().
diego
parents:
29371
diff
changeset
|
371 static int vf_open(vf_instance_t *vf, char *args) |
29371 | 372 { |
373 float thresh = 1.2; | |
374 int radius = 16; | |
375 | |
376 vf->get_image=get_image; | |
377 vf->put_image=put_image; | |
378 vf->query_format=query_format; | |
379 vf->config=config; | |
380 vf->uninit=uninit; | |
381 vf->priv=malloc(sizeof(struct vf_priv_s)); | |
382 memset(vf->priv, 0, sizeof(struct vf_priv_s)); | |
383 | |
384 if (args) sscanf(args, "%f:%d", &thresh, &radius); | |
385 vf->priv->thresh = (1<<15)/av_clipf(thresh,0.51,255); | |
386 vf->priv->radius = av_clip((radius+1)&~1,4,32); | |
387 | |
388 vf->priv->blur_line = blur_line_c; | |
389 vf->priv->filter_line = filter_line_c; | |
30983
8b6727d2d479
cosmetics: Reorder some x86-related preprocessor conditionals.
diego
parents:
30976
diff
changeset
|
390 #if HAVE_SSE2 && HAVE_6REGS |
29371 | 391 if (gCpuCaps.hasSSE2) |
392 vf->priv->blur_line = blur_line_sse2; | |
393 #endif | |
30976
6955998c187e
Change ifdefs to make more sense: HAVE_SSSE3 should only be around SSSE3-code,
reimar
parents:
30920
diff
changeset
|
394 #if HAVE_MMX2 |
29371 | 395 if (gCpuCaps.hasMMX2) |
396 vf->priv->filter_line = filter_line_mmx2; | |
30976
6955998c187e
Change ifdefs to make more sense: HAVE_SSSE3 should only be around SSSE3-code,
reimar
parents:
30920
diff
changeset
|
397 #endif |
6955998c187e
Change ifdefs to make more sense: HAVE_SSSE3 should only be around SSSE3-code,
reimar
parents:
30920
diff
changeset
|
398 #if HAVE_SSSE3 |
29371 | 399 if (gCpuCaps.hasSSSE3) |
400 vf->priv->filter_line = filter_line_ssse3; | |
401 #endif | |
402 | |
403 return 1; | |
404 } | |
405 | |
406 const vf_info_t vf_info_gradfun = { | |
407 "gradient deband", | |
408 "gradfun", | |
409 "Loren Merritt", | |
410 "", | |
30638
a7b908875c14
Rename open() vf initialization function to vf_open().
diego
parents:
29371
diff
changeset
|
411 vf_open, |
29371 | 412 NULL |
413 }; |