diff options
| author | Jingning Han <jingning@google.com> | 2014-03-25 09:54:32 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2014-03-25 10:25:16 -0700 |
| commit | c4e807ae2f60eed08811bc80d0763c489c8005c9 (patch) | |
| tree | 9465fd0cbb6a2004873868d68e47ad6b22413c71 /vp9/encoder | |
| parent | 34a3628a459ed7489019252d3ca0f71746788a84 (diff) | |
| download | libvpx-c4e807ae2f60eed08811bc80d0763c489c8005c9.tar libvpx-c4e807ae2f60eed08811bc80d0763c489c8005c9.tar.gz libvpx-c4e807ae2f60eed08811bc80d0763c489c8005c9.tar.bz2 libvpx-c4e807ae2f60eed08811bc80d0763c489c8005c9.zip | |
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
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index b9515b8f8..100162883 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -2748,9 +2748,7 @@ static void nonrd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile, 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 @@ static void nonrd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile, // 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 @@ static void nonrd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile, 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 @@ static void nonrd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile, 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; |