annotate postproc/postprocess.c @ 7999:b523a14e12ae

v4l update
author henry
date Thu, 31 Oct 2002 11:30:09 +0000
parents 39b5d7082e1f
children ad8d6f993c81
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2158
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
1 /*
3964
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
2 Copyright (C) 2001-2002 Michael Niedermayer (michaelni@gmx.at)
2158
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
3
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
4 This program is free software; you can redistribute it and/or modify
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
5 it under the terms of the GNU General Public License as published by
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
6 the Free Software Foundation; either version 2 of the License, or
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
7 (at your option) any later version.
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
8
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
9 This program is distributed in the hope that it will be useful,
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
10 but WITHOUT ANY WARRANTY; without even the implied warranty of
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
12 GNU General Public License for more details.
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
13
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
14 You should have received a copy of the GNU General Public License
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
15 along with this program; if not, write to the Free Software
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
16 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
17 */
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
18
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
19 /*
2203
f90b6e259dc8 rewrote the horizontal lowpass filter to fix a bug which caused a blocky look
michael
parents: 2195
diff changeset
20 C MMX MMX2 3DNow
2158
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
21 isVertDC Ec Ec
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
22 isVertMinMaxOk Ec Ec
2203
f90b6e259dc8 rewrote the horizontal lowpass filter to fix a bug which caused a blocky look
michael
parents: 2195
diff changeset
23 doVertLowPass E e e
3013
71384f064a3e faster mmx2 / 3dnow deblocking filter
michael
parents: 2899
diff changeset
24 doVertDefFilter Ec Ec e e
2158
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
25 isHorizDC Ec Ec
2454
b74c2a08eac9 much better horizontal filters (transpose & use the vertical ones) :)
michael
parents: 2437
diff changeset
26 isHorizMinMaxOk a E
b74c2a08eac9 much better horizontal filters (transpose & use the vertical ones) :)
michael
parents: 2437
diff changeset
27 doHorizLowPass E e e
3013
71384f064a3e faster mmx2 / 3dnow deblocking filter
michael
parents: 2899
diff changeset
28 doHorizDefFilter Ec Ec e e
2477
830c0e171d7d dering in c
michael
parents: 2476
diff changeset
29 deRing E e e*
2203
f90b6e259dc8 rewrote the horizontal lowpass filter to fix a bug which caused a blocky look
michael
parents: 2195
diff changeset
30 Vertical RKAlgo1 E a a
2461
60f16575bece fixed difference with -vo md5 between doVertDefFilter() C and MMX / MMX2 versions
michael
parents: 2454
diff changeset
31 Horizontal RKAlgo1 a a
2860
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
32 Vertical X1# a E E
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
33 Horizontal X1# a E E
2246
f7c1485b33be fixed the height%8!=0 bug
michael
parents: 2231
diff changeset
34 LinIpolDeinterlace e E E*
f7c1485b33be fixed the height%8!=0 bug
michael
parents: 2231
diff changeset
35 CubicIpolDeinterlace a e e*
f7c1485b33be fixed the height%8!=0 bug
michael
parents: 2231
diff changeset
36 LinBlendDeinterlace e E E*
2860
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
37 MedianDeinterlace# Ec Ec
2895
dd3fabd01df0 temp denoiser changes: (a-b)^2 instead of |a-b| and MMX2/3DNOW version
michael
parents: 2860
diff changeset
38 TempDeNoiser# E e e
2860
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
39
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
40 * i dont have a 3dnow CPU -> its untested, but noone said it doesnt work so it seems to work
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
41 # more or less selfinvented filters so the exactness isnt too meaningfull
2158
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
42 E = Exact implementation
2246
f7c1485b33be fixed the height%8!=0 bug
michael
parents: 2231
diff changeset
43 e = allmost exact implementation (slightly different rounding,...)
2158
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
44 a = alternative / approximate impl
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
45 c = checked against the other implementations (-vo md5)
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
46 */
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
47
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
48 /*
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
49 TODO:
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
50 reduce the time wasted on the mem transfer
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
51 unroll stuff if instructions depend too much on the prior one
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
52 move YScale thing to the end instead of fixing QP
2159
795f3d022657 fixed a bug in the horizontal default filter
arpi
parents: 2158
diff changeset
53 write a faster and higher quality deblocking filter :)
2168
21a8f158d19f bugfixes: last 3 lines not brightness/contrast corrected
michael
parents: 2159
diff changeset
54 make the mainloop more flexible (variable number of blocks at once
21a8f158d19f bugfixes: last 3 lines not brightness/contrast corrected
michael
parents: 2159
diff changeset
55 (the if/else stuff per block is slowing things down)
2179
2d8d14b882cc fixed a rounding bug thing in the X1 Filter
michael
parents: 2169
diff changeset
56 compare the quality & speed of all filters
2d8d14b882cc fixed a rounding bug thing in the X1 Filter
michael
parents: 2169
diff changeset
57 split this huge file
2570
af43a83122fc minor speedup
michael
parents: 2478
diff changeset
58 optimize c versions
2860
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
59 try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks
2158
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
60 ...
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
61 */
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
62
2221
9fd911c931cd minor cleanups
michael
parents: 2203
diff changeset
63 //Changelog: use the CVS log
2158
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
64
2775
8e3875816f6d added missing #include <malloc.h>
pl
parents: 2750
diff changeset
65 #include "../config.h"
2158
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
66 #include <inttypes.h>
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
67 #include <stdio.h>
2168
21a8f158d19f bugfixes: last 3 lines not brightness/contrast corrected
michael
parents: 2159
diff changeset
68 #include <stdlib.h>
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
69 #include <string.h>
2476
a6c5a537f30a a few warning fixes (missing #include's)
pl
parents: 2475
diff changeset
70 #ifdef HAVE_MALLOC_H
a6c5a537f30a a few warning fixes (missing #include's)
pl
parents: 2475
diff changeset
71 #include <malloc.h>
a6c5a537f30a a few warning fixes (missing #include's)
pl
parents: 2475
diff changeset
72 #endif
2159
795f3d022657 fixed a bug in the horizontal default filter
arpi
parents: 2158
diff changeset
73 //#undef HAVE_MMX2
795f3d022657 fixed a bug in the horizontal default filter
arpi
parents: 2158
diff changeset
74 //#define HAVE_3DNOW
795f3d022657 fixed a bug in the horizontal default filter
arpi
parents: 2158
diff changeset
75 //#undef HAVE_MMX
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
76 //#undef ARCH_X86
3013
71384f064a3e faster mmx2 / 3dnow deblocking filter
michael
parents: 2899
diff changeset
77 //#define DEBUG_BRIGHTNESS
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
78 #include "../libvo/fastmemcpy.h"
2158
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
79 #include "postprocess.h"
4248
3cdb86beebce mangle for win32 in postproc
atmos4
parents: 4143
diff changeset
80 #include "../mangle.h"
2158
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
81
2189
82556b3a1228 Cleanup:
arpi
parents: 2185
diff changeset
82 #define MIN(a,b) ((a) > (b) ? (b) : (a))
82556b3a1228 Cleanup:
arpi
parents: 2185
diff changeset
83 #define MAX(a,b) ((a) < (b) ? (b) : (a))
82556b3a1228 Cleanup:
arpi
parents: 2185
diff changeset
84 #define ABS(a) ((a) > 0 ? (a) : (-(a)))
82556b3a1228 Cleanup:
arpi
parents: 2185
diff changeset
85 #define SIGN(a) ((a) > 0 ? 1 : -1)
82556b3a1228 Cleanup:
arpi
parents: 2185
diff changeset
86
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
87 #define GET_MODE_BUFFER_SIZE 500
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
88 #define OPTIONS_ARRAY_SIZE 10
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
89 #define BLOCK_SIZE 8
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
90 #define TEMP_STRIDE 8
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
91 //#define NUM_BLOCKS_AT_ONCE 16 //not used yet
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
92
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
93 #ifdef ARCH_X86
2742
d5636499cafd minor changes (fixed some warnings, added attribute aligned(8) stuff)
michael
parents: 2595
diff changeset
94 static uint64_t __attribute__((aligned(8))) w05= 0x0005000500050005LL;
d5636499cafd minor changes (fixed some warnings, added attribute aligned(8) stuff)
michael
parents: 2595
diff changeset
95 static uint64_t __attribute__((aligned(8))) w20= 0x0020002000200020LL;
d5636499cafd minor changes (fixed some warnings, added attribute aligned(8) stuff)
michael
parents: 2595
diff changeset
96 static uint64_t __attribute__((aligned(8))) b00= 0x0000000000000000LL;
d5636499cafd minor changes (fixed some warnings, added attribute aligned(8) stuff)
michael
parents: 2595
diff changeset
97 static uint64_t __attribute__((aligned(8))) b01= 0x0101010101010101LL;
d5636499cafd minor changes (fixed some warnings, added attribute aligned(8) stuff)
michael
parents: 2595
diff changeset
98 static uint64_t __attribute__((aligned(8))) b02= 0x0202020202020202LL;
d5636499cafd minor changes (fixed some warnings, added attribute aligned(8) stuff)
michael
parents: 2595
diff changeset
99 static uint64_t __attribute__((aligned(8))) b08= 0x0808080808080808LL;
d5636499cafd minor changes (fixed some warnings, added attribute aligned(8) stuff)
michael
parents: 2595
diff changeset
100 static uint64_t __attribute__((aligned(8))) b80= 0x8080808080808080LL;
d5636499cafd minor changes (fixed some warnings, added attribute aligned(8) stuff)
michael
parents: 2595
diff changeset
101 #endif
2158
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
102
7963
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
103 static int verbose= 0;
3771
a14b3a600b81 new -pp options stuff (-npp ...)
michael
parents: 3151
diff changeset
104
7963
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
105 static const int deringThreshold= 20;
2158
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
106
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
107 struct PPFilter{
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
108 char *shortName;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
109 char *longName;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
110 int chromDefault; // is chrominance filtering on by default if this filter is manually activated
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
111 int minLumQuality; // minimum quality to turn luminance filtering on
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
112 int minChromQuality; // minimum quality to turn chrominance filtering on
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
113 int mask; // Bitmask to turn this filter on
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
114 };
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
115
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
116 typedef struct PPContext{
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
117 uint8_t *tempBlocks; //used for the horizontal code
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
118
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
119 /* we need 64bit here otherwise we´ll going to have a problem
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
120 after watching a black picture for 5 hours*/
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
121 uint64_t *yHistogram;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
122
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
123 uint64_t __attribute__((aligned(8))) packedYOffset;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
124 uint64_t __attribute__((aligned(8))) packedYScale;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
125
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
126 /* Temporal noise reducing buffers */
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
127 uint8_t *tempBlured[3];
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
128 int32_t *tempBluredPast[3];
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
129
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
130 /* Temporary buffers for handling the last row(s) */
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
131 uint8_t *tempDst;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
132 uint8_t *tempSrc;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
133
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
134 /* Temporary buffers for handling the last block */
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
135 uint8_t *tempDstBlock;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
136 uint8_t *tempSrcBlock;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
137 uint8_t *deintTemp;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
138
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
139 uint64_t __attribute__((aligned(8))) pQPb;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
140 uint64_t __attribute__((aligned(8))) pQPb2;
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
141
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
142 uint64_t __attribute__((aligned(8))) mmxDcOffset[32];
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
143 uint64_t __attribute__((aligned(8))) mmxDcThreshold[32];
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
144
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
145 QP_STORE_T *nonBQPTable;
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
146
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
147 int QP;
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
148 int nonBQP;
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
149
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
150 int frameNum;
7985
1ab37da5b1da per context cpuCaps (idea by kabi)
michael
parents: 7984
diff changeset
151
1ab37da5b1da per context cpuCaps (idea by kabi)
michael
parents: 7984
diff changeset
152 int cpuCaps;
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
153
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
154 PPMode ppMode;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
155 } PPContext;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
156
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
157 static struct PPFilter filters[]=
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
158 {
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
159 {"hb", "hdeblock", 1, 1, 3, H_DEBLOCK},
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
160 {"vb", "vdeblock", 1, 2, 4, V_DEBLOCK},
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
161 /* {"hr", "rkhdeblock", 1, 1, 3, H_RK1_FILTER},
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
162 {"vr", "rkvdeblock", 1, 2, 4, V_RK1_FILTER},*/
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
163 {"h1", "x1hdeblock", 1, 1, 3, H_X1_FILTER},
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
164 {"v1", "x1vdeblock", 1, 2, 4, V_X1_FILTER},
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
165 {"dr", "dering", 1, 5, 6, DERING},
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
166 {"al", "autolevels", 0, 1, 2, LEVEL_FIX},
3817
365e9a92498d customizeable deblocking (2 thresholds)
michael
parents: 3779
diff changeset
167 {"lb", "linblenddeint", 1, 1, 4, LINEAR_BLEND_DEINT_FILTER},
365e9a92498d customizeable deblocking (2 thresholds)
michael
parents: 3779
diff changeset
168 {"li", "linipoldeint", 1, 1, 4, LINEAR_IPOL_DEINT_FILTER},
365e9a92498d customizeable deblocking (2 thresholds)
michael
parents: 3779
diff changeset
169 {"ci", "cubicipoldeint", 1, 1, 4, CUBIC_IPOL_DEINT_FILTER},
365e9a92498d customizeable deblocking (2 thresholds)
michael
parents: 3779
diff changeset
170 {"md", "mediandeint", 1, 1, 4, MEDIAN_DEINT_FILTER},
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
171 {"fd", "ffmpegdeint", 1, 1, 4, FFMPEG_DEINT_FILTER},
2860
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
172 {"tn", "tmpnoise", 1, 7, 8, TEMP_NOISE_FILTER},
3964
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
173 {"fq", "forcequant", 1, 0, 0, FORCE_QUANT},
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
174 {NULL, NULL,0,0,0,0} //End Marker
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
175 };
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
176
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
177 static char *replaceTable[]=
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
178 {
2860
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
179 "default", "hdeblock:a,vdeblock:a,dering:a,autolevels,tmpnoise:a:150:200:400",
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
180 "de", "hdeblock:a,vdeblock:a,dering:a,autolevels,tmpnoise:a:150:200:400",
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
181 "fast", "x1hdeblock:a,x1vdeblock:a,dering:a,autolevels,tmpnoise:a:150:200:400",
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
182 "fa", "x1hdeblock:a,x1vdeblock:a,dering:a,autolevels,tmpnoise:a:150:200:400",
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
183 NULL //End Marker
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
184 };
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
185
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
186 #ifdef ARCH_X86
2461
60f16575bece fixed difference with -vo md5 between doVertDefFilter() C and MMX / MMX2 versions
michael
parents: 2454
diff changeset
187 static inline void unusedVariableWarningFixer()
60f16575bece fixed difference with -vo md5 between doVertDefFilter() C and MMX / MMX2 versions
michael
parents: 2454
diff changeset
188 {
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
189 if(w05 + w20 + b00 + b01 + b02 + b08 + b80 == 0) b00=0;
2461
60f16575bece fixed difference with -vo md5 between doVertDefFilter() C and MMX / MMX2 versions
michael
parents: 2454
diff changeset
190 }
2742
d5636499cafd minor changes (fixed some warnings, added attribute aligned(8) stuff)
michael
parents: 2595
diff changeset
191 #endif
2461
60f16575bece fixed difference with -vo md5 between doVertDefFilter() C and MMX / MMX2 versions
michael
parents: 2454
diff changeset
192
2158
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
193
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
194 #ifdef ARCH_X86
2158
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
195 static inline void prefetchnta(void *p)
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
196 {
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
197 asm volatile( "prefetchnta (%0)\n\t"
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
198 : : "r" (p)
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
199 );
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
200 }
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
201
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
202 static inline void prefetcht0(void *p)
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
203 {
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
204 asm volatile( "prefetcht0 (%0)\n\t"
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
205 : : "r" (p)
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
206 );
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
207 }
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
208
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
209 static inline void prefetcht1(void *p)
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
210 {
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
211 asm volatile( "prefetcht1 (%0)\n\t"
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
212 : : "r" (p)
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
213 );
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
214 }
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
215
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
216 static inline void prefetcht2(void *p)
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
217 {
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
218 asm volatile( "prefetcht2 (%0)\n\t"
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
219 : : "r" (p)
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
220 );
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
221 }
2185
c5162871cf2b small changes for mplayer integration:
arpi
parents: 2181
diff changeset
222 #endif
2158
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
223
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
224 // The horizontal Functions exist only in C cuz the MMX code is faster with vertical filters and transposing
2158
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
225
3032
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
226 /**
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
227 * Check if the given 8x8 Block is mostly "flat"
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
228 */
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
229 static inline int isHorizDC(uint8_t src[], int stride, PPContext *c)
3032
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
230 {
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
231 int numEq= 0;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
232 int y;
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
233 const int dcOffset= ((c->QP*c->ppMode.baseDcDiff)>>8) + 1;
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
234 const int dcThreshold= dcOffset*2 + 1;
3032
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
235 for(y=0; y<BLOCK_SIZE; y++)
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
236 {
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
237 if(((unsigned)(src[0] - src[1] + dcOffset)) < dcThreshold) numEq++;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
238 if(((unsigned)(src[1] - src[2] + dcOffset)) < dcThreshold) numEq++;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
239 if(((unsigned)(src[2] - src[3] + dcOffset)) < dcThreshold) numEq++;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
240 if(((unsigned)(src[3] - src[4] + dcOffset)) < dcThreshold) numEq++;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
241 if(((unsigned)(src[4] - src[5] + dcOffset)) < dcThreshold) numEq++;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
242 if(((unsigned)(src[5] - src[6] + dcOffset)) < dcThreshold) numEq++;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
243 if(((unsigned)(src[6] - src[7] + dcOffset)) < dcThreshold) numEq++;
3032
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
244 src+= stride;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
245 }
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
246 return numEq > c->ppMode.flatnessThreshold;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
247 }
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
248
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
249 /**
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
250 * Check if the middle 8x8 Block in the given 8x16 block is flat
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
251 */
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
252 static inline int isVertDC_C(uint8_t src[], int stride, PPContext *c){
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
253 int numEq= 0;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
254 int y;
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
255 const int dcOffset= ((c->QP*c->ppMode.baseDcDiff)>>8) + 1;
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
256 const int dcThreshold= dcOffset*2 + 1;
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
257 src+= stride*4; // src points to begin of the 8x8 Block
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
258 for(y=0; y<BLOCK_SIZE-1; y++)
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
259 {
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
260 if(((unsigned)(src[0] - src[0+stride] + dcOffset)) < dcThreshold) numEq++;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
261 if(((unsigned)(src[1] - src[1+stride] + dcOffset)) < dcThreshold) numEq++;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
262 if(((unsigned)(src[2] - src[2+stride] + dcOffset)) < dcThreshold) numEq++;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
263 if(((unsigned)(src[3] - src[3+stride] + dcOffset)) < dcThreshold) numEq++;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
264 if(((unsigned)(src[4] - src[4+stride] + dcOffset)) < dcThreshold) numEq++;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
265 if(((unsigned)(src[5] - src[5+stride] + dcOffset)) < dcThreshold) numEq++;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
266 if(((unsigned)(src[6] - src[6+stride] + dcOffset)) < dcThreshold) numEq++;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
267 if(((unsigned)(src[7] - src[7+stride] + dcOffset)) < dcThreshold) numEq++;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
268 src+= stride;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
269 }
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
270 return numEq > c->ppMode.flatnessThreshold;
3032
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
271 }
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
272
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
273 static inline int isHorizMinMaxOk(uint8_t src[], int stride, int QP)
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
274 {
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
275 if(abs(src[0] - src[7]) > 2*QP) return 0;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
276
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
277 return 1;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
278 }
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
279
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
280 static inline void doHorizDefFilter(uint8_t dst[], int stride, int QP)
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
281 {
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
282 int y;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
283 for(y=0; y<BLOCK_SIZE; y++)
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
284 {
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
285 const int middleEnergy= 5*(dst[4] - dst[5]) + 2*(dst[2] - dst[5]);
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
286
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
287 if(ABS(middleEnergy) < 8*QP)
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
288 {
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
289 const int q=(dst[3] - dst[4])/2;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
290 const int leftEnergy= 5*(dst[2] - dst[1]) + 2*(dst[0] - dst[3]);
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
291 const int rightEnergy= 5*(dst[6] - dst[5]) + 2*(dst[4] - dst[7]);
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
292
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
293 int d= ABS(middleEnergy) - MIN( ABS(leftEnergy), ABS(rightEnergy) );
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
294 d= MAX(d, 0);
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
295
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
296 d= (5*d + 32) >> 6;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
297 d*= SIGN(-middleEnergy);
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
298
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
299 if(q>0)
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
300 {
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
301 d= d<0 ? 0 : d;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
302 d= d>q ? q : d;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
303 }
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
304 else
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
305 {
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
306 d= d>0 ? 0 : d;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
307 d= d<q ? q : d;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
308 }
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
309
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
310 dst[3]-= d;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
311 dst[4]+= d;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
312 }
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
313 dst+= stride;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
314 }
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
315 }
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
316
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
317 /**
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
318 * Do a horizontal low pass filter on the 10x8 block (dst points to middle 8x8 Block)
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
319 * using the 9-Tap Filter (1,1,2,2,4,2,2,1,1)/16 (C version)
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
320 */
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
321 static inline void doHorizLowPass(uint8_t dst[], int stride, int QP)
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
322 {
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
323
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
324 int y;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
325 for(y=0; y<BLOCK_SIZE; y++)
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
326 {
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
327 const int first= ABS(dst[-1] - dst[0]) < QP ? dst[-1] : dst[0];
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
328 const int last= ABS(dst[8] - dst[7]) < QP ? dst[8] : dst[7];
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
329
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
330 int sums[9];
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
331 sums[0] = first + dst[0];
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
332 sums[1] = dst[0] + dst[1];
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
333 sums[2] = dst[1] + dst[2];
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
334 sums[3] = dst[2] + dst[3];
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
335 sums[4] = dst[3] + dst[4];
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
336 sums[5] = dst[4] + dst[5];
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
337 sums[6] = dst[5] + dst[6];
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
338 sums[7] = dst[6] + dst[7];
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
339 sums[8] = dst[7] + last;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
340
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
341 dst[0]= ((sums[0]<<2) + ((first + sums[2])<<1) + sums[4] + 8)>>4;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
342 dst[1]= ((dst[1]<<2) + ((first + sums[0] + sums[3])<<1) + sums[5] + 8)>>4;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
343 dst[2]= ((dst[2]<<2) + ((first + sums[1] + sums[4])<<1) + sums[6] + 8)>>4;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
344 dst[3]= ((dst[3]<<2) + ((sums[2] + sums[5])<<1) + sums[0] + sums[7] + 8)>>4;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
345 dst[4]= ((dst[4]<<2) + ((sums[3] + sums[6])<<1) + sums[1] + sums[8] + 8)>>4;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
346 dst[5]= ((dst[5]<<2) + ((last + sums[7] + sums[4])<<1) + sums[2] + 8)>>4;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
347 dst[6]= (((last + dst[6])<<2) + ((dst[7] + sums[5])<<1) + sums[3] + 8)>>4;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
348 dst[7]= ((sums[8]<<2) + ((last + sums[6])<<1) + sums[4] + 8)>>4;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
349
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
350 dst+= stride;
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
351 }
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
352 }
6de073cf52b5 oops, too much cleanup ;)
michael
parents: 3031
diff changeset
353
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
354 /**
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
355 * Experimental Filter 1 (Horizontal)
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
356 * will not damage linear gradients
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
357 * Flat blocks should look like they where passed through the (1,1,2,2,4,2,2,1,1) 9-Tap filter
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
358 * can only smooth blocks at the expected locations (it cant smooth them if they did move)
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
359 * MMX2 version does correct clipping C version doesnt
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
360 * not identical with the vertical one
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
361 */
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
362 static inline void horizX1Filter(uint8_t *src, int stride, int QP)
2158
508468a75be0 new postprocess code by Michael Niedermayer (michaelni@gmx.at)
arpi
parents:
diff changeset
363 {
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
364 int y;
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
365 static uint64_t *lut= NULL;
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
366 if(lut==NULL)
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
367 {
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
368 int i;
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
369 lut= (uint64_t*)memalign(8, 256*8);
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
370 for(i=0; i<256; i++)
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
371 {
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
372 int v= i < 128 ? 2*i : 2*(i-256);
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
373 /*
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
374 //Simulate 112242211 9-Tap filter
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
375 uint64_t a= (v/16) & 0xFF;
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
376 uint64_t b= (v/8) & 0xFF;
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
377 uint64_t c= (v/4) & 0xFF;
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
378 uint64_t d= (3*v/8) & 0xFF;
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
379 */
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
380 //Simulate piecewise linear interpolation
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
381 uint64_t a= (v/16) & 0xFF;
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
382 uint64_t b= (v*3/16) & 0xFF;
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
383 uint64_t c= (v*5/16) & 0xFF;
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
384 uint64_t d= (7*v/16) & 0xFF;
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
385 uint64_t A= (0x100 - a)&0xFF;
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
386 uint64_t B= (0x100 - b)&0xFF;
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
387 uint64_t C= (0x100 - c)&0xFF;
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
388 uint64_t D= (0x100 - c)&0xFF;
2473
94a0265c408c dering in mmx2
michael
parents: 2461
diff changeset
389
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
390 lut[i] = (a<<56) | (b<<48) | (c<<40) | (d<<32) |
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
391 (D<<24) | (C<<16) | (B<<8) | (A);
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
392 //lut[i] = (v<<32) | (v<<24);
2477
830c0e171d7d dering in c
michael
parents: 2476
diff changeset
393 }
830c0e171d7d dering in c
michael
parents: 2476
diff changeset
394 }
830c0e171d7d dering in c
michael
parents: 2476
diff changeset
395
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
396 for(y=0; y<BLOCK_SIZE; y++)
2477
830c0e171d7d dering in c
michael
parents: 2476
diff changeset
397 {
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
398 int a= src[1] - src[2];
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
399 int b= src[3] - src[4];
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
400 int c= src[5] - src[6];
2477
830c0e171d7d dering in c
michael
parents: 2476
diff changeset
401
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
402 int d= MAX(ABS(b) - (ABS(a) + ABS(c))/2, 0);
3093
fb4cee33d3c6 faster dering
michael
parents: 3037
diff changeset
403
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
404 if(d < QP)
3093
fb4cee33d3c6 faster dering
michael
parents: 3037
diff changeset
405 {
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
406 int v = d * SIGN(-b);
2203
f90b6e259dc8 rewrote the horizontal lowpass filter to fix a bug which caused a blocky look
michael
parents: 2195
diff changeset
407
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
408 src[1] +=v/8;
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
409 src[2] +=v/4;
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
410 src[3] +=3*v/8;
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
411 src[4] -=3*v/8;
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
412 src[5] -=v/4;
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
413 src[6] -=v/8;
2203
f90b6e259dc8 rewrote the horizontal lowpass filter to fix a bug which caused a blocky look
michael
parents: 2195
diff changeset
414
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
415 }
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
416 src+=stride;
2203
f90b6e259dc8 rewrote the horizontal lowpass filter to fix a bug which caused a blocky look
michael
parents: 2195
diff changeset
417 }
f90b6e259dc8 rewrote the horizontal lowpass filter to fix a bug which caused a blocky look
michael
parents: 2195
diff changeset
418 }
f90b6e259dc8 rewrote the horizontal lowpass filter to fix a bug which caused a blocky look
michael
parents: 2195
diff changeset
419
f90b6e259dc8 rewrote the horizontal lowpass filter to fix a bug which caused a blocky look
michael
parents: 2195
diff changeset
420
3151
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
421 //Note: we have C, MMX, MMX2, 3DNOW version there is no 3DNOW+MMX2 one
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
422 //Plain C versions
3151
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
423 #if !defined (HAVE_MMX) || defined (RUNTIME_CPUDETECT)
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
424 #define COMPILE_C
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
425 #endif
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
426
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
427 #ifdef ARCH_X86
3151
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
428
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
429 #if (defined (HAVE_MMX) && !defined (HAVE_3DNOW) && !defined (HAVE_MMX2)) || defined (RUNTIME_CPUDETECT)
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
430 #define COMPILE_MMX
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
431 #endif
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
432
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
433 #if defined (HAVE_MMX2) || defined (RUNTIME_CPUDETECT)
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
434 #define COMPILE_MMX2
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
435 #endif
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
436
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
437 #if (defined (HAVE_3DNOW) && !defined (HAVE_MMX2)) || defined (RUNTIME_CPUDETECT)
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
438 #define COMPILE_3DNOW
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
439 #endif
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
440 #endif //ARCH_X86
3151
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
441
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
442 #undef HAVE_MMX
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
443 #undef HAVE_MMX2
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
444 #undef HAVE_3DNOW
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
445 #undef ARCH_X86
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
446
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
447 #ifdef COMPILE_C
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
448 #undef HAVE_MMX
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
449 #undef HAVE_MMX2
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
450 #undef HAVE_3DNOW
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
451 #undef ARCH_X86
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
452 #define RENAME(a) a ## _C
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
453 #include "postprocess_template.c"
3151
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
454 #endif
2203
f90b6e259dc8 rewrote the horizontal lowpass filter to fix a bug which caused a blocky look
michael
parents: 2195
diff changeset
455
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
456 //MMX versions
3151
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
457 #ifdef COMPILE_MMX
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
458 #undef RENAME
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
459 #define HAVE_MMX
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
460 #undef HAVE_MMX2
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
461 #undef HAVE_3DNOW
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
462 #define ARCH_X86
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
463 #define RENAME(a) a ## _MMX
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
464 #include "postprocess_template.c"
3151
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
465 #endif
2454
b74c2a08eac9 much better horizontal filters (transpose & use the vertical ones) :)
michael
parents: 2437
diff changeset
466
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
467 //MMX2 versions
3151
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
468 #ifdef COMPILE_MMX2
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
469 #undef RENAME
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
470 #define HAVE_MMX
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
471 #define HAVE_MMX2
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
472 #undef HAVE_3DNOW
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
473 #define ARCH_X86
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
474 #define RENAME(a) a ## _MMX2
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
475 #include "postprocess_template.c"
3151
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
476 #endif
2454
b74c2a08eac9 much better horizontal filters (transpose & use the vertical ones) :)
michael
parents: 2437
diff changeset
477
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
478 //3DNOW versions
3151
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
479 #ifdef COMPILE_3DNOW
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
480 #undef RENAME
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
481 #define HAVE_MMX
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
482 #undef HAVE_MMX2
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
483 #define HAVE_3DNOW
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
484 #define ARCH_X86
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
485 #define RENAME(a) a ## _3DNow
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
486 #include "postprocess_template.c"
3151
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
487 #endif
2454
b74c2a08eac9 much better horizontal filters (transpose & use the vertical ones) :)
michael
parents: 2437
diff changeset
488
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
489 // minor note: the HAVE_xyz is messed up after that line so dont use it
2454
b74c2a08eac9 much better horizontal filters (transpose & use the vertical ones) :)
michael
parents: 2437
diff changeset
490
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
491 static inline void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height,
7985
1ab37da5b1da per context cpuCaps (idea by kabi)
michael
parents: 7984
diff changeset
492 QP_STORE_T QPs[], int QPStride, int isColor, PPMode *ppMode, pp_context *vc)
2860
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
493 {
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
494 PPContext *c= (PPContext *)vc;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
495 c->ppMode= *ppMode; //FIXME
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
496
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
497 // useing ifs here as they are faster than function pointers allthough the
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
498 // difference wouldnt be messureable here but its much better because
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
499 // someone might exchange the cpu whithout restarting mplayer ;)
3151
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
500 #ifdef RUNTIME_CPUDETECT
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
501 #ifdef ARCH_X86
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
502 // ordered per speed fasterst first
7985
1ab37da5b1da per context cpuCaps (idea by kabi)
michael
parents: 7984
diff changeset
503 if(c->cpuCaps & PP_CPU_CAPS_MMX2)
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
504 postProcess_MMX2(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
7985
1ab37da5b1da per context cpuCaps (idea by kabi)
michael
parents: 7984
diff changeset
505 else if(c->cpuCaps & PP_CPU_CAPS_3DNOW)
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
506 postProcess_3DNow(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
7985
1ab37da5b1da per context cpuCaps (idea by kabi)
michael
parents: 7984
diff changeset
507 else if(c->cpuCaps & PP_CPU_CAPS_MMX)
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
508 postProcess_MMX(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
509 else
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
510 postProcess_C(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
2895
dd3fabd01df0 temp denoiser changes: (a-b)^2 instead of |a-b| and MMX2/3DNOW version
michael
parents: 2860
diff changeset
511 #else
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
512 postProcess_C(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
2895
dd3fabd01df0 temp denoiser changes: (a-b)^2 instead of |a-b| and MMX2/3DNOW version
michael
parents: 2860
diff changeset
513 #endif
3151
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
514 #else //RUNTIME_CPUDETECT
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
515 #ifdef HAVE_MMX2
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
516 postProcess_MMX2(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
3151
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
517 #elif defined (HAVE_3DNOW)
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
518 postProcess_3DNow(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
3151
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
519 #elif defined (HAVE_MMX)
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
520 postProcess_MMX(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
3151
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
521 #else
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
522 postProcess_C(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
3151
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
523 #endif
790a27fc64f1 runtime cpu detect optional (compiles faster)
michael
parents: 3099
diff changeset
524 #endif //!RUNTIME_CPUDETECT
2860
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
525 }
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
526
3099
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
527 //static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height,
897d46457708 runtime cpu detection
michael
parents: 3094
diff changeset
528 // QP_STORE_T QPs[], int QPStride, int isColor, struct PPMode *ppMode);
2159
795f3d022657 fixed a bug in the horizontal default filter
arpi
parents: 2158
diff changeset
529
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
530 /* -pp Command line Help
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
531 */
7984
a57c1fc0c2fc change qscale type to int8 and fix qscale ordering
michael
parents: 7972
diff changeset
532 char *pp_help=
7986
39b5d7082e1f removing "-npp" (found by arpi)
michael
parents: 7985
diff changeset
533 "<filterName>[:<option>[:<option>...]][,[-]<filterName>[:<option>...]]...\n"
3976
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
534 "long form example:\n"
7986
39b5d7082e1f removing "-npp" (found by arpi)
michael
parents: 7985
diff changeset
535 "vdeblock:autoq,hdeblock:autoq,linblenddeint default,-vdeblock\n"
3976
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
536 "short form example:\n"
7986
39b5d7082e1f removing "-npp" (found by arpi)
michael
parents: 7985
diff changeset
537 "vb:a,hb:a,lb de,-vb\n"
3976
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
538 "more examples:\n"
7986
39b5d7082e1f removing "-npp" (found by arpi)
michael
parents: 7985
diff changeset
539 "tn:64:128:256\n"
3976
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
540 "Filters Options\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
541 "short long name short long option Description\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
542 "* * a autoq cpu power dependant enabler\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
543 " c chrom chrominance filtring enabled\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
544 " y nochrom chrominance filtring disabled\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
545 "hb hdeblock (2 Threshold) horizontal deblocking filter\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
546 " 1. Threshold: default=1, higher -> more deblocking\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
547 " 2. Threshold: default=40, lower -> more deblocking\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
548 " the h & v deblocking filters share these\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
549 " so u cant set different thresholds for h / v\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
550 "vb vdeblock (2 Threshold) vertical deblocking filter\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
551 "h1 x1hdeblock Experimental h deblock filter 1\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
552 "v1 x1vdeblock Experimental v deblock filter 1\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
553 "dr dering Deringing filter\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
554 "al autolevels automatic brightness / contrast\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
555 " f fullyrange stretch luminance to (0..255)\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
556 "lb linblenddeint linear blend deinterlacer\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
557 "li linipoldeint linear interpolating deinterlace\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
558 "ci cubicipoldeint cubic interpolating deinterlacer\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
559 "md mediandeint median deinterlacer\n"
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
560 "fd ffmpegdeint ffmpeg deinterlacer\n"
3976
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
561 "de default hb:a,vb:a,dr:a,al\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
562 "fa fast h1:a,v1:a,dr:a,al\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
563 "tn tmpnoise (3 Thresholds) Temporal Noise Reducer\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
564 " 1. <= 2. <= 3. larger -> stronger filtering\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
565 "fq forceQuant <quantizer> Force quantizer\n"
3aa6a5c1ca32 -npp help
michael
parents: 3964
diff changeset
566 ;
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
567
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
568 /**
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
569 * returns a PPMode struct which will have a non 0 error variable if an error occured
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
570 * name is the string after "-pp" on the command line
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
571 * quality is a number from 0 to GET_PP_QUALITY_MAX
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
572 */
7961
78e0f2776da7 cosmetics ;)
michael
parents: 7960
diff changeset
573 struct PPMode pp_get_mode_by_name_and_quality(char *name, int quality)
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
574 {
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
575 char temp[GET_MODE_BUFFER_SIZE];
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
576 char *p= temp;
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
577 char *filterDelimiters= ",/";
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
578 char *optionDelimiters= ":";
7963
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
579 struct PPMode ppMode;
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
580 char *filterToken;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
581
7963
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
582 ppMode.lumMode= 0;
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
583 ppMode.chromMode= 0;
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
584 ppMode.maxTmpNoise[0]= 700;
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
585 ppMode.maxTmpNoise[1]= 1500;
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
586 ppMode.maxTmpNoise[2]= 3000;
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
587 ppMode.maxAllowedY= 234;
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
588 ppMode.minAllowedY= 16;
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
589 ppMode.baseDcDiff= 256/4;
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
590 ppMode.flatnessThreshold=40;
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
591 ppMode.flatnessThreshold= 56-16;
7963
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
592 ppMode.maxClippedThreshold= 0.01;
7968
michael
parents: 7963
diff changeset
593 ppMode.error=0;
7963
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
594
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
595 strncpy(temp, name, GET_MODE_BUFFER_SIZE);
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
596
4143
d416ca893952 dont print -npp parser debug info if only -v
michael
parents: 3987
diff changeset
597 if(verbose>1) printf("pp: %s\n", name);
2860
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
598
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
599 for(;;){
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
600 char *filterName;
2860
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
601 int q= 1000000; //GET_PP_QUALITY_MAX;
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
602 int chrom=-1;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
603 char *option;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
604 char *options[OPTIONS_ARRAY_SIZE];
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
605 int i;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
606 int filterNameOk=0;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
607 int numOfUnknownOptions=0;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
608 int enable=1; //does the user want us to enabled or disabled the filter
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
609
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
610 filterToken= strtok(p, filterDelimiters);
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
611 if(filterToken == NULL) break;
2860
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
612 p+= strlen(filterToken) + 1; // p points to next filterToken
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
613 filterName= strtok(filterToken, optionDelimiters);
4143
d416ca893952 dont print -npp parser debug info if only -v
michael
parents: 3987
diff changeset
614 if(verbose>1) printf("pp: %s::%s\n", filterToken, filterName);
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
615
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
616 if(*filterName == '-')
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
617 {
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
618 enable=0;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
619 filterName++;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
620 }
2860
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
621
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
622 for(;;){ //for all options
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
623 option= strtok(NULL, optionDelimiters);
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
624 if(option == NULL) break;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
625
4143
d416ca893952 dont print -npp parser debug info if only -v
michael
parents: 3987
diff changeset
626 if(verbose>1) printf("pp: option: %s\n", option);
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
627 if(!strcmp("autoq", option) || !strcmp("a", option)) q= quality;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
628 else if(!strcmp("nochrom", option) || !strcmp("y", option)) chrom=0;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
629 else if(!strcmp("chrom", option) || !strcmp("c", option)) chrom=1;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
630 else
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
631 {
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
632 options[numOfUnknownOptions] = option;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
633 numOfUnknownOptions++;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
634 }
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
635 if(numOfUnknownOptions >= OPTIONS_ARRAY_SIZE-1) break;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
636 }
2860
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
637 options[numOfUnknownOptions] = NULL;
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
638
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
639 /* replace stuff from the replace Table */
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
640 for(i=0; replaceTable[2*i]!=NULL; i++)
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
641 {
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
642 if(!strcmp(replaceTable[2*i], filterName))
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
643 {
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
644 int newlen= strlen(replaceTable[2*i + 1]);
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
645 int plen;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
646 int spaceLeft;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
647
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
648 if(p==NULL) p= temp, *p=0; //last filter
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
649 else p--, *p=','; //not last filter
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
650
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
651 plen= strlen(p);
6164
aee9c32349a9 applied 64bit patch from Ulrich Hecht <uli at suse dot de>
alex
parents: 4257
diff changeset
652 spaceLeft= p - temp + plen;
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
653 if(spaceLeft + newlen >= GET_MODE_BUFFER_SIZE)
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
654 {
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
655 ppMode.error++;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
656 break;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
657 }
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
658 memmove(p + newlen, p, plen+1);
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
659 memcpy(p, replaceTable[2*i + 1], newlen);
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
660 filterNameOk=1;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
661 }
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
662 }
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
663
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
664 for(i=0; filters[i].shortName!=NULL; i++)
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
665 {
2860
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
666 // printf("Compareing %s, %s, %s\n", filters[i].shortName,filters[i].longName, filterName);
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
667 if( !strcmp(filters[i].longName, filterName)
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
668 || !strcmp(filters[i].shortName, filterName))
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
669 {
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
670 ppMode.lumMode &= ~filters[i].mask;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
671 ppMode.chromMode &= ~filters[i].mask;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
672
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
673 filterNameOk=1;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
674 if(!enable) break; // user wants to disable it
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
675
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
676 if(q >= filters[i].minLumQuality)
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
677 ppMode.lumMode|= filters[i].mask;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
678 if(chrom==1 || (chrom==-1 && filters[i].chromDefault))
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
679 if(q >= filters[i].minChromQuality)
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
680 ppMode.chromMode|= filters[i].mask;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
681
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
682 if(filters[i].mask == LEVEL_FIX)
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
683 {
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
684 int o;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
685 ppMode.minAllowedY= 16;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
686 ppMode.maxAllowedY= 234;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
687 for(o=0; options[o]!=NULL; o++)
3832
d05cfaf5f0f2 minor brightness/contrast bugfix / moved some global vars into ppMode
michael
parents: 3817
diff changeset
688 {
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
689 if( !strcmp(options[o],"fullyrange")
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
690 ||!strcmp(options[o],"f"))
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
691 {
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
692 ppMode.minAllowedY= 0;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
693 ppMode.maxAllowedY= 255;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
694 numOfUnknownOptions--;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
695 }
3832
d05cfaf5f0f2 minor brightness/contrast bugfix / moved some global vars into ppMode
michael
parents: 3817
diff changeset
696 }
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
697 }
2860
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
698 else if(filters[i].mask == TEMP_NOISE_FILTER)
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
699 {
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
700 int o;
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
701 int numOfNoises=0;
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
702
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
703 for(o=0; options[o]!=NULL; o++)
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
704 {
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
705 char *tail;
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
706 ppMode.maxTmpNoise[numOfNoises]=
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
707 strtol(options[o], &tail, 0);
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
708 if(tail!=options[o])
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
709 {
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
710 numOfNoises++;
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
711 numOfUnknownOptions--;
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
712 if(numOfNoises >= 3) break;
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
713 }
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
714 }
08b833fb875a temporal noise reducer in C (-pp 0x100000)
michael
parents: 2808
diff changeset
715 }
3817
365e9a92498d customizeable deblocking (2 thresholds)
michael
parents: 3779
diff changeset
716 else if(filters[i].mask == V_DEBLOCK || filters[i].mask == H_DEBLOCK)
365e9a92498d customizeable deblocking (2 thresholds)
michael
parents: 3779
diff changeset
717 {
365e9a92498d customizeable deblocking (2 thresholds)
michael
parents: 3779
diff changeset
718 int o;
365e9a92498d customizeable deblocking (2 thresholds)
michael
parents: 3779
diff changeset
719
365e9a92498d customizeable deblocking (2 thresholds)
michael
parents: 3779
diff changeset
720 for(o=0; options[o]!=NULL && o<2; o++)
365e9a92498d customizeable deblocking (2 thresholds)
michael
parents: 3779
diff changeset
721 {
365e9a92498d customizeable deblocking (2 thresholds)
michael
parents: 3779
diff changeset
722 char *tail;
365e9a92498d customizeable deblocking (2 thresholds)
michael
parents: 3779
diff changeset
723 int val= strtol(options[o], &tail, 0);
365e9a92498d customizeable deblocking (2 thresholds)
michael
parents: 3779
diff changeset
724 if(tail==options[o]) break;
365e9a92498d customizeable deblocking (2 thresholds)
michael
parents: 3779
diff changeset
725
365e9a92498d customizeable deblocking (2 thresholds)
michael
parents: 3779
diff changeset
726 numOfUnknownOptions--;
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
727 if(o==0) ppMode.baseDcDiff= val;
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
728 else ppMode.flatnessThreshold= val;
3817
365e9a92498d customizeable deblocking (2 thresholds)
michael
parents: 3779
diff changeset
729 }
365e9a92498d customizeable deblocking (2 thresholds)
michael
parents: 3779
diff changeset
730 }
3964
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
731 else if(filters[i].mask == FORCE_QUANT)
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
732 {
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
733 int o;
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
734 ppMode.forcedQuant= 15;
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
735
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
736 for(o=0; options[o]!=NULL && o<1; o++)
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
737 {
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
738 char *tail;
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
739 int val= strtol(options[o], &tail, 0);
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
740 if(tail==options[o]) break;
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
741
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
742 numOfUnknownOptions--;
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
743 ppMode.forcedQuant= val;
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
744 }
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
745 }
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
746 }
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
747 }
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
748 if(!filterNameOk) ppMode.error++;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
749 ppMode.error += numOfUnknownOptions;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
750 }
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
751
4143
d416ca893952 dont print -npp parser debug info if only -v
michael
parents: 3987
diff changeset
752 if(verbose>1) printf("pp: lumMode=%X, chromMode=%X\n", ppMode.lumMode, ppMode.chromMode);
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
753 return ppMode;
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
754 }
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
755
7985
1ab37da5b1da per context cpuCaps (idea by kabi)
michael
parents: 7984
diff changeset
756 void *pp_get_context(int width, int height, int cpuCaps){
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
757 PPContext *c= memalign(32, sizeof(PPContext));
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
758 int i;
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
759 int mbWidth = (width+15)>>4;
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
760 int mbHeight= (height+15)>>4;
7985
1ab37da5b1da per context cpuCaps (idea by kabi)
michael
parents: 7984
diff changeset
761
1ab37da5b1da per context cpuCaps (idea by kabi)
michael
parents: 7984
diff changeset
762 c->cpuCaps= cpuCaps;
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
763
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
764 c->tempBlocks= (uint8_t*)memalign(8, 2*16*8);
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
765 c->yHistogram= (uint64_t*)memalign(8, 256*sizeof(uint64_t));
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
766 for(i=0; i<256; i++)
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
767 c->yHistogram[i]= width*height/64*15/256;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
768
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
769 for(i=0; i<3; i++)
3987
a80d0b59ca0e fixed -npp help ... i think i need more sleep ;)
michael
parents: 3976
diff changeset
770 {
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
771 //Note:the +17*1024 is just there so i dont have to worry about r/w over te end
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
772 c->tempBlured[i]= (uint8_t*)memalign(8, ((width+7)&(~7))*2*((height+7)&(~7)) + 17*1024); //FIXME dstStride instead of width
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
773 c->tempBluredPast[i]= (uint32_t*)memalign(8, 256*((height+7)&(~7))/2 + 17*1024);
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
774
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
775 memset(c->tempBlured[i], 0, ((width+7)&(~7))*2*((height+7)&(~7)) + 17*1024);
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
776 memset(c->tempBluredPast[i], 0, 256*((height+7)&(~7))/2 + 17*1024);
3987
a80d0b59ca0e fixed -npp help ... i think i need more sleep ;)
michael
parents: 3976
diff changeset
777 }
a80d0b59ca0e fixed -npp help ... i think i need more sleep ;)
michael
parents: 3976
diff changeset
778
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
779 c->tempDst= (uint8_t*)memalign(8, 1024*24);
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
780 c->tempSrc= (uint8_t*)memalign(8, 1024*24);
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
781 c->tempDstBlock= (uint8_t*)memalign(8, 1024*24);
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
782 c->tempSrcBlock= (uint8_t*)memalign(8, 1024*24);
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
783 c->deintTemp= (uint8_t*)memalign(8, width+16);
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
784 c->nonBQPTable= (QP_STORE_T*)memalign(8, mbWidth*mbHeight*sizeof(QP_STORE_T));
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
785 memset(c->nonBQPTable, 0, mbWidth*mbHeight*sizeof(QP_STORE_T));
3771
a14b3a600b81 new -pp options stuff (-npp ...)
michael
parents: 3151
diff changeset
786
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
787 c->frameNum=-1;
3771
a14b3a600b81 new -pp options stuff (-npp ...)
michael
parents: 3151
diff changeset
788
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
789 return c;
3771
a14b3a600b81 new -pp options stuff (-npp ...)
michael
parents: 3151
diff changeset
790 }
a14b3a600b81 new -pp options stuff (-npp ...)
michael
parents: 3151
diff changeset
791
7961
78e0f2776da7 cosmetics ;)
michael
parents: 7960
diff changeset
792 void pp_free_context(void *vc){
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
793 PPContext *c = (PPContext*)vc;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
794 int i;
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
795
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
796 for(i=0; i<3; i++) free(c->tempBlured[i]);
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
797 for(i=0; i<3; i++) free(c->tempBluredPast[i]);
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
798
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
799 free(c->tempBlocks);
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
800 free(c->yHistogram);
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
801 free(c->tempDst);
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
802 free(c->tempSrc);
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
803 free(c->tempDstBlock);
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
804 free(c->tempSrcBlock);
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
805 free(c->deintTemp);
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
806 free(c->nonBQPTable);
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
807
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
808 free(c);
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
809 }
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
810
7961
78e0f2776da7 cosmetics ;)
michael
parents: 7960
diff changeset
811 void pp_postprocess(uint8_t * src[3], int srcStride[3],
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
812 uint8_t * dst[3], int dstStride[3],
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
813 int width, int height,
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
814 QP_STORE_T *QP_store, int QPStride,
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
815 PPMode *mode, void *vc, int pict_type)
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
816 {
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
817 int mbWidth = (width+15)>>4;
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
818 int mbHeight= (height+15)>>4;
3964
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
819 QP_STORE_T quantArray[2048/8];
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
820 PPContext *c = (PPContext*)vc;
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
821
3964
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
822 if(QP_store==NULL || (mode->lumMode & FORCE_QUANT))
2808
a78ac799a300 QP_store==null bugfix and no opendivx bugfix
michael
parents: 2775
diff changeset
823 {
3964
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
824 int i;
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
825 QP_store= quantArray;
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
826 QPStride= 0;
3964
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
827 if(mode->lumMode & FORCE_QUANT)
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
828 for(i=0; i<2048/8; i++) quantArray[i]= mode->forcedQuant;
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
829 else
4911e2fc554b -npp fq:<quantizer>
michael
parents: 3832
diff changeset
830 for(i=0; i<2048/8; i++) quantArray[i]= 1;
2808
a78ac799a300 QP_store==null bugfix and no opendivx bugfix
michael
parents: 2775
diff changeset
831 }
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
832 if(0){
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
833 int x,y;
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
834 for(y=0; y<mbHeight; y++){
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
835 for(x=0; x<mbWidth; x++){
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
836 printf("%2d ", QP_store[x + y*QPStride]);
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
837 }
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
838 printf("\n");
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
839 }
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
840 printf("\n");
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
841 }
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
842 //printf("pict_type:%d\n", pict_type);
7968
michael
parents: 7963
diff changeset
843
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
844 if(pict_type!=3)
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
845 {
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
846 int x,y;
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
847 for(y=0; y<mbHeight; y++){
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
848 for(x=0; x<mbWidth; x++){
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
849 int qscale= QP_store[x + y*QPStride];
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
850 if(qscale&~31)
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
851 qscale=31;
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
852 c->nonBQPTable[y*mbWidth + x]= qscale;
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
853 }
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
854 }
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
855 }
2808
a78ac799a300 QP_store==null bugfix and no opendivx bugfix
michael
parents: 2775
diff changeset
856
7963
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
857 if(verbose>2)
4143
d416ca893952 dont print -npp parser debug info if only -v
michael
parents: 3987
diff changeset
858 {
d416ca893952 dont print -npp parser debug info if only -v
michael
parents: 3987
diff changeset
859 printf("using npp filters 0x%X/0x%X\n", mode->lumMode, mode->chromMode);
d416ca893952 dont print -npp parser debug info if only -v
michael
parents: 3987
diff changeset
860 }
d416ca893952 dont print -npp parser debug info if only -v
michael
parents: 3987
diff changeset
861
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
862 postProcess(src[0], srcStride[0], dst[0], dstStride[0],
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
863 width, height, QP_store, QPStride, 0, mode, c);
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
864
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
865 width = (width +1)>>1;
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
866 height = (height+1)>>1;
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
867
3094
4150aff2ac17 use fastmemcpy for chrominance if no chrominance filtering is done
michael
parents: 3093
diff changeset
868 if(mode->chromMode)
4150aff2ac17 use fastmemcpy for chrominance if no chrominance filtering is done
michael
parents: 3093
diff changeset
869 {
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
870 postProcess(src[1], srcStride[1], dst[1], dstStride[1],
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
871 width, height, QP_store, QPStride, 1, mode, c);
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
872 postProcess(src[2], srcStride[2], dst[2], dstStride[2],
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
873 width, height, QP_store, QPStride, 2, mode, c);
3094
4150aff2ac17 use fastmemcpy for chrominance if no chrominance filtering is done
michael
parents: 3093
diff changeset
874 }
7946
f483ab704252 postprocessing cleanup:
michael
parents: 6164
diff changeset
875 else if(srcStride[1] == dstStride[1] && srcStride[2] == dstStride[2])
3094
4150aff2ac17 use fastmemcpy for chrominance if no chrominance filtering is done
michael
parents: 3093
diff changeset
876 {
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
877 memcpy(dst[1], src[1], srcStride[1]*height);
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
878 memcpy(dst[2], src[2], srcStride[2]*height);
3094
4150aff2ac17 use fastmemcpy for chrominance if no chrominance filtering is done
michael
parents: 3093
diff changeset
879 }
4150aff2ac17 use fastmemcpy for chrominance if no chrominance filtering is done
michael
parents: 3093
diff changeset
880 else
4150aff2ac17 use fastmemcpy for chrominance if no chrominance filtering is done
michael
parents: 3093
diff changeset
881 {
4150aff2ac17 use fastmemcpy for chrominance if no chrominance filtering is done
michael
parents: 3093
diff changeset
882 int y;
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
883 for(y=0; y<height; y++)
3094
4150aff2ac17 use fastmemcpy for chrominance if no chrominance filtering is done
michael
parents: 3093
diff changeset
884 {
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
885 memcpy(&(dst[1][y*dstStride[1]]), &(src[1][y*srcStride[1]]), width);
0a4ab841ae29 better deblocking filter
michael
parents: 7946
diff changeset
886 memcpy(&(dst[2][y*dstStride[2]]), &(src[2][y*srcStride[2]]), width);
3094
4150aff2ac17 use fastmemcpy for chrominance if no chrominance filtering is done
michael
parents: 3093
diff changeset
887 }
4150aff2ac17 use fastmemcpy for chrominance if no chrominance filtering is done
michael
parents: 3093
diff changeset
888 }
2389
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
889 }
bd3f33e7dd26 auto brightness/ contrast bugfix
michael
parents: 2300
diff changeset
890