Commit bcaba2e5 authored by Ronald S. Bultje's avatar Ronald S. Bultje Committed by Gerrit Code Review
Browse files

Merge "Properly use chroma block object for chroma coefficient costing." into experimental

parents 4dfa7589 1d87f9c1
...@@ -647,11 +647,12 @@ static int cost_coeffs(MACROBLOCK *mb, BLOCKD *b, PLANE_TYPE type, ...@@ -647,11 +647,12 @@ static int cost_coeffs(MACROBLOCK *mb, BLOCKD *b, PLANE_TYPE type,
{ {
BLOCKD *bb; BLOCKD *bb;
int ib = (b - xd->block); int ib = (b - xd->block);
if (ib >= 16) tx_type = DCT_DCT; if (ib < 16) {
ib = (ib & 8) + ((ib & 4) >> 1); ib = (ib & 8) + ((ib & 4) >> 1);
bb = xd->block + ib; bb = xd->block + ib;
if (mbmi->mode_rdopt == I8X8_PRED) if (mbmi->mode_rdopt == I8X8_PRED)
tx_type = bb->bmi.as_mode.tx_type; tx_type = bb->bmi.as_mode.tx_type;
}
} }
#endif #endif
break; break;
......
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