shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: Choose the scheme for modeling rd for 32x32 based on skin color."

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -1744,8 +1744,8 @@

 #if CONFIG_VP9_HIGHBITDEPTH

       const int large_block = bsize > BLOCK_32X32;

 #else

-      const int large_block = (this_mode == NEWMV && ref_frame == LAST_FRAME) ?

-          bsize > BLOCK_32X32 : bsize >= BLOCK_32X32;

+      const int large_block =

+          x->sb_is_skin ? bsize > BLOCK_32X32 : bsize >= BLOCK_32X32;

 #endif

       mi->interp_filter = (filter_ref == SWITCHABLE) ? EIGHTTAP : filter_ref;

       vp9_build_inter_predictors_sby(xd, mi_row, mi_col, bsize);