generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compiling errors due to git merge

Browse Source 
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
This commit is contained in:
Jingning Han
2014-03-25 09:54:32 -07:00
parent 34a3628a45
commit c4e807ae2f
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vp9/encoder/vp9_encodeframe.c
View File

@@ -2748,9 +2748,7 @@ static void nonrd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile,
ctx->mic.mbmi = xd->mi_8x8[0]->mbmi; ctx->mic.mbmi = xd->mi_8x8[0]->mbmi;
if (this_rate != INT_MAX) { if (this_rate != INT_MAX) {
int pl = partition_plane_context(xd->above_seg_context, int pl = partition_plane_context(xd, mi_row, mi_col, bsize);
xd->left_seg_context,
mi_row, mi_col, bsize);
this_rate += x->partition_cost[pl][PARTITION_NONE]; this_rate += x->partition_cost[pl][PARTITION_NONE];
sum_rd = RDCOST(x->rdmult, x->rddiv, this_rate, this_dist); sum_rd = RDCOST(x->rdmult, x->rddiv, this_rate, this_dist);
if (sum_rd < best_rd) { if (sum_rd < best_rd) {
@@ -2788,9 +2786,7 @@ static void nonrd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile,
// PARTITION_SPLIT // PARTITION_SPLIT
sum_rd = 0; sum_rd = 0;
if (do_split) { if (do_split) {
int pl = partition_plane_context(xd->above_seg_context, int pl = partition_plane_context(xd, mi_row, mi_col, bsize);
xd->left_seg_context,
mi_row, mi_col, bsize);
sum_rate += x->partition_cost[pl][PARTITION_SPLIT]; sum_rate += x->partition_cost[pl][PARTITION_SPLIT];
subsize = get_subsize(bsize, PARTITION_SPLIT); subsize = get_subsize(bsize, PARTITION_SPLIT);
for (i = 0; i < 4; ++i) { 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) { if (this_rate == INT_MAX) {
sum_rd = INT64_MAX; sum_rd = INT64_MAX;
} else { } else {
int pl = partition_plane_context(xd->above_seg_context, int pl = partition_plane_context(xd, mi_row, mi_col, bsize);
xd->left_seg_context,
mi_row, mi_col, bsize);
this_rate += x->partition_cost[pl][PARTITION_HORZ]; this_rate += x->partition_cost[pl][PARTITION_HORZ];
sum_rate += this_rate; sum_rate += this_rate;
sum_dist += this_dist; 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) { if (this_rate == INT_MAX) {
sum_rd = INT64_MAX; sum_rd = INT64_MAX;
} else { } else {
int pl = partition_plane_context(xd->above_seg_context, int pl = partition_plane_context(xd, mi_row, mi_col, bsize);
xd->left_seg_context,
mi_row, mi_col, bsize);
this_rate += x->partition_cost[pl][PARTITION_VERT]; this_rate += x->partition_cost[pl][PARTITION_VERT];
sum_rate += this_rate; sum_rate += this_rate;
sum_dist += this_dist; sum_dist += this_dist;