From 43aa3a1b7e6a275c4cca03707e10881575bc88ba Mon Sep 17 00:00:00 2001 From: lucabe Date: Tue, 26 Dec 2006 18:08:40 +0000 Subject: change all the occurrences of "FFMIN(FFMAX())" to clip_uint8() or clip() git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21776 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale.c | 18 +++++++++--------- libswscale/swscale_altivec_template.c | 10 +++++----- libswscale/swscale_template.c | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 6bd80235b5..ecb5f7a7ee 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -308,7 +308,7 @@ static inline void yuv2yuvXinC(int16_t *lumFilter, int16_t **lumSrc, int lumFilt for(j=0; j>19, 0), 255); + dest[i]= clip_uint8(val>>19); } if(uDest != NULL) @@ -323,8 +323,8 @@ static inline void yuv2yuvXinC(int16_t *lumFilter, int16_t **lumSrc, int lumFilt v += chrSrc[j][i + 2048] * chrFilter[j]; } - uDest[i]= FFMIN(FFMAX(u>>19, 0), 255); - vDest[i]= FFMIN(FFMAX(v>>19, 0), 255); + uDest[i]= clip_uint8(u>>19); + vDest[i]= clip_uint8(v>>19); } } @@ -341,7 +341,7 @@ static inline void yuv2nv12XinC(int16_t *lumFilter, int16_t **lumSrc, int lumFil for(j=0; j>19, 0), 255); + dest[i]= clip_uint8(val>>19); } if(uDest == NULL) @@ -359,8 +359,8 @@ static inline void yuv2nv12XinC(int16_t *lumFilter, int16_t **lumSrc, int lumFil v += chrSrc[j][i + 2048] * chrFilter[j]; } - uDest[2*i]= FFMIN(FFMAX(u>>19, 0), 255); - uDest[2*i+1]= FFMIN(FFMAX(v>>19, 0), 255); + uDest[2*i]= clip_uint8(u>>19); + uDest[2*i+1]= clip_uint8(v>>19); } else for(i=0; i>19, 0), 255); - uDest[2*i+1]= FFMIN(FFMAX(u>>19, 0), 255); + uDest[2*i]= clip_uint8(v>>19); + uDest[2*i+1]= clip_uint8(u>>19); } } @@ -1458,7 +1458,7 @@ static void globalInit(void){ // generating tables: int i; for(i=0; i<768; i++){ - int c= FFMIN(FFMAX(i-256, 0), 255); + int c= clip_uint8(i-256); clip_table[i]=c; } } diff --git a/libswscale/swscale_altivec_template.c b/libswscale/swscale_altivec_template.c index d65c28538b..3b1dd7ef63 100644 --- a/libswscale/swscale_altivec_template.c +++ b/libswscale/swscale_altivec_template.c @@ -226,7 +226,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int for(j=0; j>7), (1<<15)-1); + dst[i] = clip(val>>7, 0, (1<<15)-1); } } else @@ -265,7 +265,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int val_vEven = vec_mule(src_v, filter_v); val_s = vec_sums(val_vEven, vzero); vec_st(val_s, 0, tempo); - dst[i] = FFMIN(FFMAX(0, tempo[3]>>7), (1<<15)-1); + dst[i] = clip(tempo[3]>>7, 0, (1<<15)-1); } } break; @@ -292,7 +292,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int val_v = vec_msums(src_v, filter_v, (vector signed int)vzero); val_s = vec_sums(val_v, vzero); vec_st(val_s, 0, tempo); - dst[i] = FFMIN(FFMAX(0, tempo[3]>>7), (1<<15)-1); + dst[i] = clip(tempo[3]>>7, 0, (1<<15)-1); } } break; @@ -321,7 +321,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); vec_st(val_s, 0, tempo); - dst[i] = FFMIN(FFMAX(0, tempo[3]>>7), (1<<15)-1); + dst[i] = clip(tempo[3]>>7, 0, (1<<15)-1); } } break; @@ -383,7 +383,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int val_s = vec_sums(val_v, vzero); vec_st(val_s, 0, tempo); - dst[i] = FFMIN(FFMAX(0, tempo[3]>>7), (1<<15)-1); + dst[i] = clip(tempo[3]>>7, 0, (1<<15)-1); } } diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index aa1dd31ca3..21b99ca225 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -2456,7 +2456,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]; } // filter += hFilterSize; - dst[i] = FFMIN(FFMAX(0, val>>7), (1<<15)-1); // the cubic equation does overflow ... + dst[i] = clip(val>>7, 0, (1<<15)-1); // the cubic equation does overflow ... // dst[i] = val>>7; } #endif -- cgit v1.2.3