change all the occurrences of "FFMIN(FFMAX())" to clip_uint8() or clip()

Originally committed as revision 21776 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 6bd8023..ecb5f7a 100644 (file)
--- 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<lumFilterSize; j++)
                        val += lumSrc[j][i] * lumFilter[j];
 
-               dest[i]= FFMIN(FFMAX(val>>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<lumFilterSize; j++)
                        val += lumSrc[j][i] * lumFilter[j];
 
-               dest[i]= FFMIN(FFMAX(val>>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<chrDstW; i++)
@@ -374,8 +374,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(v>>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 d65c285..3b1dd7e 100644 (file)
--- 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<filterSize; j++) {
        val += ((int)src[srcPos + j])*filter[filterSize*i + j];
       }
-      dst[i] = FFMIN(FFMAX(0, val>>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 aa1dd31..21b99ca 100644 (file)
--- 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