Fix mv err cost for obmc subpel motion search
The mv err cost used in the second level obmc subpel motion search
is not consisten with first level. The MVC macro should be used
for branch where use_accurate_subpel_search == 0.
For encoder, the encode is about 0.7% faster show by
encoding 20 frame of BasketballDrill_832x480_50.y4m
target 800kbps on speed 1(149708 ms -> 148588 ms).
The average coding gain is 0.07%.
PSNR | PSNR Cb | PSNR Cr | PSNR HVS | SSIM | MS SSIM | CIEDE 2000
-0.0725 | -0.0092 | -0.0214 | -0.0816 | -0.0959 | -0.1248 | -0.0261
STATS_CHANGED expected
Change-Id: Ie2376a14f248b5cdcd39364fcfe4f20b8805e42d
diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c
index d30616a..63b4947 100644
--- a/av1/encoder/mcomp.c
+++ b/av1/encoder/mcomp.c
@@ -2301,8 +2301,9 @@
mask, vfp, z, pre(y, y_stride, r, c), \
y_stride, sp(c), sp(r), w, h, &sse, \
use_accurate_subpel_search); \
- if ((v = MVC(r, c) + thismse) < besterr) { \
- besterr = v; \
+ v = mv_err_cost(&this_mv, ref_mv, mvjcost, mvcost, error_per_bit); \
+ if ((v + thismse) < besterr) { \
+ besterr = v + thismse; \
br = r; \
bc = c; \
*distortion = thismse; \
