shithub: libvpx

Download patch

ref: c4e807ae2f60eed08811bc80d0763c489c8005c9
parent: 34a3628a459ed7489019252d3ca0f71746788a84
author: Jingning Han <[email protected]>
date: Tue Mar 25 05:54:32 EDT 2014 

Fix compiling errors due to git merge

There were a few conflicts between the new non-RD partition search
and recent clean-up patches, which were not caught by git control.
This commit fixed these issues.

Change-Id: Ieebefbd6c19d81d0d13e3c568877d5cce2ab7797


--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -2748,9 +2748,7 @@
     ctx->mic.mbmi = xd->mi_8x8[0]->mbmi;
 
     if (this_rate != INT_MAX) {
-      int pl = partition_plane_context(xd->above_seg_context,
-                                   xd->left_seg_context,
-                                   mi_row, mi_col, bsize);
+      int pl = partition_plane_context(xd, mi_row, mi_col, bsize);
       this_rate += x->partition_cost[pl][PARTITION_NONE];
       sum_rd = RDCOST(x->rdmult, x->rddiv, this_rate, this_dist);
       if (sum_rd < best_rd) {
@@ -2788,9 +2786,7 @@
   // PARTITION_SPLIT
   sum_rd = 0;
   if (do_split) {
-    int pl = partition_plane_context(xd->above_seg_context,
-                                     xd->left_seg_context,
-                                     mi_row, mi_col, bsize);
+    int pl = partition_plane_context(xd, mi_row, mi_col, bsize);
     sum_rate += x->partition_cost[pl][PARTITION_SPLIT];
     subsize = get_subsize(bsize, PARTITION_SPLIT);
     for (i = 0; i < 4; ++i) {
@@ -2855,9 +2851,7 @@
       if (this_rate == INT_MAX) {
         sum_rd = INT64_MAX;
       } else {
-        int pl = partition_plane_context(xd->above_seg_context,
-                                         xd->left_seg_context,
-                                         mi_row, mi_col, bsize);
+        int pl = partition_plane_context(xd, mi_row, mi_col, bsize);
         this_rate += x->partition_cost[pl][PARTITION_HORZ];
         sum_rate += this_rate;
         sum_dist += this_dist;
@@ -2897,9 +2891,7 @@
       if (this_rate == INT_MAX) {
         sum_rd = INT64_MAX;
       } else {
-        int pl = partition_plane_context(xd->above_seg_context,
-                                         xd->left_seg_context,
-                                         mi_row, mi_col, bsize);
+        int pl = partition_plane_context(xd, mi_row, mi_col, bsize);
         this_rate += x->partition_cost[pl][PARTITION_VERT];
         sum_rate += this_rate;
         sum_dist += this_dist;