commit c4b9089bb9386152b55cc1fb2784a786d56ff6ab
author Scott LaVarnway <slavarnway@google.com> Wed Aug 31 07:18:52 2011 -0700
committer Code Review <code-review@webmproject.org> Wed Aug 31 07:18:52 2011 -0700
tree b51174f5c8fe086b4b55f0b20be1d351f2f6e071
parent 222c72e50f0118600cd07f4888ea7182f12666c2
parent 0e05f2c6c96e5b46ff67ddb7deff740275da4b3d

Merge "Skip computation of distortion in vp8_pick_inter_mode if active_map is used"

vp8/encoder/pickinter.c

diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c
index 9cdaf7d..bfac3fa 100644
--- a/vp8/encoder/pickinter.c
+++ b/vp8/encoder/pickinter.c
@@ -775,6 +775,15 @@
             x->e_mbd.mode_info_context->mbmi.mv.as_int =
                                                     mode_mv[this_mode].as_int;
 
+            /* Exit early and don't compute the distortion if this macroblock is marked inactive. */
+            if (cpi->active_map_enabled && x->active_ptr[0] == 0)
+            {
+                sse = 0;
+                distortion2 = 0;
+                x->skip = 1;
+                break;
+            }
+
             if((this_mode != NEWMV) ||
                 !(have_subp_search) || cpi->common.full_pixel==1)
                 distortion2 = get_inter_mbpred_error(x,
@@ -783,11 +792,7 @@
 
             this_rd = RDCOST(x->rdmult, x->rddiv, rate2, distortion2);
 
-            if (cpi->active_map_enabled && x->active_ptr[0] == 0)
-            {
-                x->skip = 1;
-            }
-            else if (sse < x->encode_breakout)
+            if (sse < x->encode_breakout)
             {
                 // Check u and v to make sure skip is ok
                 int sse2 = 0;