diff options
Diffstat (limited to 'vp8/encoder/encodemb.c')
| -rw-r--r-- | vp8/encoder/encodemb.c | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/vp8/encoder/encodemb.c b/vp8/encoder/encodemb.c index 30ef299ec..30b8c4590 100644 --- a/vp8/encoder/encodemb.c +++ b/vp8/encoder/encodemb.c @@ -518,7 +518,7 @@ void vp8_optimize_mb(MACROBLOCK *x, const VP8_ENCODER_RTCD *rtcd) has_2nd_order = (x->e_mbd.mode_info_context->mbmi.mode != B_PRED && x->e_mbd.mode_info_context->mbmi.mode != SPLITMV); - type = has_2nd_order ? 0 : 3; + type = has_2nd_order ? PLANE_TYPE_Y_NO_DC : PLANE_TYPE_Y_WITH_DC; for (b = 0; b < 16; b++) { @@ -526,23 +526,16 @@ void vp8_optimize_mb(MACROBLOCK *x, const VP8_ENCODER_RTCD *rtcd) ta + vp8_block2above[b], tl + vp8_block2left[b], rtcd); } - for (b = 16; b < 20; b++) + for (b = 16; b < 24; b++) { - vp8_optimize_b(x, b, vp8_block2type[b], + vp8_optimize_b(x, b, PLANE_TYPE_UV, ta + vp8_block2above[b], tl + vp8_block2left[b], rtcd); } - for (b = 20; b < 24; b++) - { - vp8_optimize_b(x, b, vp8_block2type[b], - ta + vp8_block2above[b], tl + vp8_block2left[b], rtcd); - } - - if (has_2nd_order) { b=24; - vp8_optimize_b(x, b, vp8_block2type[b], + vp8_optimize_b(x, b, PLANE_TYPE_Y2, ta + vp8_block2above[b], tl + vp8_block2left[b], rtcd); } } @@ -572,7 +565,7 @@ void vp8_optimize_mby(MACROBLOCK *x, const VP8_ENCODER_RTCD *rtcd) has_2nd_order = (x->e_mbd.mode_info_context->mbmi.mode != B_PRED && x->e_mbd.mode_info_context->mbmi.mode != SPLITMV); - type = has_2nd_order ? 0 : 3; + type = has_2nd_order ? PLANE_TYPE_Y_NO_DC : PLANE_TYPE_Y_WITH_DC; for (b = 0; b < 16; b++) { @@ -584,7 +577,7 @@ void vp8_optimize_mby(MACROBLOCK *x, const VP8_ENCODER_RTCD *rtcd) if (has_2nd_order) { b=24; - vp8_optimize_b(x, b, vp8_block2type[b], + vp8_optimize_b(x, b, PLANE_TYPE_Y2, ta + vp8_block2above[b], tl + vp8_block2left[b], rtcd); } } @@ -608,18 +601,11 @@ void vp8_optimize_mbuv(MACROBLOCK *x, const VP8_ENCODER_RTCD *rtcd) ta = (ENTROPY_CONTEXT *)&t_above; tl = (ENTROPY_CONTEXT *)&t_left; - for (b = 16; b < 20; b++) + for (b = 16; b < 24; b++) { - vp8_optimize_b(x, b, vp8_block2type[b], + vp8_optimize_b(x, b, PLANE_TYPE_UV, ta + vp8_block2above[b], tl + vp8_block2left[b], rtcd); } - - for (b = 20; b < 24; b++) - { - vp8_optimize_b(x, b, vp8_block2type[b], - ta + vp8_block2above[b], tl + vp8_block2left[b], rtcd); - } - } #endif |