Mercurial > mplayer.hg
annotate libmpcodecs/vf_spp.c @ 29263:0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
author | diego |
---|---|
date | Wed, 13 May 2009 02:58:57 +0000 |
parents | 290420c32921 |
children | 915be5c7a30c |
rev | line source |
---|---|
11277 | 1 /* |
26727 | 2 * Copyright (C) 2003 Michael Niedermayer <michaelni@gmx.at> |
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 */ | |
11277 | 20 |
21 /* | |
22 * This implementation is based on an algorithm described in | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
23 * "Aria Nosratinia Embedded Post-Processing for |
11277 | 24 * Enhancement of Compressed Images (1999)" |
25 * (http://citeseer.nj.nec.com/nosratinia99embedded.html) | |
26 */ | |
27 | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
28 |
11277 | 29 #include <stdio.h> |
30 #include <stdlib.h> | |
31 #include <string.h> | |
32 #include <inttypes.h> | |
33 #include <math.h> | |
34 | |
17012 | 35 #include "config.h" |
11335 | 36 |
17012 | 37 #include "mp_msg.h" |
38 #include "cpudetect.h" | |
11568
cf76671b3d77
Fix compilation if lavc is compiled as a shared lib. Patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
alex
parents:
11477
diff
changeset
|
39 |
28329
ed42e982e79f
Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
diego
parents:
28290
diff
changeset
|
40 #include "libavutil/internal.h" |
24977 | 41 #include "libavutil/intreadwrite.h" |
17012 | 42 #include "libavcodec/avcodec.h" |
43 #include "libavcodec/dsputil.h" | |
11277 | 44 |
28329
ed42e982e79f
Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
diego
parents:
28290
diff
changeset
|
45 #undef fprintf |
ed42e982e79f
Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
diego
parents:
28290
diff
changeset
|
46 #undef free |
ed42e982e79f
Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
diego
parents:
28290
diff
changeset
|
47 #undef malloc |
ed42e982e79f
Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
diego
parents:
28290
diff
changeset
|
48 |
11277 | 49 #include "img_format.h" |
50 #include "mp_image.h" | |
51 #include "vf.h" | |
17012 | 52 #include "libvo/fastmemcpy.h" |
11277 | 53 |
54 #define XMIN(a,b) ((a) < (b) ? (a) : (b)) | |
55 | |
56 //===========================================================================// | |
11477
9785bff83777
memcpy pix instead of black screen if no DR and codec provides no qscale table
michael
parents:
11335
diff
changeset
|
57 static const uint8_t __attribute__((aligned(8))) dither[8][8]={ |
11277 | 58 { 0, 48, 12, 60, 3, 51, 15, 63, }, |
59 { 32, 16, 44, 28, 35, 19, 47, 31, }, | |
60 { 8, 56, 4, 52, 11, 59, 7, 55, }, | |
61 { 40, 24, 36, 20, 43, 27, 39, 23, }, | |
62 { 2, 50, 14, 62, 1, 49, 13, 61, }, | |
63 { 34, 18, 46, 30, 33, 17, 45, 29, }, | |
64 { 10, 58, 6, 54, 9, 57, 5, 53, }, | |
65 { 42, 26, 38, 22, 41, 25, 37, 21, }, | |
66 }; | |
67 | |
11477
9785bff83777
memcpy pix instead of black screen if no DR and codec provides no qscale table
michael
parents:
11335
diff
changeset
|
68 static const uint8_t offset[127][2]= { |
11298 | 69 {0,0}, |
70 {0,0}, {4,4}, | |
71 {0,0}, {2,2}, {6,4}, {4,6}, | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
72 {0,0}, {5,1}, {2,2}, {7,3}, {4,4}, {1,5}, {6,6}, {3,7}, |
11298 | 73 |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
74 {0,0}, {4,0}, {1,1}, {5,1}, {3,2}, {7,2}, {2,3}, {6,3}, |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
75 {0,4}, {4,4}, {1,5}, {5,5}, {3,6}, {7,6}, {2,7}, {6,7}, |
11298 | 76 |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
77 {0,0}, {0,2}, {0,4}, {0,6}, {1,1}, {1,3}, {1,5}, {1,7}, |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
78 {2,0}, {2,2}, {2,4}, {2,6}, {3,1}, {3,3}, {3,5}, {3,7}, |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
79 {4,0}, {4,2}, {4,4}, {4,6}, {5,1}, {5,3}, {5,5}, {5,7}, |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
80 {6,0}, {6,2}, {6,4}, {6,6}, {7,1}, {7,3}, {7,5}, {7,7}, |
11298 | 81 |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
82 {0,0}, {4,4}, {0,4}, {4,0}, {2,2}, {6,6}, {2,6}, {6,2}, |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
83 {0,2}, {4,6}, {0,6}, {4,2}, {2,0}, {6,4}, {2,4}, {6,0}, |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
84 {1,1}, {5,5}, {1,5}, {5,1}, {3,3}, {7,7}, {3,7}, {7,3}, |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
85 {1,3}, {5,7}, {1,7}, {5,3}, {3,1}, {7,5}, {3,5}, {7,1}, |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
86 {0,1}, {4,5}, {0,5}, {4,1}, {2,3}, {6,7}, {2,7}, {6,3}, |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
87 {0,3}, {4,7}, {0,7}, {4,3}, {2,1}, {6,5}, {2,5}, {6,1}, |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
88 {1,0}, {5,4}, {1,4}, {5,0}, {3,2}, {7,6}, {3,6}, {7,2}, |
11277 | 89 {1,2}, {5,6}, {1,6}, {5,2}, {3,0}, {7,4}, {3,4}, {7,0}, |
90 }; | |
91 | |
92 struct vf_priv_s { | |
93 int log2_count; | |
94 int qp; | |
11993
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
95 int mode; |
11277 | 96 int mpeg2; |
97 int temp_stride; | |
98 uint8_t *src; | |
99 int16_t *temp; | |
100 AVCodecContext *avctx; | |
101 DSPContext dsp; | |
17110
ba9bf9beb23f
prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents:
17082
diff
changeset
|
102 char *non_b_qp; |
11277 | 103 }; |
104 | |
105 #define SHIFT 22 | |
106 | |
11993
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
107 static void hardthresh_c(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){ |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
108 int i; |
11277 | 109 int bias= 0; //FIXME |
110 unsigned int threshold1, threshold2; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
111 |
11301 | 112 threshold1= qp*((1<<4) - bias) - 1; |
11277 | 113 threshold2= (threshold1<<1); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
114 |
11277 | 115 memset(dst, 0, 64*sizeof(DCTELEM)); |
11296 | 116 dst[0]= (src[0] + 4)>>3; |
11277 | 117 |
11296 | 118 for(i=1; i<64; i++){ |
119 int level= src[i]; | |
11277 | 120 if(((unsigned)(level+threshold1))>threshold2){ |
121 const int j= permutation[i]; | |
11296 | 122 dst[j]= (level + 4)>>3; |
11277 | 123 } |
124 } | |
125 } | |
126 | |
11993
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
127 static void softthresh_c(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){ |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
128 int i; |
11993
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
129 int bias= 0; //FIXME |
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
130 unsigned int threshold1, threshold2; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
131 |
11993
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
132 threshold1= qp*((1<<4) - bias) - 1; |
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
133 threshold2= (threshold1<<1); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
134 |
11993
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
135 memset(dst, 0, 64*sizeof(DCTELEM)); |
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
136 dst[0]= (src[0] + 4)>>3; |
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
137 |
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
138 for(i=1; i<64; i++){ |
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
139 int level= src[i]; |
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
140 if(((unsigned)(level+threshold1))>threshold2){ |
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
141 const int j= permutation[i]; |
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
142 if(level>0) |
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
143 dst[j]= (level - threshold1 + 4)>>3; |
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
144 else |
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
145 dst[j]= (level + threshold1 + 4)>>3; |
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
146 } |
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
147 } |
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
148 } |
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
149 |
28290 | 150 #if HAVE_MMX |
11993
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
151 static void hardthresh_mmx(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){ |
11301 | 152 int bias= 0; //FIXME |
153 unsigned int threshold1; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
154 |
11301 | 155 threshold1= qp*((1<<4) - bias) - 1; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
156 |
27754
08d18fe9da52
Change all occurrences of asm and __asm to __asm__, same as was done for FFmpeg.
diego
parents:
26727
diff
changeset
|
157 __asm__ volatile( |
11301 | 158 #define REQUANT_CORE(dst0, dst1, dst2, dst3, src0, src1, src2, src3) \ |
159 "movq " #src0 ", %%mm0 \n\t"\ | |
160 "movq " #src1 ", %%mm1 \n\t"\ | |
161 "movq " #src2 ", %%mm2 \n\t"\ | |
162 "movq " #src3 ", %%mm3 \n\t"\ | |
163 "psubw %%mm4, %%mm0 \n\t"\ | |
164 "psubw %%mm4, %%mm1 \n\t"\ | |
165 "psubw %%mm4, %%mm2 \n\t"\ | |
166 "psubw %%mm4, %%mm3 \n\t"\ | |
167 "paddusw %%mm5, %%mm0 \n\t"\ | |
168 "paddusw %%mm5, %%mm1 \n\t"\ | |
169 "paddusw %%mm5, %%mm2 \n\t"\ | |
170 "paddusw %%mm5, %%mm3 \n\t"\ | |
171 "paddw %%mm6, %%mm0 \n\t"\ | |
172 "paddw %%mm6, %%mm1 \n\t"\ | |
173 "paddw %%mm6, %%mm2 \n\t"\ | |
174 "paddw %%mm6, %%mm3 \n\t"\ | |
175 "psubusw %%mm6, %%mm0 \n\t"\ | |
176 "psubusw %%mm6, %%mm1 \n\t"\ | |
177 "psubusw %%mm6, %%mm2 \n\t"\ | |
178 "psubusw %%mm6, %%mm3 \n\t"\ | |
179 "psraw $3, %%mm0 \n\t"\ | |
180 "psraw $3, %%mm1 \n\t"\ | |
181 "psraw $3, %%mm2 \n\t"\ | |
182 "psraw $3, %%mm3 \n\t"\ | |
183 \ | |
184 "movq %%mm0, %%mm7 \n\t"\ | |
185 "punpcklwd %%mm2, %%mm0 \n\t" /*A*/\ | |
186 "punpckhwd %%mm2, %%mm7 \n\t" /*C*/\ | |
187 "movq %%mm1, %%mm2 \n\t"\ | |
188 "punpcklwd %%mm3, %%mm1 \n\t" /*B*/\ | |
189 "punpckhwd %%mm3, %%mm2 \n\t" /*D*/\ | |
190 "movq %%mm0, %%mm3 \n\t"\ | |
191 "punpcklwd %%mm1, %%mm0 \n\t" /*A*/\ | |
192 "punpckhwd %%mm7, %%mm3 \n\t" /*C*/\ | |
13393 | 193 "punpcklwd %%mm2, %%mm7 \n\t" /*B*/\ |
11301 | 194 "punpckhwd %%mm2, %%mm1 \n\t" /*D*/\ |
195 \ | |
196 "movq %%mm0, " #dst0 " \n\t"\ | |
197 "movq %%mm7, " #dst1 " \n\t"\ | |
198 "movq %%mm3, " #dst2 " \n\t"\ | |
199 "movq %%mm1, " #dst3 " \n\t" | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
200 |
11301 | 201 "movd %2, %%mm4 \n\t" |
202 "movd %3, %%mm5 \n\t" | |
203 "movd %4, %%mm6 \n\t" | |
204 "packssdw %%mm4, %%mm4 \n\t" | |
205 "packssdw %%mm5, %%mm5 \n\t" | |
206 "packssdw %%mm6, %%mm6 \n\t" | |
207 "packssdw %%mm4, %%mm4 \n\t" | |
208 "packssdw %%mm5, %%mm5 \n\t" | |
209 "packssdw %%mm6, %%mm6 \n\t" | |
210 REQUANT_CORE( (%1), 8(%1), 16(%1), 24(%1), (%0), 8(%0), 64(%0), 72(%0)) | |
211 REQUANT_CORE(32(%1), 40(%1), 48(%1), 56(%1),16(%0),24(%0), 48(%0), 56(%0)) | |
212 REQUANT_CORE(64(%1), 72(%1), 80(%1), 88(%1),32(%0),40(%0), 96(%0),104(%0)) | |
213 REQUANT_CORE(96(%1),104(%1),112(%1),120(%1),80(%0),88(%0),112(%0),120(%0)) | |
214 : : "r" (src), "r" (dst), "g" (threshold1+1), "g" (threshold1+5), "g" (threshold1-4) //FIXME maybe more accurate then needed? | |
215 ); | |
216 dst[0]= (src[0] + 4)>>3; | |
217 } | |
11994 | 218 |
219 static void softthresh_mmx(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){ | |
220 int bias= 0; //FIXME | |
221 unsigned int threshold1; | |
222 | |
223 threshold1= qp*((1<<4) - bias) - 1; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
224 |
27754
08d18fe9da52
Change all occurrences of asm and __asm to __asm__, same as was done for FFmpeg.
diego
parents:
26727
diff
changeset
|
225 __asm__ volatile( |
11994 | 226 #undef REQUANT_CORE |
227 #define REQUANT_CORE(dst0, dst1, dst2, dst3, src0, src1, src2, src3) \ | |
228 "movq " #src0 ", %%mm0 \n\t"\ | |
229 "movq " #src1 ", %%mm1 \n\t"\ | |
230 "pxor %%mm6, %%mm6 \n\t"\ | |
231 "pxor %%mm7, %%mm7 \n\t"\ | |
232 "pcmpgtw %%mm0, %%mm6 \n\t"\ | |
233 "pcmpgtw %%mm1, %%mm7 \n\t"\ | |
234 "pxor %%mm6, %%mm0 \n\t"\ | |
235 "pxor %%mm7, %%mm1 \n\t"\ | |
236 "psubusw %%mm4, %%mm0 \n\t"\ | |
237 "psubusw %%mm4, %%mm1 \n\t"\ | |
238 "pxor %%mm6, %%mm0 \n\t"\ | |
239 "pxor %%mm7, %%mm1 \n\t"\ | |
240 "movq " #src2 ", %%mm2 \n\t"\ | |
241 "movq " #src3 ", %%mm3 \n\t"\ | |
242 "pxor %%mm6, %%mm6 \n\t"\ | |
243 "pxor %%mm7, %%mm7 \n\t"\ | |
244 "pcmpgtw %%mm2, %%mm6 \n\t"\ | |
245 "pcmpgtw %%mm3, %%mm7 \n\t"\ | |
246 "pxor %%mm6, %%mm2 \n\t"\ | |
247 "pxor %%mm7, %%mm3 \n\t"\ | |
248 "psubusw %%mm4, %%mm2 \n\t"\ | |
249 "psubusw %%mm4, %%mm3 \n\t"\ | |
250 "pxor %%mm6, %%mm2 \n\t"\ | |
251 "pxor %%mm7, %%mm3 \n\t"\ | |
252 \ | |
253 "paddsw %%mm5, %%mm0 \n\t"\ | |
254 "paddsw %%mm5, %%mm1 \n\t"\ | |
255 "paddsw %%mm5, %%mm2 \n\t"\ | |
256 "paddsw %%mm5, %%mm3 \n\t"\ | |
257 "psraw $3, %%mm0 \n\t"\ | |
258 "psraw $3, %%mm1 \n\t"\ | |
259 "psraw $3, %%mm2 \n\t"\ | |
260 "psraw $3, %%mm3 \n\t"\ | |
261 \ | |
262 "movq %%mm0, %%mm7 \n\t"\ | |
263 "punpcklwd %%mm2, %%mm0 \n\t" /*A*/\ | |
264 "punpckhwd %%mm2, %%mm7 \n\t" /*C*/\ | |
265 "movq %%mm1, %%mm2 \n\t"\ | |
266 "punpcklwd %%mm3, %%mm1 \n\t" /*B*/\ | |
267 "punpckhwd %%mm3, %%mm2 \n\t" /*D*/\ | |
268 "movq %%mm0, %%mm3 \n\t"\ | |
269 "punpcklwd %%mm1, %%mm0 \n\t" /*A*/\ | |
270 "punpckhwd %%mm7, %%mm3 \n\t" /*C*/\ | |
13393 | 271 "punpcklwd %%mm2, %%mm7 \n\t" /*B*/\ |
11994 | 272 "punpckhwd %%mm2, %%mm1 \n\t" /*D*/\ |
273 \ | |
274 "movq %%mm0, " #dst0 " \n\t"\ | |
275 "movq %%mm7, " #dst1 " \n\t"\ | |
276 "movq %%mm3, " #dst2 " \n\t"\ | |
277 "movq %%mm1, " #dst3 " \n\t" | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
278 |
11994 | 279 "movd %2, %%mm4 \n\t" |
280 "movd %3, %%mm5 \n\t" | |
281 "packssdw %%mm4, %%mm4 \n\t" | |
282 "packssdw %%mm5, %%mm5 \n\t" | |
283 "packssdw %%mm4, %%mm4 \n\t" | |
284 "packssdw %%mm5, %%mm5 \n\t" | |
285 REQUANT_CORE( (%1), 8(%1), 16(%1), 24(%1), (%0), 8(%0), 64(%0), 72(%0)) | |
286 REQUANT_CORE(32(%1), 40(%1), 48(%1), 56(%1),16(%0),24(%0), 48(%0), 56(%0)) | |
287 REQUANT_CORE(64(%1), 72(%1), 80(%1), 88(%1),32(%0),40(%0), 96(%0),104(%0)) | |
288 REQUANT_CORE(96(%1),104(%1),112(%1),120(%1),80(%0),88(%0),112(%0),120(%0)) | |
289 : : "r" (src), "r" (dst), "g" (threshold1), "rm" (4) //FIXME maybe more accurate then needed? | |
290 ); | |
291 | |
292 dst[0]= (src[0] + 4)>>3; | |
293 } | |
11301 | 294 #endif |
295 | |
11277 | 296 static inline void add_block(int16_t *dst, int stride, DCTELEM block[64]){ |
11280 | 297 int y; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
298 |
11277 | 299 for(y=0; y<8; y++){ |
11280 | 300 *(uint32_t*)&dst[0 + y*stride]+= *(uint32_t*)&block[0 + y*8]; |
301 *(uint32_t*)&dst[2 + y*stride]+= *(uint32_t*)&block[2 + y*8]; | |
302 *(uint32_t*)&dst[4 + y*stride]+= *(uint32_t*)&block[4 + y*8]; | |
303 *(uint32_t*)&dst[6 + y*stride]+= *(uint32_t*)&block[6 + y*8]; | |
11277 | 304 } |
305 } | |
306 | |
11305 | 307 static void store_slice_c(uint8_t *dst, int16_t *src, int dst_stride, int src_stride, int width, int height, int log2_scale){ |
11299 | 308 int y, x; |
309 | |
310 #define STORE(pos) \ | |
311 temp= ((src[x + y*src_stride + pos]<<log2_scale) + d[pos])>>6;\ | |
312 if(temp & 0x100) temp= ~(temp>>31);\ | |
313 dst[x + y*dst_stride + pos]= temp; | |
314 | |
11305 | 315 for(y=0; y<height; y++){ |
12157 | 316 const uint8_t *d= dither[y]; |
11299 | 317 for(x=0; x<width; x+=8){ |
318 int temp; | |
319 STORE(0); | |
320 STORE(1); | |
321 STORE(2); | |
322 STORE(3); | |
323 STORE(4); | |
324 STORE(5); | |
325 STORE(6); | |
326 STORE(7); | |
327 } | |
328 } | |
329 } | |
330 | |
28290 | 331 #if HAVE_MMX |
11305 | 332 static void store_slice_mmx(uint8_t *dst, int16_t *src, int dst_stride, int src_stride, int width, int height, int log2_scale){ |
11299 | 333 int y; |
334 | |
11305 | 335 for(y=0; y<height; y++){ |
11299 | 336 uint8_t *dst1= dst; |
337 int16_t *src1= src; | |
27754
08d18fe9da52
Change all occurrences of asm and __asm to __asm__, same as was done for FFmpeg.
diego
parents:
26727
diff
changeset
|
338 __asm__ volatile( |
11299 | 339 "movq (%3), %%mm3 \n\t" |
340 "movq (%3), %%mm4 \n\t" | |
341 "movd %4, %%mm2 \n\t" | |
342 "pxor %%mm0, %%mm0 \n\t" | |
343 "punpcklbw %%mm0, %%mm3 \n\t" | |
344 "punpckhbw %%mm0, %%mm4 \n\t" | |
345 "psraw %%mm2, %%mm3 \n\t" | |
346 "psraw %%mm2, %%mm4 \n\t" | |
347 "movd %5, %%mm2 \n\t" | |
348 "1: \n\t" | |
349 "movq (%0), %%mm0 \n\t" | |
350 "movq 8(%0), %%mm1 \n\t" | |
351 "paddw %%mm3, %%mm0 \n\t" | |
352 "paddw %%mm4, %%mm1 \n\t" | |
353 "psraw %%mm2, %%mm0 \n\t" | |
354 "psraw %%mm2, %%mm1 \n\t" | |
355 "packuswb %%mm1, %%mm0 \n\t" | |
356 "movq %%mm0, (%1) \n\t" | |
13720
821f464b4d90
adapting existing mmx/mmx2/sse/3dnow optimizations so they work on x86_64
aurel
parents:
13393
diff
changeset
|
357 "add $16, %0 \n\t" |
821f464b4d90
adapting existing mmx/mmx2/sse/3dnow optimizations so they work on x86_64
aurel
parents:
13393
diff
changeset
|
358 "add $8, %1 \n\t" |
821f464b4d90
adapting existing mmx/mmx2/sse/3dnow optimizations so they work on x86_64
aurel
parents:
13393
diff
changeset
|
359 "cmp %2, %1 \n\t" |
11299 | 360 " jb 1b \n\t" |
361 : "+r" (src1), "+r"(dst1) | |
362 : "r"(dst + width), "r"(dither[y]), "g"(log2_scale), "g"(6-log2_scale) | |
363 ); | |
364 src += src_stride; | |
365 dst += dst_stride; | |
366 } | |
367 // if(width != mmxw) | |
368 // store_slice_c(dst + mmxw, src + mmxw, dst_stride, src_stride, width - mmxw, log2_scale); | |
369 } | |
370 #endif | |
371 | |
11305 | 372 static void (*store_slice)(uint8_t *dst, int16_t *src, int dst_stride, int src_stride, int width, int height, int log2_scale)= store_slice_c; |
11299 | 373 |
11993
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
374 static void (*requantize)(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation)= hardthresh_c; |
11301 | 375 |
11277 | 376 static void filter(struct vf_priv_s *p, uint8_t *dst, uint8_t *src, int dst_stride, int src_stride, int width, int height, uint8_t *qp_store, int qp_stride, int is_luma){ |
377 int x, y, i; | |
378 const int count= 1<<p->log2_count; | |
11307 | 379 const int stride= is_luma ? p->temp_stride : ((width+16+15)&(~15)); |
17082 | 380 uint64_t __attribute__((aligned(16))) block_align[32]; |
11277 | 381 DCTELEM *block = (DCTELEM *)block_align; |
382 DCTELEM *block2= (DCTELEM *)(block_align+16); | |
11301 | 383 |
13729 | 384 if (!src || !dst) return; // HACK avoid crash for Y8 colourspace |
11277 | 385 for(y=0; y<height; y++){ |
11299 | 386 int index= 8 + 8*stride + y*stride; |
23457
a124f3abc1ec
Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents:
20585
diff
changeset
|
387 fast_memcpy(p->src + index, src + y*src_stride, width); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
388 for(x=0; x<8; x++){ |
11277 | 389 p->src[index - x - 1]= p->src[index + x ]; |
390 p->src[index + width + x ]= p->src[index + width - x - 1]; | |
391 } | |
392 } | |
393 for(y=0; y<8; y++){ | |
23457
a124f3abc1ec
Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents:
20585
diff
changeset
|
394 fast_memcpy(p->src + ( 7-y)*stride, p->src + ( y+8)*stride, stride); |
a124f3abc1ec
Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents:
20585
diff
changeset
|
395 fast_memcpy(p->src + (height+8+y)*stride, p->src + (height-y+7)*stride, stride); |
11277 | 396 } |
397 //FIXME (try edge emu) | |
398 | |
399 for(y=0; y<height+8; y+=8){ | |
11299 | 400 memset(p->temp + (8+y)*stride, 0, 8*stride*sizeof(int16_t)); |
11277 | 401 for(x=0; x<width+8; x+=8){ |
402 const int qps= 3 + is_luma; | |
403 int qp; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
404 |
11277 | 405 if(p->qp) |
406 qp= p->qp; | |
407 else{ | |
408 qp= qp_store[ (XMIN(x, width-1)>>qps) + (XMIN(y, height-1)>>qps) * qp_stride]; | |
24552
c9c2e550a449
MPEG-2 blocks at qp 1 get overfiltered by spp, apparently because "qp>>1" turns
diego
parents:
23457
diff
changeset
|
409 if(p->mpeg2) qp = FFMAX(1, qp>>1); |
11277 | 410 } |
411 for(i=0; i<count; i++){ | |
11298 | 412 const int x1= x + offset[i+count-1][0]; |
413 const int y1= y + offset[i+count-1][1]; | |
11277 | 414 const int index= x1 + y1*stride; |
415 p->dsp.get_pixels(block, p->src + index, stride); | |
416 p->dsp.fdct(block); | |
417 requantize(block2, block, qp, p->dsp.idct_permutation); | |
418 p->dsp.idct(block2); | |
419 add_block(p->temp + index, stride, block2); | |
420 } | |
421 } | |
11299 | 422 if(y) |
11305 | 423 store_slice(dst + (y-8)*dst_stride, p->temp + 8 + y*stride, dst_stride, stride, width, XMIN(8, height+8-y), 6-p->log2_count); |
11277 | 424 } |
11295 | 425 #if 0 |
426 for(y=0; y<height; y++){ | |
427 for(x=0; x<width; x++){ | |
428 if((((x>>6) ^ (y>>6)) & 1) == 0) | |
429 dst[x + y*dst_stride]= p->src[8 + 8*stride + x + y*stride]; | |
430 if((x&63) == 0 || (y&63)==0) | |
431 dst[x + y*dst_stride] += 128; | |
432 } | |
433 } | |
434 #endif | |
11277 | 435 //FIXME reorder for better caching |
436 } | |
437 | |
438 static int config(struct vf_instance_s* vf, | |
439 int width, int height, int d_width, int d_height, | |
440 unsigned int flags, unsigned int outfmt){ | |
11305 | 441 int h= (height+16+15)&(~15); |
11277 | 442 |
443 vf->priv->temp_stride= (width+16+15)&(~15); | |
11305 | 444 vf->priv->temp= malloc(vf->priv->temp_stride*h*sizeof(int16_t)); |
445 vf->priv->src = malloc(vf->priv->temp_stride*h*sizeof(uint8_t)); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
446 |
11277 | 447 return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); |
448 } | |
449 | |
450 static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ | |
451 if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change | |
452 // ok, we can do pp in-place (or pp disabled): | |
453 vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, | |
16018
bdf1b4ecb906
use stored dimensions instead of visible one when (vf_)get_image is called
iive
parents:
15965
diff
changeset
|
454 mpi->type, mpi->flags | MP_IMGFLAG_READABLE, mpi->width, mpi->height); |
11277 | 455 mpi->planes[0]=vf->dmpi->planes[0]; |
456 mpi->stride[0]=vf->dmpi->stride[0]; | |
457 mpi->width=vf->dmpi->width; | |
458 if(mpi->flags&MP_IMGFLAG_PLANAR){ | |
459 mpi->planes[1]=vf->dmpi->planes[1]; | |
460 mpi->planes[2]=vf->dmpi->planes[2]; | |
461 mpi->stride[1]=vf->dmpi->stride[1]; | |
462 mpi->stride[2]=vf->dmpi->stride[2]; | |
463 } | |
464 mpi->flags|=MP_IMGFLAG_DIRECT; | |
465 } | |
466 | |
17906
20aca9baf5d8
passing pts through the filter layer (lets see if pts or cola comes out at the end)
michael
parents:
17523
diff
changeset
|
467 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ |
11277 | 468 mp_image_t *dmpi; |
469 | |
470 if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ | |
471 // no DR, so get a new image! hope we'll get DR buffer: | |
14022
803be9a78854
removing strange csp matching code (was copy&pasted from vf_pp where it originated from arpi 2.5 years ago) -> fixes spp+scale+x11 crash
michael
parents:
13729
diff
changeset
|
472 dmpi=vf_get_image(vf->next,mpi->imgfmt, |
12631
6cbccc0c7d7b
Fix memory corruption, noticable at reallocate image
iive
parents:
12163
diff
changeset
|
473 MP_IMGTYPE_TEMP, |
6cbccc0c7d7b
Fix memory corruption, noticable at reallocate image
iive
parents:
12163
diff
changeset
|
474 MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE, |
16018
bdf1b4ecb906
use stored dimensions instead of visible one when (vf_)get_image is called
iive
parents:
15965
diff
changeset
|
475 mpi->width,mpi->height); |
12631
6cbccc0c7d7b
Fix memory corruption, noticable at reallocate image
iive
parents:
12163
diff
changeset
|
476 vf_clone_mpi_attributes(dmpi, mpi); |
6cbccc0c7d7b
Fix memory corruption, noticable at reallocate image
iive
parents:
12163
diff
changeset
|
477 }else{ |
13149 | 478 dmpi=vf->dmpi; |
12631
6cbccc0c7d7b
Fix memory corruption, noticable at reallocate image
iive
parents:
12163
diff
changeset
|
479 } |
11277 | 480 |
481 vf->priv->mpeg2= mpi->qscale_type; | |
17110
ba9bf9beb23f
prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents:
17082
diff
changeset
|
482 if(mpi->pict_type != 3 && mpi->qscale && !vf->priv->qp){ |
ba9bf9beb23f
prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents:
17082
diff
changeset
|
483 if(!vf->priv->non_b_qp) |
20585 | 484 vf->priv->non_b_qp= malloc(mpi->qstride * ((mpi->h + 15) >> 4)); |
23457
a124f3abc1ec
Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents:
20585
diff
changeset
|
485 fast_memcpy(vf->priv->non_b_qp, mpi->qscale, mpi->qstride * ((mpi->h + 15) >> 4)); |
17110
ba9bf9beb23f
prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents:
17082
diff
changeset
|
486 } |
11307 | 487 if(vf->priv->log2_count || !(mpi->flags&MP_IMGFLAG_DIRECT)){ |
17110
ba9bf9beb23f
prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents:
17082
diff
changeset
|
488 char *qp_tab= vf->priv->non_b_qp; |
ba9bf9beb23f
prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents:
17082
diff
changeset
|
489 if((vf->priv->mode&4) || !qp_tab) |
ba9bf9beb23f
prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents:
17082
diff
changeset
|
490 qp_tab= mpi->qscale; |
ba9bf9beb23f
prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents:
17082
diff
changeset
|
491 |
ba9bf9beb23f
prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents:
17082
diff
changeset
|
492 if(qp_tab || vf->priv->qp){ |
ba9bf9beb23f
prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents:
17082
diff
changeset
|
493 filter(vf->priv, dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w, mpi->h, qp_tab, mpi->qstride, 1); |
ba9bf9beb23f
prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents:
17082
diff
changeset
|
494 filter(vf->priv, dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, qp_tab, mpi->qstride, 0); |
ba9bf9beb23f
prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents:
17082
diff
changeset
|
495 filter(vf->priv, dmpi->planes[2], mpi->planes[2], dmpi->stride[2], mpi->stride[2], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, qp_tab, mpi->qstride, 0); |
11477
9785bff83777
memcpy pix instead of black screen if no DR and codec provides no qscale table
michael
parents:
11335
diff
changeset
|
496 }else{ |
9785bff83777
memcpy pix instead of black screen if no DR and codec provides no qscale table
michael
parents:
11335
diff
changeset
|
497 memcpy_pic(dmpi->planes[0], mpi->planes[0], mpi->w, mpi->h, dmpi->stride[0], mpi->stride[0]); |
9785bff83777
memcpy pix instead of black screen if no DR and codec provides no qscale table
michael
parents:
11335
diff
changeset
|
498 memcpy_pic(dmpi->planes[1], mpi->planes[1], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, dmpi->stride[1], mpi->stride[1]); |
9785bff83777
memcpy pix instead of black screen if no DR and codec provides no qscale table
michael
parents:
11335
diff
changeset
|
499 memcpy_pic(dmpi->planes[2], mpi->planes[2], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, dmpi->stride[2], mpi->stride[2]); |
11308
0c8d12a58a29
skip filter if codec doesnt provide the QP array and user didnt force a QP (fixes diegos segfault)
michael
parents:
11307
diff
changeset
|
500 } |
11307 | 501 } |
11277 | 502 |
28290 | 503 #if HAVE_MMX |
27754
08d18fe9da52
Change all occurrences of asm and __asm to __asm__, same as was done for FFmpeg.
diego
parents:
26727
diff
changeset
|
504 if(gCpuCaps.hasMMX) __asm__ volatile ("emms\n\t"); |
11277 | 505 #endif |
28290 | 506 #if HAVE_MMX2 |
27754
08d18fe9da52
Change all occurrences of asm and __asm to __asm__, same as was done for FFmpeg.
diego
parents:
26727
diff
changeset
|
507 if(gCpuCaps.hasMMX2) __asm__ volatile ("sfence\n\t"); |
11277 | 508 #endif |
509 | |
17906
20aca9baf5d8
passing pts through the filter layer (lets see if pts or cola comes out at the end)
michael
parents:
17523
diff
changeset
|
510 return vf_next_put_image(vf,dmpi, pts); |
11277 | 511 } |
512 | |
513 static void uninit(struct vf_instance_s* vf){ | |
514 if(!vf->priv) return; | |
515 | |
516 if(vf->priv->temp) free(vf->priv->temp); | |
517 vf->priv->temp= NULL; | |
518 if(vf->priv->src) free(vf->priv->src); | |
519 vf->priv->src= NULL; | |
520 if(vf->priv->avctx) free(vf->priv->avctx); | |
521 vf->priv->avctx= NULL; | |
17110
ba9bf9beb23f
prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents:
17082
diff
changeset
|
522 if(vf->priv->non_b_qp) free(vf->priv->non_b_qp); |
ba9bf9beb23f
prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents:
17082
diff
changeset
|
523 vf->priv->non_b_qp= NULL; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
524 |
11277 | 525 free(vf->priv); |
526 vf->priv=NULL; | |
527 } | |
528 | |
529 //===========================================================================// | |
530 static int query_format(struct vf_instance_s* vf, unsigned int fmt){ | |
11307 | 531 switch(fmt){ |
532 case IMGFMT_YVU9: | |
533 case IMGFMT_IF09: | |
11277 | 534 case IMGFMT_YV12: |
535 case IMGFMT_I420: | |
536 case IMGFMT_IYUV: | |
11307 | 537 case IMGFMT_CLPL: |
538 case IMGFMT_Y800: | |
539 case IMGFMT_Y8: | |
540 case IMGFMT_444P: | |
541 case IMGFMT_422P: | |
542 case IMGFMT_411P: | |
543 return vf_next_query_format(vf,fmt); | |
544 } | |
545 return 0; | |
11277 | 546 } |
547 | |
11307 | 548 static int control(struct vf_instance_s* vf, int request, void* data){ |
549 switch(request){ | |
550 case VFCTRL_QUERY_MAX_PP_LEVEL: | |
551 return 6; | |
552 case VFCTRL_SET_PP_LEVEL: | |
553 vf->priv->log2_count= *((unsigned int*)data); | |
554 return CONTROL_TRUE; | |
555 } | |
556 return vf_next_control(vf,request,data); | |
557 } | |
558 | |
11277 | 559 static int open(vf_instance_t *vf, char* args){ |
12157 | 560 |
14022
803be9a78854
removing strange csp matching code (was copy&pasted from vf_pp where it originated from arpi 2.5 years ago) -> fixes spp+scale+x11 crash
michael
parents:
13729
diff
changeset
|
561 int log2c=-1; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
562 |
11277 | 563 vf->config=config; |
564 vf->put_image=put_image; | |
565 vf->get_image=get_image; | |
566 vf->query_format=query_format; | |
567 vf->uninit=uninit; | |
11307 | 568 vf->control= control; |
11277 | 569 vf->priv=malloc(sizeof(struct vf_priv_s)); |
570 memset(vf->priv, 0, sizeof(struct vf_priv_s)); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
571 |
11280 | 572 avcodec_init(); |
573 | |
11277 | 574 vf->priv->avctx= avcodec_alloc_context(); |
575 dsputil_init(&vf->priv->dsp, vf->priv->avctx); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
576 |
11993
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
577 vf->priv->log2_count= 3; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
578 |
12157 | 579 if (args) sscanf(args, "%d:%d:%d", &log2c, &vf->priv->qp, &vf->priv->mode); |
580 | |
581 if( log2c >=0 && log2c <=6 ) | |
582 vf->priv->log2_count = log2c; | |
583 | |
584 if(vf->priv->qp < 0) | |
585 vf->priv->qp = 0; | |
586 | |
17110
ba9bf9beb23f
prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents:
17082
diff
changeset
|
587 switch(vf->priv->mode&3){ |
12157 | 588 default: |
11993
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
589 case 0: requantize= hardthresh_c; break; |
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
590 case 1: requantize= softthresh_c; break; |
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
591 } |
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
592 |
28290 | 593 #if HAVE_MMX |
11299 | 594 if(gCpuCaps.hasMMX){ |
595 store_slice= store_slice_mmx; | |
17110
ba9bf9beb23f
prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents:
17082
diff
changeset
|
596 switch(vf->priv->mode&3){ |
11993
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
597 case 0: requantize= hardthresh_mmx; break; |
11994 | 598 case 1: requantize= softthresh_mmx; break; |
11993
4e2d99dbef78
spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents:
11568
diff
changeset
|
599 } |
11299 | 600 } |
11304 | 601 #endif |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
602 |
11277 | 603 return 1; |
604 } | |
605 | |
25221 | 606 const vf_info_t vf_info_spp = { |
11277 | 607 "simple postprocess", |
608 "spp", | |
609 "Michael Niedermayer", | |
610 "", | |
611 open, | |
612 NULL | |
613 }; |