[FFmpeg-cvslog] r21504 - trunk/libavcodec/h264_loopfilter.c

[michael]

Author: michael
Date: Thu Jan 28 11:38:43 2010
New Revision: 21504

Log:
Restructure if() in check_mv()
quite a bit faster

Modified:
   trunk/libavcodec/h264_loopfilter.c

Modified: trunk/libavcodec/h264_loopfilter.c
==============================================================================
--- trunk/libavcodec/h264_loopfilter.c	Thu Jan 28 11:34:06 2010	(r21503)
+++ trunk/libavcodec/h264_loopfilter.c	Thu Jan 28 11:38:43 2010	(r21504)
@@ -430,12 +430,14 @@ static int check_mv(H264Context *h, long
     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 @@ static int check_mv(H264Context *h, long
             return 1;
         return 0;
     }
+    }
 
     return v;
 }