Commit 03492884 authored by Ronald S. Bultje's avatar Ronald S. Bultje
Browse files

Fix use of wrong rate/distortion variables in 16x8 r/d check.

Change-Id: Ib5961b4c8ca84d54c84b2651a4e0317c72fe7da4
parent 183aeecd
...@@ -1134,8 +1134,8 @@ static void encode_sb_row(VP9_COMP *cpi, ...@@ -1134,8 +1134,8 @@ static void encode_sb_row(VP9_COMP *cpi,
r2 += x->partition_cost[pl][PARTITION_VERT]; r2 += x->partition_cost[pl][PARTITION_VERT];
if (RDCOST(x->rdmult, x->rddiv, r2, d2) < if (RDCOST(x->rdmult, x->rddiv, r2, d2) <
RDCOST(x->rdmult, x->rddiv, mb16_rate, mb16_dist)) { RDCOST(x->rdmult, x->rddiv, mb16_rate, mb16_dist)) {
mb16_rate = r; mb16_rate = r2;
mb16_dist = d; mb16_dist = d2;
mb_partitioning[i][j] = BLOCK_SIZE_SB8X16; mb_partitioning[i][j] = BLOCK_SIZE_SB8X16;
} }
for (p = 0; p < MAX_MB_PLANE; p++) { for (p = 0; p < MAX_MB_PLANE; p++) {
...@@ -1179,8 +1179,8 @@ static void encode_sb_row(VP9_COMP *cpi, ...@@ -1179,8 +1179,8 @@ static void encode_sb_row(VP9_COMP *cpi,
r2 += x->partition_cost[pl][PARTITION_HORZ]; r2 += x->partition_cost[pl][PARTITION_HORZ];
if (RDCOST(x->rdmult, x->rddiv, r2, d2) < if (RDCOST(x->rdmult, x->rddiv, r2, d2) <
RDCOST(x->rdmult, x->rddiv, mb16_rate, mb16_dist)) { RDCOST(x->rdmult, x->rddiv, mb16_rate, mb16_dist)) {
mb16_rate = r; mb16_rate = r2;
mb16_dist = d; mb16_dist = d2;
mb_partitioning[i][j] = BLOCK_SIZE_SB16X8; mb_partitioning[i][j] = BLOCK_SIZE_SB16X8;
} }
for (p = 0; p < MAX_MB_PLANE; p++) { for (p = 0; p < MAX_MB_PLANE; p++) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment