commit 81f6ecd1217d44c7dbcb33d5392d154ef72c097a
author Sarah Parker <sarahparker@google.com> Fri May 26 16:10:11 2017 -0700
committer Sarah Parker <sarahparker@google.com> Mon Jun 05 17:19:12 2017 +0000
tree 84f804719bb50259b0c9378622c2ea64214d7c7f
parent 28c779beb3f878ceabf68f1a41ba7d9088e99d66

Early termination for warp error computation

This terminates the computation for the warp error once
the frame error exceeds the best frame error found
so far to avoid unneccessary computation.

Change-Id: I094a0b3e13f8b91610e051cb91d20a815879dd80

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 36d09c0..b6e0f5d 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4716,8 +4716,8 @@
             xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH, xd->bd,
 #endif  // CONFIG_HIGHBITDEPTH
             ref_buf[frame]->y_buffer, ref_buf[frame]->y_stride,
-            cpi->source->y_buffer, 0, 0, cpi->source->y_width,
-            cpi->source->y_height, cpi->source->y_stride);
+            cpi->source->y_buffer, cpi->source->y_width, cpi->source->y_height,
+            cpi->source->y_stride);
 
         if (ref_frame_error == 0) continue;
 
@@ -4752,7 +4752,8 @@
                   ref_buf[frame]->y_buffer, ref_buf[frame]->y_width,
                   ref_buf[frame]->y_height, ref_buf[frame]->y_stride,
                   cpi->source->y_buffer, cpi->source->y_width,
-                  cpi->source->y_height, cpi->source->y_stride, 3);
+                  cpi->source->y_height, cpi->source->y_stride, 3,
+                  best_warp_error);
               if (warp_error < best_warp_error) {
                 best_warp_error = warp_error;
                 // Save the wm_params modified by refine_integerized_param()