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

Remove test from B_MODE_INFO.

It is essentially a duplicate of mode for RD-only purposes. Removing it
saves us 4 bytes per B_MODE_INFO, or ~0.5MB for a 1080p video encode.

Change-Id: I0a54db5f51658b3946d7efb1ca6e8cfbda0cdf88
parent 66180f22
...@@ -237,7 +237,6 @@ union b_mode_info { ...@@ -237,7 +237,6 @@ union b_mode_info {
struct { struct {
B_PREDICTION_MODE first; B_PREDICTION_MODE first;
#if CONFIG_HYBRIDTRANSFORM8X8 || CONFIG_HYBRIDTRANSFORM || CONFIG_HYBRIDTRANSFORM16X16 #if CONFIG_HYBRIDTRANSFORM8X8 || CONFIG_HYBRIDTRANSFORM || CONFIG_HYBRIDTRANSFORM16X16
B_PREDICTION_MODE test;
TX_TYPE tx_type; TX_TYPE tx_type;
#endif #endif
......
...@@ -74,7 +74,6 @@ void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *rtcd, ...@@ -74,7 +74,6 @@ void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *rtcd,
#if CONFIG_HYBRIDTRANSFORM #if CONFIG_HYBRIDTRANSFORM
if (x->q_index < ACTIVE_HT) { if (x->q_index < ACTIVE_HT) {
b->bmi.as_mode.test = b->bmi.as_mode.first;
txfm_map(b, b->bmi.as_mode.first); txfm_map(b, b->bmi.as_mode.first);
vp8_fht_c(be->src_diff, be->coeff, 32, b->bmi.as_mode.tx_type, 4); vp8_fht_c(be->src_diff, be->coeff, 32, b->bmi.as_mode.tx_type, 4);
vp8_ht_quantize_b_4x4(be, b); vp8_ht_quantize_b_4x4(be, b);
......
...@@ -1182,6 +1182,7 @@ static int64_t rd_pick_intra4x4block(VP8_COMP *cpi, MACROBLOCK *x, BLOCK *be, ...@@ -1182,6 +1182,7 @@ static int64_t rd_pick_intra4x4block(VP8_COMP *cpi, MACROBLOCK *x, BLOCK *be,
// Do we need to do this for mode2 also? // Do we need to do this for mode2 also?
if (mode == B_LD_PRED || mode == B_VL_PRED) if (mode == B_LD_PRED || mode == B_VL_PRED)
continue; continue;
b->bmi.as_mode.first = mode;
rate = bmode_costs[mode]; rate = bmode_costs[mode];
#if CONFIG_COMP_INTRA_PRED #if CONFIG_COMP_INTRA_PRED
...@@ -1200,7 +1201,6 @@ static int64_t rd_pick_intra4x4block(VP8_COMP *cpi, MACROBLOCK *x, BLOCK *be, ...@@ -1200,7 +1201,6 @@ static int64_t rd_pick_intra4x4block(VP8_COMP *cpi, MACROBLOCK *x, BLOCK *be,
#if CONFIG_HYBRIDTRANSFORM #if CONFIG_HYBRIDTRANSFORM
if (active_ht) { if (active_ht) {
b->bmi.as_mode.test = mode;
txfm_map(b, mode); txfm_map(b, mode);
vp8_fht_c(be->src_diff, be->coeff, 32, b->bmi.as_mode.tx_type, 4); vp8_fht_c(be->src_diff, be->coeff, 32, b->bmi.as_mode.tx_type, 4);
vp8_ht_quantize_b_4x4(be, b); vp8_ht_quantize_b_4x4(be, b);
......
Supports Markdown
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