ref: 2075af4b1666422d044ada2f85fe29f062f6ccd3
parent: 777ca80f0aeffc1cc9f613cc46f0d28212c633d0
parent: 8c3f18efa175be5ee6b26efcba5fdb5611e5119a
author: Marco Paniconi <marpan@google.com>
date: Thu Jul 6 23:00:59 EDT 2017
Merge "vp9: Nonrd mode: use content_state_sb for high motion."
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1166,7 +1166,7 @@
mi->mv[0].as_int = 0;
mi->interp_filter = BILINEAR;
- if (cpi->oxcf.speed >= 8 && !low_res)
+ if (cpi->oxcf.speed >= 8 && !low_res && x->content_state_sb != kVeryHighSad)
y_sad = cpi->fn_ptr[bsize].sdf(
x->plane[0].src.buf, x->plane[0].src.stride, xd->plane[0].pre[0].buf,
xd->plane[0].pre[0].stride);
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -1928,9 +1928,14 @@
pd->dst.stride = this_mode_pred->stride;
}
} else {- const int large_block = (x->sb_is_skin || cpi->oxcf.speed < 7)
- ? bsize > BLOCK_32X32
- : bsize >= BLOCK_32X32;
+ // For low motion content use x->sb_is_skin in addition to VeryHighSad
+ // for setting large_block.
+ const int large_block =
+ (x->content_state_sb == kVeryHighSad ||
+ (x->sb_is_skin && cpi->rc.avg_frame_low_motion > 70) ||
+ cpi->oxcf.speed < 7)
+ ? bsize > BLOCK_32X32
+ : bsize >= BLOCK_32X32;
mi->interp_filter = (filter_ref == SWITCHABLE) ? EIGHTTAP : filter_ref;
if (cpi->use_svc && ref_frame == GOLDEN_FRAME &&