From: Deb Mukherjee <debargha@google.com>
Date: Thu, 27 Feb 2014 17:52:01 +0000 (-0800)
Subject: Merge "Refines variance based partitioning search"
X-Git-Tag: v1.4.0~2242
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01906b53f87e765a659f3aabf6f0af76ea62e008;p=libvpx

Merge "Refines variance based partitioning search"
---

01906b53f87e765a659f3aabf6f0af76ea62e008
diff --cc vp9/encoder/vp9_encodeframe.c
index 8710bdcb1,b77af8c90..7b15d0ab9
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@@ -1390,12 -1415,11 +1422,13 @@@ static void rd_use_partition(VP9_COMP *
  
    pl = partition_plane_context(cpi->above_seg_context, cpi->left_seg_context,
                                 mi_row, mi_col, bsize);
 -  if (last_part_rate < INT_MAX)
 +  if (last_part_rate < INT_MAX) {
      last_part_rate += x->partition_cost[pl][partition];
 +    last_part_rd = RDCOST(x->rdmult, x->rddiv, last_part_rate, last_part_dist);
 +  }
  
    if (cpi->sf.adjust_partitioning_from_last_frame
+       && cpi->sf.partition_search_type == SEARCH_PARTITION
        && partition != PARTITION_SPLIT && bsize > BLOCK_8X8
        && (mi_row + ms < cm->mi_rows || mi_row + (ms >> 1) == cm->mi_rows)
        && (mi_col + ms < cm->mi_cols || mi_col + (ms >> 1) == cm->mi_cols)) {