From 75f45814bacd4826e96cb0133fd5271173489b13 Mon Sep 17 00:00:00 2001 From: Angie Chiang Date: Thu, 3 Nov 2016 16:01:03 -0700 Subject: [PATCH] Separate coefficient cost of U/V planes in write_modes_b() Change-Id: Ie3082db5b0fead8c322b2aeede4eff7cd723ea12 --- av1/common/blockd.h | 3 +-- av1/encoder/bitstream.c | 21 +++++++-------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/av1/common/blockd.h b/av1/common/blockd.h index 53bca13df..1d08cfab4 100644 --- a/av1/common/blockd.h +++ b/av1/common/blockd.h @@ -251,8 +251,7 @@ typedef struct { int current_q_index; #endif #if CONFIG_RD_DEBUG - int64_t txb_cost_y; - int64_t txb_cost_uv; + int64_t txb_coeff_cost[MAX_MB_PLANE]; int mi_row; int mi_col; #endif diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c index 568852f5e..fa6b905dd 100644 --- a/av1/encoder/bitstream.c +++ b/av1/encoder/bitstream.c @@ -1756,8 +1756,7 @@ static void write_modes_b(AV1_COMP *cpi, const TileInfo *const tile, int plane; int bh, bw; #if CONFIG_RD_DEBUG - int64_t txb_cost_y = 0; - int64_t txb_cost_uv = 0; + int64_t txb_coeff_cost[MAX_MB_PLANE] = { 0 }; #endif #if CONFIG_RANS (void)tok; @@ -1903,10 +1902,7 @@ static void write_modes_b(AV1_COMP *cpi, const TileInfo *const tile, #endif // CONFIG_VAR_TX #if CONFIG_RD_DEBUG - if (plane == 0) - txb_cost_y += token_stats.cost; - else - txb_cost_uv += token_stats.cost; + txb_coeff_cost[plane] += token_stats.cost; #else (void)token_stats; #endif @@ -1916,14 +1912,11 @@ static void write_modes_b(AV1_COMP *cpi, const TileInfo *const tile, } } #if CONFIG_RD_DEBUG - if (m->mbmi.txb_cost_y != txb_cost_y) { - dump_mode_info(m); - assert(0); - } - - if (m->mbmi.txb_cost_uv != txb_cost_uv) { - dump_mode_info(m); - assert(0); + for (plane = 0; plane < MAX_MB_PLANE; ++plane) { + if (m->mbmi.txb_coeff_cost[plane] != txb_coeff_cost[plane]) { + dump_mode_info(m); + assert(0); + } } #endif } -- 2.49.0