Browse Source

postproc: use FFMIN/FFMAX where appropriate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer 11 years ago
parent
commit
bb8b752553
2 changed files with 12 additions and 12 deletions
  1. 8 8
      libpostproc/postprocess.c
  2. 4 4
      libpostproc/postprocess_template.c

+ 8 - 8
libpostproc/postprocess.c

@@ -318,13 +318,13 @@ static inline void doHorizDefFilter_C(uint8_t dst[], int stride, const PPContext
 
 
             if(q>0)
             if(q>0)
             {
             {
-                d= d<0 ? 0 : d;
-                d= d>q ? q : d;
+                d = FFMAX(d, 0);
+                d = FFMIN(d, q);
             }
             }
             else
             else
             {
             {
-                d= d>0 ? 0 : d;
-                d= d<q ? q : d;
+                d = FFMIN(d, 0);
+                d = FFMAX(d, q);
             }
             }
 
 
             dst[3]-= d;
             dst[3]-= d;
@@ -515,11 +515,11 @@ static av_always_inline void do_a_deblock_C(uint8_t *src, int step,
                 d*= FFSIGN(-middleEnergy);
                 d*= FFSIGN(-middleEnergy);
 
 
                 if(q>0){
                 if(q>0){
-                    d= d<0 ? 0 : d;
-                    d= d>q ? q : d;
+                    d = FFMAX(d, 0);
+                    d = FFMIN(d, q);
                 }else{
                 }else{
-                    d= d>0 ? 0 : d;
-                    d= d<q ? q : d;
+                    d = FFMIN(d, 0);
+                    d = FFMAX(d, q);
                 }
                 }
 
 
                 src[3*step]-= d;
                 src[3*step]-= d;

+ 4 - 4
libpostproc/postprocess_template.c

@@ -1073,11 +1073,11 @@ static inline void RENAME(doVertDefFilter)(uint8_t src[], int stride, PPContext
             d*= FFSIGN(-middleEnergy);
             d*= FFSIGN(-middleEnergy);
 
 
             if(q>0){
             if(q>0){
-                d= d<0 ? 0 : d;
-                d= d>q ? q : d;
+                d = FFMAX(d, 0);
+                d = FFMIN(d, q);
             }else{
             }else{
-                d= d>0 ? 0 : d;
-                d= d<q ? q : d;
+                d = FFMIN(d, 0);
+                d = FFMAX(d, q);
             }
             }
 
 
             src[l4]-= d;
             src[l4]-= d;