Skip to content

L
libswscale
Commit 372b28e1 authored by lucabe's avatar lucabe
Browse files
Options

Replace MIN() and MAX() with FFMIN() and FFMAX() 


git-svn-id: file:///var/local/repositories/mplayer/trunk/libswscale@19186 b3059339-0415-0410-9bf9-f77b7e298cf2
parent 008493b1
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 24 deletions
swscale.c
View file @ 372b28e1
...@@ -151,9 +151,6 @@ add BGR4 output support ...@@ -151,9 +151,6 @@ add BGR4 output support
write special BGR->BGR scaler write special BGR->BGR scaler
*/ */
#define MIN(a,b) ((a) > (b) ? (b) : (a))
#define MAX(a,b) ((a) < (b) ? (b) : (a))
#if defined(ARCH_X86) || defined(ARCH_X86_64) #if defined(ARCH_X86) || defined(ARCH_X86_64)
static uint64_t attribute_used __attribute__((aligned(8))) bF8= 0xF8F8F8F8F8F8F8F8LL; static uint64_t attribute_used __attribute__((aligned(8))) bF8= 0xF8F8F8F8F8F8F8F8LL;
static uint64_t attribute_used __attribute__((aligned(8))) bFC= 0xFCFCFCFCFCFCFCFCLL; static uint64_t attribute_used __attribute__((aligned(8))) bFC= 0xFCFCFCFCFCFCFCFCLL;
...@@ -252,7 +249,7 @@ static inline void yuv2yuvXinC(int16_t *lumFilter, int16_t **lumSrc, int lumFilt ...@@ -252,7 +249,7 @@ static inline void yuv2yuvXinC(int16_t *lumFilter, int16_t **lumSrc, int lumFilt
for(j=0; j<lumFilterSize; j++) for(j=0; j<lumFilterSize; j++)
val += lumSrc[j][i] * lumFilter[j]; val += lumSrc[j][i] * lumFilter[j];
dest[i]= MIN(MAX(val>>19, 0), 255); dest[i]= FFMIN(FFMAX(val>>19, 0), 255);
} }
if(uDest != NULL) if(uDest != NULL)
...@@ -267,8 +264,8 @@ static inline void yuv2yuvXinC(int16_t *lumFilter, int16_t **lumSrc, int lumFilt ...@@ -267,8 +264,8 @@ static inline void yuv2yuvXinC(int16_t *lumFilter, int16_t **lumSrc, int lumFilt
v += chrSrc[j][i + 2048] * chrFilter[j]; v += chrSrc[j][i + 2048] * chrFilter[j];
} }
uDest[i]= MIN(MAX(u>>19, 0), 255); uDest[i]= FFMIN(FFMAX(u>>19, 0), 255);
vDest[i]= MIN(MAX(v>>19, 0), 255); vDest[i]= FFMIN(FFMAX(v>>19, 0), 255);
} }
} }
...@@ -285,7 +282,7 @@ static inline void yuv2nv12XinC(int16_t *lumFilter, int16_t **lumSrc, int lumFil ...@@ -285,7 +282,7 @@ static inline void yuv2nv12XinC(int16_t *lumFilter, int16_t **lumSrc, int lumFil
for(j=0; j<lumFilterSize; j++) for(j=0; j<lumFilterSize; j++)
val += lumSrc[j][i] * lumFilter[j]; val += lumSrc[j][i] * lumFilter[j];
dest[i]= MIN(MAX(val>>19, 0), 255); dest[i]= FFMIN(FFMAX(val>>19, 0), 255);
} }
if(uDest == NULL) if(uDest == NULL)
...@@ -303,8 +300,8 @@ static inline void yuv2nv12XinC(int16_t *lumFilter, int16_t **lumSrc, int lumFil ...@@ -303,8 +300,8 @@ static inline void yuv2nv12XinC(int16_t *lumFilter, int16_t **lumSrc, int lumFil
v += chrSrc[j][i + 2048] * chrFilter[j]; v += chrSrc[j][i + 2048] * chrFilter[j];
} }
uDest[2*i]= MIN(MAX(u>>19, 0), 255); uDest[2*i]= FFMIN(FFMAX(u>>19, 0), 255);
uDest[2*i+1]= MIN(MAX(v>>19, 0), 255); uDest[2*i+1]= FFMIN(FFMAX(v>>19, 0), 255);
} }
else else
for(i=0; i<chrDstW; i++) for(i=0; i<chrDstW; i++)
...@@ -318,8 +315,8 @@ static inline void yuv2nv12XinC(int16_t *lumFilter, int16_t **lumSrc, int lumFil ...@@ -318,8 +315,8 @@ static inline void yuv2nv12XinC(int16_t *lumFilter, int16_t **lumSrc, int lumFil
v += chrSrc[j][i + 2048] * chrFilter[j]; v += chrSrc[j][i + 2048] * chrFilter[j];
} }
uDest[2*i]= MIN(MAX(v>>19, 0), 255); uDest[2*i]= FFMIN(FFMAX(v>>19, 0), 255);
uDest[2*i+1]= MIN(MAX(u>>19, 0), 255); uDest[2*i+1]= FFMIN(FFMAX(u>>19, 0), 255);
} }
} }
...@@ -1168,7 +1165,7 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF ...@@ -1168,7 +1165,7 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF
// Move filter coeffs left to compensate for filterPos // Move filter coeffs left to compensate for filterPos
for(j=1; j<filterSize; j++) for(j=1; j<filterSize; j++)
{ {
int left= MAX(j + (*filterPos)[i], 0); int left= FFMAX(j + (*filterPos)[i], 0);
filter[i*filterSize + left] += filter[i*filterSize + j]; filter[i*filterSize + left] += filter[i*filterSize + j];
filter[i*filterSize + j]=0; filter[i*filterSize + j]=0;
} }
...@@ -1181,7 +1178,7 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF ...@@ -1181,7 +1178,7 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF
// Move filter coeffs right to compensate for filterPos // Move filter coeffs right to compensate for filterPos
for(j=filterSize-2; j>=0; j--) for(j=filterSize-2; j>=0; j--)
{ {
int right= MIN(j + shift, filterSize-1); int right= FFMIN(j + shift, filterSize-1);
filter[i*filterSize +right] += filter[i*filterSize +j]; filter[i*filterSize +right] += filter[i*filterSize +j];
filter[i*filterSize +j]=0; filter[i*filterSize +j]=0;
} }
...@@ -1404,7 +1401,7 @@ static void globalInit(void){ ...@@ -1404,7 +1401,7 @@ static void globalInit(void){
// generating tables: // generating tables:
int i; int i;
for(i=0; i<768; i++){ for(i=0; i<768; i++){
int c= MIN(MAX(i-256, 0), 255); int c= FFMIN(FFMAX(i-256, 0), 255);
clip_table[i]=c; clip_table[i]=c;
} }
} }
...@@ -2163,7 +2160,7 @@ SwsContext *sws_getContext(int srcW, int srcH, int origSrcFormat, int dstW, int ...@@ -2163,7 +2160,7 @@ SwsContext *sws_getContext(int srcW, int srcH, int origSrcFormat, int dstW, int
for(i=0; i<dstH; i++) for(i=0; i<dstH; i++)
{ {
int chrI= i*c->chrDstH / dstH; int chrI= i*c->chrDstH / dstH;
int nextSlice= MAX(c->vLumFilterPos[i ] + c->vLumFilterSize - 1, int nextSlice= FFMAX(c->vLumFilterPos[i ] + c->vLumFilterSize - 1,
((c->vChrFilterPos[chrI] + c->vChrFilterSize - 1)<<c->chrSrcVSubSample)); ((c->vChrFilterPos[chrI] + c->vChrFilterSize - 1)<<c->chrSrcVSubSample));
nextSlice>>= c->chrSrcVSubSample; nextSlice>>= c->chrSrcVSubSample;
...@@ -2515,7 +2512,7 @@ static SwsVector *sws_getConvVec(SwsVector *a, SwsVector *b){ ...@@ -2515,7 +2512,7 @@ static SwsVector *sws_getConvVec(SwsVector *a, SwsVector *b){
} }
static SwsVector *sws_sumVec(SwsVector *a, SwsVector *b){ static SwsVector *sws_sumVec(SwsVector *a, SwsVector *b){
int length= MAX(a->length, b->length); int length= FFMAX(a->length, b->length);
double *coeff= av_malloc(length*sizeof(double)); double *coeff= av_malloc(length*sizeof(double));
int i; int i;
SwsVector *vec= av_malloc(sizeof(SwsVector)); SwsVector *vec= av_malloc(sizeof(SwsVector));
...@@ -2532,7 +2529,7 @@ static SwsVector *sws_sumVec(SwsVector *a, SwsVector *b){ ...@@ -2532,7 +2529,7 @@ static SwsVector *sws_sumVec(SwsVector *a, SwsVector *b){
} }
static SwsVector *sws_diffVec(SwsVector *a, SwsVector *b){ static SwsVector *sws_diffVec(SwsVector *a, SwsVector *b){
int length= MAX(a->length, b->length); int length= FFMAX(a->length, b->length);
double *coeff= av_malloc(length*sizeof(double)); double *coeff= av_malloc(length*sizeof(double));
int i; int i;
SwsVector *vec= av_malloc(sizeof(SwsVector)); SwsVector *vec= av_malloc(sizeof(SwsVector));
......
swscale_altivec_template.c
View file @ 372b28e1
/* FF/*
AltiVec-enhanced yuv2yuvX AltiVec-enhanced yuv2yuvX
Copyright (C) 2004 Romain Dolbeau <romain@dolbeau.org> Copyright (C) 2004 Romain Dolbeau <romain@dolbeau.org>
...@@ -223,7 +223,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int ...@@ -223,7 +223,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int
for(j=0; j<filterSize; j++) { for(j=0; j<filterSize; j++) {
val += ((int)src[srcPos + j])*filter[filterSize*i + j]; val += ((int)src[srcPos + j])*filter[filterSize*i + j];
} }
dst[i] = MIN(MAX(0, val>>7), (1<<15)-1); dst[i] = FFMIN(FFMAX(0, val>>7), (1<<15)-1);
} }
} }
else else
...@@ -261,7 +261,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int ...@@ -261,7 +261,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int
vector signed int val_vEven = vec_mule(src_v, filter_v); vector signed int val_vEven = vec_mule(src_v, filter_v);
vector signed int val_s = vec_sums(val_vEven, vzero); vector signed int val_s = vec_sums(val_vEven, vzero);
vec_st(val_s, 0, tempo); vec_st(val_s, 0, tempo);
dst[i] = MIN(MAX(0, tempo[3]>>7), (1<<15)-1); dst[i] = FFMIN(FFMAX(0, tempo[3]>>7), (1<<15)-1);
} }
} }
break; break;
...@@ -286,7 +286,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int ...@@ -286,7 +286,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int
vector signed int val_v = vec_msums(src_v, filter_v, (vector signed int)vzero); vector signed int val_v = vec_msums(src_v, filter_v, (vector signed int)vzero);
vector signed int val_s = vec_sums(val_v, vzero); vector signed int val_s = vec_sums(val_v, vzero);
vec_st(val_s, 0, tempo); vec_st(val_s, 0, tempo);
dst[i] = MIN(MAX(0, tempo[3]>>7), (1<<15)-1); dst[i] = FFMIN(FFMAX(0, tempo[3]>>7), (1<<15)-1);
} }
} }
break; break;
...@@ -315,7 +315,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int ...@@ -315,7 +315,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int
vector signed int val_s = vec_sums(val_v, vzero); vector signed int val_s = vec_sums(val_v, vzero);
vec_st(val_s, 0, tempo); vec_st(val_s, 0, tempo);
dst[i] = MIN(MAX(0, tempo[3]>>7), (1<<15)-1); dst[i] = FFMIN(FFMAX(0, tempo[3]>>7), (1<<15)-1);
} }
} }
break; break;
...@@ -376,7 +376,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int ...@@ -376,7 +376,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int
vector signed int val_s = vec_sums(val_v, vzero); vector signed int val_s = vec_sums(val_v, vzero);
vec_st(val_s, 0, tempo); vec_st(val_s, 0, tempo);
dst[i] = MIN(MAX(0, tempo[3]>>7), (1<<15)-1); dst[i] = FFMIN(FFMAX(0, tempo[3]>>7), (1<<15)-1);
} }
} }
......
swscale_template.c
View file @ 372b28e1
...@@ -2405,7 +2405,7 @@ static inline void RENAME(hScale)(int16_t *dst, int dstW, uint8_t *src, int srcW ...@@ -2405,7 +2405,7 @@ static inline void RENAME(hScale)(int16_t *dst, int dstW, uint8_t *src, int srcW
val += ((int)src[srcPos + j])*filter[filterSize*i + j]; val += ((int)src[srcPos + j])*filter[filterSize*i + j];
} }
// filter += hFilterSize; // filter += hFilterSize;
dst[i] = MIN(MAX(0, val>>7), (1<<15)-1); // the cubic equation does overflow ... dst[i] = FFMIN(FFMAX(0, val>>7), (1<<15)-1); // the cubic equation does overflow ...
// dst[i] = val>>7; // dst[i] = val>>7;
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment