diff options
Diffstat (limited to 'postproc/postprocess_template.c')
| -rw-r--r-- | postproc/postprocess_template.c | 828 |
1 files changed, 57 insertions, 771 deletions
diff --git a/postproc/postprocess_template.c b/postproc/postprocess_template.c index a2e9174b70..3908c817d6 100644 --- a/postproc/postprocess_template.c +++ b/postproc/postprocess_template.c @@ -16,76 +16,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* - C MMX MMX2 3DNow -isVertDC Ec Ec -isVertMinMaxOk Ec Ec -doVertLowPass E e e -doVertDefFilter Ec Ec e e -isHorizDC Ec Ec -isHorizMinMaxOk a E -doHorizLowPass E e e -doHorizDefFilter Ec Ec e e -deRing E e e* -Vertical RKAlgo1 E a a -Horizontal RKAlgo1 a a -Vertical X1# a E E -Horizontal X1# a E E -LinIpolDeinterlace e E E* -CubicIpolDeinterlace a e e* -LinBlendDeinterlace e E E* -MedianDeinterlace# Ec Ec -TempDeNoiser# E e e - -* i dont have a 3dnow CPU -> its untested, but noone said it doesnt work so it seems to work -# more or less selfinvented filters so the exactness isnt too meaningfull -E = Exact implementation -e = allmost exact implementation (slightly different rounding,...) -a = alternative / approximate impl -c = checked against the other implementations (-vo md5) -*/ - -/* -TODO: -reduce the time wasted on the mem transfer -implement everything in C at least (done at the moment but ...) -unroll stuff if instructions depend too much on the prior one -we use 8x8 blocks for the horizontal filters, opendivx seems to use 8x4? -move YScale thing to the end instead of fixing QP -write a faster and higher quality deblocking filter :) -make the mainloop more flexible (variable number of blocks at once - (the if/else stuff per block is slowing things down) -compare the quality & speed of all filters -split this huge file -border remover -optimize c versions -try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks -smart blur -commandline option for the deblock / dering thresholds -... -*/ - -//Changelog: use the CVS log - -#include "../config.h" -#include <inttypes.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#ifdef HAVE_MALLOC_H -#include <malloc.h> -#endif -//#undef HAVE_MMX2 -//#define HAVE_3DNOW -//#undef HAVE_MMX -//#define DEBUG_BRIGHTNESS -#include "../libvo/fastmemcpy.h" -#include "postprocess.h" - -#define MIN(a,b) ((a) > (b) ? (b) : (a)) -#define MAX(a,b) ((a) < (b) ? (b) : (a)) -#define ABS(a) ((a) > 0 ? (a) : (-(a))) -#define SIGN(a) ((a) > 0 ? 1 : -1) +#undef PAVGB +#undef PMINUB +#undef PMAXUB #ifdef HAVE_MMX2 #define PAVGB(a,b) "pavgb " #a ", " #b " \n\t" @@ -111,150 +44,11 @@ commandline option for the deblock / dering thresholds #endif -#define GET_MODE_BUFFER_SIZE 500 -#define OPTIONS_ARRAY_SIZE 10 - -#ifdef HAVE_MMX -static volatile uint64_t __attribute__((aligned(8))) packedYOffset= 0x0000000000000000LL; -static volatile uint64_t __attribute__((aligned(8))) packedYScale= 0x0100010001000100LL; -static uint64_t __attribute__((aligned(8))) w05= 0x0005000500050005LL; -static uint64_t __attribute__((aligned(8))) w20= 0x0020002000200020LL; -static uint64_t __attribute__((aligned(8))) w1400= 0x1400140014001400LL; -static uint64_t __attribute__((aligned(8))) bm00000001= 0x00000000000000FFLL; -static uint64_t __attribute__((aligned(8))) bm00010000= 0x000000FF00000000LL; -static uint64_t __attribute__((aligned(8))) bm00001000= 0x00000000FF000000LL; -static uint64_t __attribute__((aligned(8))) bm10000000= 0xFF00000000000000LL; -static uint64_t __attribute__((aligned(8))) bm10000001= 0xFF000000000000FFLL; -static uint64_t __attribute__((aligned(8))) bm11000011= 0xFFFF00000000FFFFLL; -static uint64_t __attribute__((aligned(8))) bm00000011= 0x000000000000FFFFLL; -static uint64_t __attribute__((aligned(8))) bm11111110= 0xFFFFFFFFFFFFFF00LL; -static uint64_t __attribute__((aligned(8))) bm11000000= 0xFFFF000000000000LL; -static uint64_t __attribute__((aligned(8))) bm00011000= 0x000000FFFF000000LL; -static uint64_t __attribute__((aligned(8))) bm00110011= 0x0000FFFF0000FFFFLL; -static uint64_t __attribute__((aligned(8))) bm11001100= 0xFFFF0000FFFF0000LL; -static uint64_t __attribute__((aligned(8))) b00= 0x0000000000000000LL; -static uint64_t __attribute__((aligned(8))) b01= 0x0101010101010101LL; -static uint64_t __attribute__((aligned(8))) b02= 0x0202020202020202LL; -static uint64_t __attribute__((aligned(8))) b0F= 0x0F0F0F0F0F0F0F0FLL; -static uint64_t __attribute__((aligned(8))) b04= 0x0404040404040404LL; -static uint64_t __attribute__((aligned(8))) b08= 0x0808080808080808LL; -static uint64_t __attribute__((aligned(8))) bFF= 0xFFFFFFFFFFFFFFFFLL; -static uint64_t __attribute__((aligned(8))) b20= 0x2020202020202020LL; -static uint64_t __attribute__((aligned(8))) b80= 0x8080808080808080LL; -static uint64_t __attribute__((aligned(8))) b7E= 0x7E7E7E7E7E7E7E7ELL; -static uint64_t __attribute__((aligned(8))) b7C= 0x7C7C7C7C7C7C7C7CLL; -static uint64_t __attribute__((aligned(8))) b3F= 0x3F3F3F3F3F3F3F3FLL; -static uint64_t __attribute__((aligned(8))) temp0=0; -static uint64_t __attribute__((aligned(8))) temp1=0; -static uint64_t __attribute__((aligned(8))) temp2=0; -static uint64_t __attribute__((aligned(8))) temp3=0; -static uint64_t __attribute__((aligned(8))) temp4=0; -static uint64_t __attribute__((aligned(8))) temp5=0; -static uint64_t __attribute__((aligned(8))) pQPb=0; -static uint64_t __attribute__((aligned(8))) pQPb2=0; -static uint8_t __attribute__((aligned(8))) tempBlocks[8*16*2]; //used for the horizontal code -static uint32_t __attribute__((aligned(4))) maxTmpNoise[4]; -#else -static uint64_t packedYOffset= 0x0000000000000000LL; -static uint64_t packedYScale= 0x0100010001000100LL; -static uint8_t tempBlocks[8*16*2]; //used for the horizontal code -#endif - -int hFlatnessThreshold= 56 - 16; -int vFlatnessThreshold= 56 - 16; -int deringThreshold= 20; - -//amount of "black" u r willing to loose to get a brightness corrected picture -double maxClippedThreshold= 0.01; - -int maxAllowedY=234; -int minAllowedY=16; - -static struct PPFilter filters[]= -{ - {"hb", "hdeblock", 1, 1, 3, H_DEBLOCK}, - {"vb", "vdeblock", 1, 2, 4, V_DEBLOCK}, - {"vr", "rkvdeblock", 1, 2, 4, H_RK1_FILTER}, - {"h1", "x1hdeblock", 1, 1, 3, H_X1_FILTER}, - {"v1", "x1vdeblock", 1, 2, 4, V_X1_FILTER}, - {"dr", "dering", 1, 5, 6, DERING}, - {"al", "autolevels", 0, 1, 2, LEVEL_FIX}, - {"lb", "linblenddeint", 0, 1, 6, LINEAR_BLEND_DEINT_FILTER}, - {"li", "linipoldeint", 0, 1, 6, LINEAR_IPOL_DEINT_FILTER}, - {"ci", "cubicipoldeint", 0, 1, 6, CUBIC_IPOL_DEINT_FILTER}, - {"md", "mediandeint", 0, 1, 6, MEDIAN_DEINT_FILTER}, - {"tn", "tmpnoise", 1, 7, 8, TEMP_NOISE_FILTER}, - {NULL, NULL,0,0,0,0} //End Marker -}; - -static char *replaceTable[]= -{ - "default", "hdeblock:a,vdeblock:a,dering:a,autolevels,tmpnoise:a:150:200:400", - "de", "hdeblock:a,vdeblock:a,dering:a,autolevels,tmpnoise:a:150:200:400", - "fast", "x1hdeblock:a,x1vdeblock:a,dering:a,autolevels,tmpnoise:a:150:200:400", - "fa", "x1hdeblock:a,x1vdeblock:a,dering:a,autolevels,tmpnoise:a:150:200:400", - NULL //End Marker -}; - -#ifdef HAVE_MMX -static inline void unusedVariableWarningFixer() -{ -if( - packedYOffset + packedYScale + w05 + w20 + w1400 + bm00000001 + bm00010000 - + bm00001000 + bm10000000 + bm10000001 + bm11000011 + bm00000011 + bm11111110 - + bm11000000 + bm00011000 + bm00110011 + bm11001100 + b00 + b01 + b02 + b0F - + bFF + b20 + b04+ b08 + pQPb2 + b80 + b7E + b7C + b3F + temp0 + temp1 + temp2 + temp3 + temp4 - + temp5 + pQPb== 0) b00=0; -} -#endif - -#ifdef TIMING -static inline long long rdtsc() -{ - long long l; - asm volatile( "rdtsc\n\t" - : "=A" (l) - ); -// printf("%d\n", int(l/1000)); - return l; -} -#endif - -#ifdef HAVE_MMX2 -static inline void prefetchnta(void *p) -{ - asm volatile( "prefetchnta (%0)\n\t" - : : "r" (p) - ); -} - -static inline void prefetcht0(void *p) -{ - asm volatile( "prefetcht0 (%0)\n\t" - : : "r" (p) - ); -} - -static inline void prefetcht1(void *p) -{ - asm volatile( "prefetcht1 (%0)\n\t" - : : "r" (p) - ); -} - -static inline void prefetcht2(void *p) -{ - asm volatile( "prefetcht2 (%0)\n\t" - : : "r" (p) - ); -} -#endif - //FIXME? |255-0| = 1 (shouldnt be a problem ...) /** * Check if the middle 8x8 Block in the given 8x16 block is flat */ -static inline int isVertDC(uint8_t src[], int stride){ +static inline int RENAME(isVertDC)(uint8_t src[], int stride){ int numEq= 0; #ifndef HAVE_MMX int y; @@ -363,7 +157,7 @@ asm volatile( return (numEq > vFlatnessThreshold) ? 1 : 0; } -static inline int isVertMinMaxOk(uint8_t src[], int stride, int QP) +static inline int RENAME(isVertMinMaxOk)(uint8_t src[], int stride, int QP) { #ifdef HAVE_MMX int isOk; @@ -420,7 +214,7 @@ static inline int isVertMinMaxOk(uint8_t src[], int stride, int QP) * Do a vertical low pass filter on the 8x16 block (only write to the 8x8 block in the middle) * using the 9-Tap Filter (1,1,2,2,4,2,2,1,1)/16 */ -static inline void doVertLowPass(uint8_t *src, int stride, int QP) +static inline void RENAME(doVertLowPass)(uint8_t *src, int stride, int QP) { #if defined (HAVE_MMX2) || defined (HAVE_3DNOW) src+= stride*3; @@ -602,7 +396,7 @@ static inline void doVertLowPass(uint8_t *src, int stride, int QP) x/8 = 1 1 12 12 23 */ -static inline void vertRK1Filter(uint8_t *src, int stride, int QP) +static inline void RENAME(vertRK1Filter)(uint8_t *src, int stride, int QP) { #if defined (HAVE_MMX2) || defined (HAVE_3DNOW) src+= stride*3; @@ -702,7 +496,7 @@ static inline void vertRK1Filter(uint8_t *src, int stride, int QP) * can only smooth blocks at the expected locations (it cant smooth them if they did move) * MMX2 version does correct clipping C version doesnt */ -static inline void vertX1Filter(uint8_t *src, int stride, int QP) +static inline void RENAME(vertX1Filter)(uint8_t *src, int stride, int QP) { #if defined (HAVE_MMX2) || defined (HAVE_3DNOW) src+= stride*3; @@ -858,44 +652,7 @@ static inline void vertX1Filter(uint8_t *src, int stride, int QP) #endif } -/** - * Experimental Filter 1 (Horizontal) - * will not damage linear gradients - * Flat blocks should look like they where passed through the (1,1,2,2,4,2,2,1,1) 9-Tap filter - * can only smooth blocks at the expected locations (it cant smooth them if they did move) - * MMX2 version does correct clipping C version doesnt - * not identical with the vertical one - */ -static inline void horizX1Filter(uint8_t *src, int stride, int QP) -{ - int y; -//FIXME (has little in common with the mmx2 version) - for(y=0; y<BLOCK_SIZE; y++) - { - int a= src[1] - src[2]; - int b= src[3] - src[4]; - int c= src[5] - src[6]; - - int d= MAX(ABS(b) - (ABS(a) + ABS(c))/2, 0); - - if(d < QP) - { - int v = d * SIGN(-b); - - src[1] +=v/8; - src[2] +=v/4; - src[3] +=3*v/8; - src[4] -=3*v/8; - src[5] -=v/4; - src[6] -=v/8; - - } - src+=stride; - } -} - - -static inline void doVertDefFilter(uint8_t src[], int stride, int QP) +static inline void RENAME(doVertDefFilter)(uint8_t src[], int stride, int QP) { #if defined (HAVE_MMX2) || defined (HAVE_3DNOW) /* @@ -1474,110 +1231,7 @@ src-=8; #endif } -/** - * Check if the given 8x8 Block is mostly "flat" - */ -static inline int isHorizDC(uint8_t src[], int stride) -{ - int numEq= 0; - int y; - for(y=0; y<BLOCK_SIZE; y++) - { - if(((src[0] - src[1] + 1) & 0xFFFF) < 3) numEq++; - if(((src[1] - src[2] + 1) & 0xFFFF) < 3) numEq++; - if(((src[2] - src[3] + 1) & 0xFFFF) < 3) numEq++; - if(((src[3] - src[4] + 1) & 0xFFFF) < 3) numEq++; - if(((src[4] - src[5] + 1) & 0xFFFF) < 3) numEq++; - if(((src[5] - src[6] + 1) & 0xFFFF) < 3) numEq++; - if(((src[6] - src[7] + 1) & 0xFFFF) < 3) numEq++; - src+= stride; - } - return numEq > hFlatnessThreshold; -} - -static inline int isHorizMinMaxOk(uint8_t src[], int stride, int QP) -{ - if(abs(src[0] - src[7]) > 2*QP) return 0; - - return 1; -} - -static inline void doHorizDefFilter(uint8_t dst[], int stride, int QP) -{ - int y; - for(y=0; y<BLOCK_SIZE; y++) - { - const int middleEnergy= 5*(dst[4] - dst[5]) + 2*(dst[2] - dst[5]); - - if(ABS(middleEnergy) < 8*QP) - { - const int q=(dst[3] - dst[4])/2; - const int leftEnergy= 5*(dst[2] - dst[1]) + 2*(dst[0] - dst[3]); - const int rightEnergy= 5*(dst[6] - dst[5]) + 2*(dst[4] - dst[7]); - - int d= ABS(middleEnergy) - MIN( ABS(leftEnergy), ABS(rightEnergy) ); - d= MAX(d, 0); - - d= (5*d + 32) >> 6; - d*= SIGN(-middleEnergy); - - if(q>0) - { - d= d<0 ? 0 : d; - d= d>q ? q : d; - } - else - { - d= d>0 ? 0 : d; - d= d<q ? q : d; - } - - dst[3]-= d; - dst[4]+= d; - } - dst+= stride; - } -} - -/** - * Do a horizontal low pass filter on the 10x8 block (dst points to middle 8x8 Block) - * using the 9-Tap Filter (1,1,2,2,4,2,2,1,1)/16 (C version) - */ -static inline void doHorizLowPass(uint8_t dst[], int stride, int QP) -{ - - int y; - for(y=0; y<BLOCK_SIZE; y++) - { - const int first= ABS(dst[-1] - dst[0]) < QP ? dst[-1] : dst[0]; - const int last= ABS(dst[8] - dst[7]) < QP ? dst[8] : dst[7]; - - int sums[9]; - sums[0] = first + dst[0]; - sums[1] = dst[0] + dst[1]; - sums[2] = dst[1] + dst[2]; - sums[3] = dst[2] + dst[3]; - sums[4] = dst[3] + dst[4]; - sums[5] = dst[4] + dst[5]; - sums[6] = dst[5] + dst[6]; - sums[7] = dst[6] + dst[7]; - sums[8] = dst[7] + last; - - dst[0]= ((sums[0]<<2) + ((first + sums[2])<<1) + sums[4] + 8)>>4; - dst[1]= ((dst[1]<<2) + ((first + sums[0] + sums[3])<<1) + sums[5] + 8)>>4; - dst[2]= ((dst[2]<<2) + ((first + sums[1] + sums[4])<<1) + sums[6] + 8)>>4; - dst[3]= ((dst[3]<<2) + ((sums[2] + sums[5])<<1) + sums[0] + sums[7] + 8)>>4; - dst[4]= ((dst[4]<<2) + ((sums[3] + sums[6])<<1) + sums[1] + sums[8] + 8)>>4; - dst[5]= ((dst[5]<<2) + ((last + sums[7] + sums[4])<<1) + sums[2] + 8)>>4; - dst[6]= (((last + dst[6])<<2) + ((dst[7] + sums[5])<<1) + sums[3] + 8)>>4; - dst[7]= ((sums[8]<<2) + ((last + sums[6])<<1) + sums[4] + 8)>>4; - - dst+= stride; - } -} - - -static inline void dering(uint8_t src[], int stride, int QP) +static inline void RENAME(dering)(uint8_t src[], int stride, int QP) { #if defined (HAVE_MMX2) || defined (HAVE_3DNOW) asm volatile( @@ -1592,6 +1246,7 @@ static inline void dering(uint8_t src[], int stride, int QP) "pcmpeqb %%mm7, %%mm7 \n\t" "pxor %%mm6, %%mm6 \n\t" +#undef FIND_MIN_MAX #ifdef HAVE_MMX2 #define FIND_MIN_MAX(addr)\ "movq " #addr ", %%mm0 \n\t"\ @@ -1920,7 +1575,7 @@ DERING_CORE((%0, %1, 8),(%%ebx, %1, 4) ,%%mm2,%%mm4,%%mm0,%%mm3,%%mm5,%%mm1,%%mm * lines 0-3 have been passed through the deblock / dering filters allready, but can be read too * lines 4-12 will be read into the deblocking filter and should be deinterlaced */ -static inline void deInterlaceInterpolateLinear(uint8_t src[], int stride) +static inline void RENAME(deInterlaceInterpolateLinear)(uint8_t src[], int stride) { #if defined (HAVE_MMX2) || defined (HAVE_3DNOW) src+= 4*stride; @@ -1969,7 +1624,7 @@ static inline void deInterlaceInterpolateLinear(uint8_t src[], int stride) * this filter will read lines 3-15 and write 7-13 * no cliping in C version */ -static inline void deInterlaceInterpolateCubic(uint8_t src[], int stride) +static inline void RENAME(deInterlaceInterpolateCubic)(uint8_t src[], int stride) { #if defined (HAVE_MMX2) || defined (HAVE_3DNOW) src+= stride*3; @@ -2034,7 +1689,7 @@ DEINT_CUBIC((%%ebx, %1), (%0, %1, 8), (%%ebx, %1, 4), (%%ecx), (%%ecx, %1, 2)) * will shift the image up by 1 line (FIXME if this is a problem) * this filter will read lines 4-13 and write 4-11 */ -static inline void deInterlaceBlendLinear(uint8_t src[], int stride) +static inline void RENAME(deInterlaceBlendLinear)(uint8_t src[], int stride) { #if defined (HAVE_MMX2) || defined (HAVE_3DNOW) src+= 4*stride; @@ -2107,7 +1762,7 @@ static inline void deInterlaceBlendLinear(uint8_t src[], int stride) * lines 0-3 have been passed through the deblock / dering filters allready, but can be read too * lines 4-12 will be read into the deblocking filter and should be deinterlaced */ -static inline void deInterlaceMedian(uint8_t src[], int stride) +static inline void RENAME(deInterlaceMedian)(uint8_t src[], int stride) { #ifdef HAVE_MMX src+= 4*stride; @@ -2224,7 +1879,7 @@ MEDIAN((%%ebx, %1), (%%ebx, %1, 2), (%0, %1, 8)) /** * transposes and shift the given 8x8 Block into dst1 and dst2 */ -static inline void transpose1(uint8_t *dst1, uint8_t *dst2, uint8_t *src, int srcStride) +static inline void RENAME(transpose1)(uint8_t *dst1, uint8_t *dst2, uint8_t *src, int srcStride) { asm( "leal (%0, %1), %%eax \n\t" @@ -2308,7 +1963,7 @@ static inline void transpose1(uint8_t *dst1, uint8_t *dst2, uint8_t *src, int sr /** * transposes the given 8x8 block */ -static inline void transpose2(uint8_t *dst, int dstStride, uint8_t *src) +static inline void RENAME(transpose2)(uint8_t *dst, int dstStride, uint8_t *src) { asm( "leal (%0, %1), %%eax \n\t" @@ -2387,7 +2042,7 @@ static inline void transpose2(uint8_t *dst, int dstStride, uint8_t *src) #endif //static int test=0; -static void inline tempNoiseReducer(uint8_t *src, int stride, +static void inline RENAME(tempNoiseReducer)(uint8_t *src, int stride, uint8_t *tempBlured, uint32_t *tempBluredPast, int *maxNoise) { #define FAST_L2_DIFF @@ -2786,388 +2441,15 @@ Switch between #endif } -#ifdef HAVE_ODIVX_POSTPROCESS -#include "../opendivx/postprocess.h" -int use_old_pp=0; -#endif - -static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height, +static void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height, QP_STORE_T QPs[], int QPStride, int isColor, struct PPMode *ppMode); -/* -pp Command line Help -NOTE/FIXME: put this at an appropriate place (--help, html docs, man mplayer)? - --pp <filterName>[:<option>[:<option>...]][,[-]<filterName>[:<option>...]]... - -long form example: --pp vdeblock:autoq,hdeblock:autoq,linblenddeint -pp default,-vdeblock -short form example: --pp vb:a,hb:a,lb -pp de,-vb -more examples: --pp tn:64:128:256 - -Filters Options -short long name short long option Description -* * a autoq cpu power dependant enabler - c chrom chrominance filtring enabled - y nochrom chrominance filtring disabled -hb hdeblock horizontal deblocking filter -vb vdeblock vertical deblocking filter -vr rkvdeblock -h1 x1hdeblock Experimental horizontal deblock filter 1 -v1 x1vdeblock Experimental vertical deblock filter 1 -dr dering not implemented yet -al autolevels automatic brightness / contrast fixer - f fullyrange stretch luminance range to (0..255) -lb linblenddeint linear blend deinterlacer -li linipoldeint linear interpolating deinterlacer -ci cubicipoldeint cubic interpolating deinterlacer -md mediandeint median deinterlacer -de default hdeblock:a,vdeblock:a,dering:a,autolevels -fa fast x1hdeblock:a,x1vdeblock:a,dering:a,autolevels -tn tmpnoise (3 Thresholds) Temporal Noise Reducer -*/ - -/** - * returns a PPMode struct which will have a non 0 error variable if an error occured - * name is the string after "-pp" on the command line - * quality is a number from 0 to GET_PP_QUALITY_MAX - */ -struct PPMode getPPModeByNameAndQuality(char *name, int quality) -{ - char temp[GET_MODE_BUFFER_SIZE]; - char *p= temp; - char *filterDelimiters= ","; - char *optionDelimiters= ":"; - struct PPMode ppMode= {0,0,0,0,0,0,{150,200,400}}; - char *filterToken; - - strncpy(temp, name, GET_MODE_BUFFER_SIZE); - - printf("%s\n", name); - - for(;;){ - char *filterName; - int q= 1000000; //GET_PP_QUALITY_MAX; - int chrom=-1; - char *option; - char *options[OPTIONS_ARRAY_SIZE]; - int i; - int filterNameOk=0; - int numOfUnknownOptions=0; - int enable=1; //does the user want us to enabled or disabled the filter - - filterToken= strtok(p, filterDelimiters); - if(filterToken == NULL) break; - p+= strlen(filterToken) + 1; // p points to next filterToken - filterName= strtok(filterToken, optionDelimiters); - printf("%s::%s\n", filterToken, filterName); - - if(*filterName == '-') - { - enable=0; - filterName++; - } - - for(;;){ //for all options - option= strtok(NULL, optionDelimiters); - if(option == NULL) break; - - printf("%s\n", option); - if(!strcmp("autoq", option) || !strcmp("a", option)) q= quality; - else if(!strcmp("nochrom", option) || !strcmp("y", option)) chrom=0; - else if(!strcmp("chrom", option) || !strcmp("c", option)) chrom=1; - else - { - options[numOfUnknownOptions] = option; - numOfUnknownOptions++; - } - if(numOfUnknownOptions >= OPTIONS_ARRAY_SIZE-1) break; - } - options[numOfUnknownOptions] = NULL; - - /* replace stuff from the replace Table */ - for(i=0; replaceTable[2*i]!=NULL; i++) - { - if(!strcmp(replaceTable[2*i], filterName)) - { - int newlen= strlen(replaceTable[2*i + 1]); - int plen; - int spaceLeft; - - if(p==NULL) p= temp, *p=0; //last filter - else p--, *p=','; //not last filter - - plen= strlen(p); - spaceLeft= (int)p - (int)temp + plen; - if(spaceLeft + newlen >= GET_MODE_BUFFER_SIZE) - { - ppMode.error++; - break; - } - memmove(p + newlen, p, plen+1); - memcpy(p, replaceTable[2*i + 1], newlen); - filterNameOk=1; - } - } - - for(i=0; filters[i].shortName!=NULL; i++) - { -// printf("Compareing %s, %s, %s\n", filters[i].shortName,filters[i].longName, filterName); - if( !strcmp(filters[i].longName, filterName) - || !strcmp(filters[i].shortName, filterName)) - { - ppMode.lumMode &= ~filters[i].mask; - ppMode.chromMode &= ~filters[i].mask; - - filterNameOk=1; - if(!enable) break; // user wants to disable it - - if(q >= filters[i].minLumQuality) - ppMode.lumMode|= filters[i].mask; - if(chrom==1 || (chrom==-1 && filters[i].chromDefault)) - if(q >= filters[i].minChromQuality) - ppMode.chromMode|= filters[i].mask; - - if(filters[i].mask == LEVEL_FIX) - { - int o; - ppMode.minAllowedY= 16; - ppMode.maxAllowedY= 234; - for(o=0; options[o]!=NULL; o++) - if( !strcmp(options[o],"fullyrange") - ||!strcmp(options[o],"f")) - { - ppMode.minAllowedY= 0; - ppMode.maxAllowedY= 255; - numOfUnknownOptions--; - } - } - else if(filters[i].mask == TEMP_NOISE_FILTER) - { - int o; - int numOfNoises=0; - ppMode.maxTmpNoise[0]= 150; - ppMode.maxTmpNoise[1]= 200; - ppMode.maxTmpNoise[2]= 400; - - for(o=0; options[o]!=NULL; o++) - { - char *tail; - ppMode.maxTmpNoise[numOfNoises]= - strtol(options[o], &tail, 0); - if(tail!=options[o]) - { - numOfNoises++; - numOfUnknownOptions--; - if(numOfNoises >= 3) break; - } - } - } - } - } - if(!filterNameOk) ppMode.error++; - ppMode.error += numOfUnknownOptions; - } - -#ifdef HAVE_ODIVX_POSTPROCESS - if(ppMode.lumMode & H_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_Y_H; - if(ppMode.lumMode & V_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_Y_V; - if(ppMode.chromMode & H_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_C_H; - if(ppMode.chromMode & V_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_C_V; - if(ppMode.lumMode & DERING) ppMode.oldMode |= PP_DERING_Y; - if(ppMode.chromMode & DERING) ppMode.oldMode |= PP_DERING_C; -#endif - - return ppMode; -} - -/** - * Obsolete, dont use it, use postprocess2() instead - */ -void postprocess(unsigned char * src[], int src_stride, - unsigned char * dst[], int dst_stride, - int horizontal_size, int vertical_size, - QP_STORE_T *QP_store, int QP_stride, - int mode) -{ - struct PPMode ppMode; - static QP_STORE_T zeroArray[2048/8]; -/* - static int qual=0; - - ppMode= getPPModeByNameAndQuality("fast,default,-hdeblock,-vdeblock,tmpnoise:150:200:300", qual); - printf("OK\n"); - qual++; - qual%=7; - printf("\n%X %X %X %X :%d: %d %d %d\n", ppMode.lumMode, ppMode.chromMode, ppMode.oldMode, ppMode.error, - qual, ppMode.maxTmpNoise[0], ppMode.maxTmpNoise[1], ppMode.maxTmpNoise[2]); - postprocess2(src, src_stride, dst, dst_stride, - horizontal_size, vertical_size, QP_store, QP_stride, &ppMode); - - return; -*/ - if(QP_store==NULL) - { - QP_store= zeroArray; - QP_stride= 0; - } - - ppMode.lumMode= mode; - mode= ((mode&0xFF)>>4) | (mode&0xFFFFFF00); - ppMode.chromMode= mode; - ppMode.maxTmpNoise[0]= 700; - ppMode.maxTmpNoise[1]= 1500; - ppMode.maxTmpNoise[2]= 3000; - -#ifdef HAVE_ODIVX_POSTPROCESS -// Note: I could make this shit outside of this file, but it would mean one -// more function call... - if(use_old_pp){ - odivx_postprocess(src,src_stride,dst,dst_stride,horizontal_size,vertical_size,QP_store,QP_stride,mode); - return; - } -#endif - - postProcess(src[0], src_stride, dst[0], dst_stride, - horizontal_size, vertical_size, QP_store, QP_stride, 0, &ppMode); - - horizontal_size >>= 1; - vertical_size >>= 1; - src_stride >>= 1; - dst_stride >>= 1; - - if(ppMode.chromMode) - { - postProcess(src[1], src_stride, dst[1], dst_stride, - horizontal_size, vertical_size, QP_store, QP_stride, 1, &ppMode); - postProcess(src[2], src_stride, dst[2], dst_stride, - horizontal_size, vertical_size, QP_store, QP_stride, 2, &ppMode); - } - else if(src_stride == dst_stride) - { - memcpy(dst[1], src[1], src_stride*vertical_size); - memcpy(dst[2], src[2], src_stride*vertical_size); - } - else - { - int y; - for(y=0; y<vertical_size; y++) - { - memcpy(&(dst[1][y*dst_stride]), &(src[1][y*src_stride]), horizontal_size); - memcpy(&(dst[2][y*dst_stride]), &(src[2][y*src_stride]), horizontal_size); - } - } - -#if 0 - memset(dst[1], 128, dst_stride*vertical_size); - memset(dst[2], 128, dst_stride*vertical_size); -#endif -} - -void postprocess2(unsigned char * src[], int src_stride, - unsigned char * dst[], int dst_stride, - int horizontal_size, int vertical_size, - QP_STORE_T *QP_store, int QP_stride, - struct PPMode *mode) -{ - - static QP_STORE_T zeroArray[2048/8]; - if(QP_store==NULL) - { - QP_store= zeroArray; - QP_stride= 0; - } - -#ifdef HAVE_ODIVX_POSTPROCESS -// Note: I could make this shit outside of this file, but it would mean one -// more function call... - if(use_old_pp){ - odivx_postprocess(src,src_stride,dst,dst_stride,horizontal_size,vertical_size,QP_store,QP_stride, - mode->oldMode); - return; - } -#endif - - postProcess(src[0], src_stride, dst[0], dst_stride, - horizontal_size, vertical_size, QP_store, QP_stride, 0, mode); - - horizontal_size >>= 1; - vertical_size >>= 1; - src_stride >>= 1; - dst_stride >>= 1; - - if(mode->chromMode) - { - postProcess(src[1], src_stride, dst[1], dst_stride, - horizontal_size, vertical_size, QP_store, QP_stride, 1, mode); - postProcess(src[2], src_stride, dst[2], dst_stride, - horizontal_size, vertical_size, QP_store, QP_stride, 2, mode); - } - else if(src_stride == dst_stride) - { - memcpy(dst[1], src[1], src_stride*vertical_size); - memcpy(dst[2], src[2], src_stride*vertical_size); - } - else - { - int y; - for(y=0; y<vertical_size; y++) - { - memcpy(&(dst[1][y*dst_stride]), &(src[1][y*src_stride]), horizontal_size); - memcpy(&(dst[2][y*dst_stride]), &(src[2][y*src_stride]), horizontal_size); - } - } -} - - -/** - * gets the mode flags for a given quality (larger values mean slower but better postprocessing) - * 0 <= quality <= 6 - */ -int getPpModeForQuality(int quality){ - int modes[1+GET_PP_QUALITY_MAX]= { - 0, -#if 1 - // horizontal filters first - LUM_H_DEBLOCK, - LUM_H_DEBLOCK | LUM_V_DEBLOCK, - LUM_H_DEBLOCK | LUM_V_DEBLOCK | CHROM_H_DEBLOCK, - LUM_H_DEBLOCK | LUM_V_DEBLOCK | CHROM_H_DEBLOCK | CHROM_V_DEBLOCK, - LUM_H_DEBLOCK | LUM_V_DEBLOCK | CHROM_H_DEBLOCK | CHROM_V_DEBLOCK | LUM_DERING, - LUM_H_DEBLOCK | LUM_V_DEBLOCK | CHROM_H_DEBLOCK | CHROM_V_DEBLOCK | LUM_DERING | CHROM_DERING -#else - // vertical filters first - LUM_V_DEBLOCK, - LUM_V_DEBLOCK | LUM_H_DEBLOCK, - LUM_V_DEBLOCK | LUM_H_DEBLOCK | CHROM_V_DEBLOCK, - LUM_V_DEBLOCK | LUM_H_DEBLOCK | CHROM_V_DEBLOCK | CHROM_H_DEBLOCK, - LUM_V_DEBLOCK | LUM_H_DEBLOCK | CHROM_V_DEBLOCK | CHROM_H_DEBLOCK | LUM_DERING, - LUM_V_DEBLOCK | LUM_H_DEBLOCK | CHROM_V_DEBLOCK | CHROM_H_DEBLOCK | LUM_DERING | CHROM_DERING -#endif - }; - -#ifdef HAVE_ODIVX_POSTPROCESS - int odivx_modes[1+GET_PP_QUALITY_MAX]= { - 0, - PP_DEBLOCK_Y_H, - PP_DEBLOCK_Y_H|PP_DEBLOCK_Y_V, - PP_DEBLOCK_Y_H|PP_DEBLOCK_Y_V|PP_DEBLOCK_C_H, - PP_DEBLOCK_Y_H|PP_DEBLOCK_Y_V|PP_DEBLOCK_C_H|PP_DEBLOCK_C_V, - PP_DEBLOCK_Y_H|PP_DEBLOCK_Y_V|PP_DEBLOCK_C_H|PP_DEBLOCK_C_V|PP_DERING_Y, - PP_DEBLOCK_Y_H|PP_DEBLOCK_Y_V|PP_DEBLOCK_C_H|PP_DEBLOCK_C_V|PP_DERING_Y|PP_DERING_C - }; - if(use_old_pp) return odivx_modes[quality]; -#endif - return modes[quality]; -} - /** * Copies a block from src to dst and fixes the blacklevel * numLines must be a multiple of 4 * levelFix == 0 -> dont touch the brighness & contrast */ -static inline void blockCopy(uint8_t dst[], int dstStride, uint8_t src[], int srcStride, +static inline void RENAME(blockCopy)(uint8_t dst[], int dstStride, uint8_t src[], int srcStride, int levelFix) { #ifndef HAVE_MMX @@ -3267,7 +2549,7 @@ SIMPLE_CPY((%%eax, %2), (%%eax, %2, 2), (%%ebx, %3), (%%ebx, %3, 2)) /** * Filters array of bytes (Y or U or V values) */ -static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height, +static void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height, QP_STORE_T QPs[], int QPStride, int isColor, struct PPMode *ppMode) { int x,y; @@ -3463,19 +2745,19 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri */ #endif - blockCopy(dstBlock + dstStride*copyAhead, dstStride, + RENAME(blockCopy)(dstBlock + dstStride*copyAhead, dstStride, srcBlock + srcStride*copyAhead, srcStride, mode & LEVEL_FIX); if(mode & LINEAR_IPOL_DEINT_FILTER) - deInterlaceInterpolateLinear(dstBlock, dstStride); + RENAME(deInterlaceInterpolateLinear)(dstBlock, dstStride); else if(mode & LINEAR_BLEND_DEINT_FILTER) - deInterlaceBlendLinear(dstBlock, dstStride); + RENAME(deInterlaceBlendLinear)(dstBlock, dstStride); else if(mode & MEDIAN_DEINT_FILTER) - deInterlaceMedian(dstBlock, dstStride); + RENAME(deInterlaceMedian)(dstBlock, dstStride); else if(mode & CUBIC_IPOL_DEINT_FILTER) - deInterlaceInterpolateCubic(dstBlock, dstStride); + RENAME(deInterlaceInterpolateCubic)(dstBlock, dstStride); /* else if(mode & CUBIC_BLEND_DEINT_FILTER) - deInterlaceBlendCubic(dstBlock, dstStride); + RENAME(deInterlaceBlendCubic)(dstBlock, dstStride); */ dstBlock+=8; srcBlock+=8; @@ -3488,12 +2770,14 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri //1% speedup if these are here instead of the inner loop uint8_t *srcBlock= &(src[y*srcStride]); uint8_t *dstBlock= &(dst[y*dstStride]); +#ifdef HAVE_MMX + uint8_t *tempBlock1= tempBlocks; + uint8_t *tempBlock2= tempBlocks + 8; +#endif #ifdef ARCH_X86 int *QPptr= isColor ? &QPs[(y>>3)*QPStride] :&QPs[(y>>4)*QPStride]; int QPDelta= isColor ? 1<<(32-3) : 1<<(32-4); int QPFrac= QPDelta; - uint8_t *tempBlock1= tempBlocks; - uint8_t *tempBlock2= tempBlocks + 8; #endif int QP=0; /* can we mess with a 8x16 block from srcBlock/dstBlock downwards and 1 line upwards @@ -3527,7 +2811,9 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri for(x=0; x<width; x+=BLOCK_SIZE) { const int stride= dstStride; +#ifdef HAVE_MMX uint8_t *tmpXchg; +#endif #ifdef ARCH_X86 QP= *QPptr; asm volatile( @@ -3619,19 +2905,19 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri } #endif - blockCopy(dstBlock + dstStride*copyAhead, dstStride, + RENAME(blockCopy)(dstBlock + dstStride*copyAhead, dstStride, srcBlock + srcStride*copyAhead, srcStride, mode & LEVEL_FIX); if(mode & LINEAR_IPOL_DEINT_FILTER) - deInterlaceInterpolateLinear(dstBlock, dstStride); + RENAME(deInterlaceInterpolateLinear)(dstBlock, dstStride); else if(mode & LINEAR_BLEND_DEINT_FILTER) - deInterlaceBlendLinear(dstBlock, dstStride); + RENAME(deInterlaceBlendLinear)(dstBlock, dstStride); else if(mode & MEDIAN_DEINT_FILTER) - deInterlaceMedian(dstBlock, dstStride); + RENAME(deInterlaceMedian)(dstBlock, dstStride); else if(mode & CUBIC_IPOL_DEINT_FILTER) - deInterlaceInterpolateCubic(dstBlock, dstStride); + RENAME(deInterlaceInterpolateCubic)(dstBlock, dstStride); /* else if(mode & CUBIC_BLEND_DEINT_FILTER) - deInterlaceBlendCubic(dstBlock, dstStride); + RENAME(deInterlaceBlendCubic)(dstBlock, dstStride); */ /* only deblock if we have 2 blocks */ @@ -3643,18 +2929,18 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri T0=T1; #endif if(mode & V_RK1_FILTER) - vertRK1Filter(dstBlock, stride, QP); + RENAME(vertRK1Filter)(dstBlock, stride, QP); else if(mode & V_X1_FILTER) - vertX1Filter(dstBlock, stride, QP); + RENAME(vertX1Filter)(dstBlock, stride, QP); else if(mode & V_DEBLOCK) { - if( isVertDC(dstBlock, stride)) + if( RENAME(isVertDC)(dstBlock, stride)) { - if(isVertMinMaxOk(dstBlock, stride, QP)) - doVertLowPass(dstBlock, stride, QP); + if(RENAME(isVertMinMaxOk)(dstBlock, stride, QP)) + RENAME(doVertLowPass)(dstBlock, stride, QP); } else - doVertDefFilter(dstBlock, stride, QP); + RENAME(doVertDefFilter)(dstBlock, stride, QP); } #ifdef MORE_TIMING T1= rdtsc(); @@ -3664,7 +2950,7 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri } #ifdef HAVE_MMX - transpose1(tempBlock1, tempBlock2, dstBlock, dstStride); + RENAME(transpose1)(tempBlock1, tempBlock2, dstBlock, dstStride); #endif /* check if we have a previous block to deblock it with dstBlock */ if(x - 8 >= 0) @@ -3674,21 +2960,21 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri #endif #ifdef HAVE_MMX if(mode & H_RK1_FILTER) - vertRK1Filter(tempBlock1, 16, QP); + RENAME(vertRK1Filter)(tempBlock1, 16, QP); else if(mode & H_X1_FILTER) - vertX1Filter(tempBlock1, 16, QP); + RENAME(vertX1Filter)(tempBlock1, 16, QP); else if(mode & H_DEBLOCK) { - if( isVertDC(tempBlock1, 16) ) + if( RENAME(isVertDC)(tempBlock1, 16) ) { - if(isVertMinMaxOk(tempBlock1, 16, QP)) - doVertLowPass(tempBlock1, 16, QP); + if(RENAME(isVertMinMaxOk)(tempBlock1, 16, QP)) + RENAME(doVertLowPass)(tempBlock1, 16, QP); } else - doVertDefFilter(tempBlock1, 16, QP); + RENAME(doVertDefFilter)(tempBlo |