changeset 11039:b9a6d26f48eb libavcodec

Restructure if() in check_mv() quite a bit faster
author michael
date Thu, 28 Jan 2010 10:38:43 +0000
parents ee6d89b26e7f
children f0b31169d04d
files h264_loopfilter.c
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/h264_loopfilter.c	Thu Jan 28 10:34:06 2010 +0000
+++ b/h264_loopfilter.c	Thu Jan 28 10:38:43 2010 +0000
@@ -430,12 +430,14 @@
     v = h->ref_cache[0][b_idx] != h->ref_cache[0][bn_idx] |
         h->mv_cache[0][b_idx][0] - h->mv_cache[0][bn_idx][0] + 3 >= 7U |
         FFABS( h->mv_cache[0][b_idx][1] - h->mv_cache[0][bn_idx][1] ) >= mvy_limit;
-    if(h->list_count==2 && !v)
+
+    if(h->list_count==2){
+        if(!v)
         v = h->ref_cache[1][b_idx] != h->ref_cache[1][bn_idx] |
             h->mv_cache[1][b_idx][0] - h->mv_cache[1][bn_idx][0] + 3 >= 7U |
             FFABS( h->mv_cache[1][b_idx][1] - h->mv_cache[1][bn_idx][1] ) >= mvy_limit;
 
-    if(h->list_count==2 && v){
+    if(v){
         if(h->ref_cache[0][b_idx] != h->ref_cache[1][bn_idx] |
            h->mv_cache[0][b_idx][0] - h->mv_cache[1][bn_idx][0] + 3 >= 7U |
            FFABS( h->mv_cache[0][b_idx][1] - h->mv_cache[1][bn_idx][1] ) >= mvy_limit)
@@ -446,6 +448,7 @@
             return 1;
         return 0;
     }
+    }
 
     return v;
 }