annotate postproc/postprocess.c @ 7960:0a4ab841ae29

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