annotate libpostproc/postprocess.c @ 791:4f61ca80b6c1 libavcodec

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