annotate libpostproc/postprocess.c @ 798:50ae708fc721 libavcodec

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