annotate postproc/postprocess.c @ 4465:b013d01d9968

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