From a49e77af50c663807721a6cfd757c69cf4b75deb Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Wed, 30 Oct 2013 18:06:42 -0700 Subject: simplify read_coef_prob() Change-Id: I529c634db4f81ba5386092c126f53312b1e51b2b --- vp9/decoder/vp9_decodframe.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index e3a2b7710..c7ca18cf2 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -552,16 +552,10 @@ static void read_coef_probs_common(vp9_coeff_probs_model *coef_probs, static void read_coef_probs(FRAME_CONTEXT *fc, TX_MODE tx_mode, vp9_reader *r) { - read_coef_probs_common(fc->coef_probs[TX_4X4], r); - - if (tx_mode > ONLY_4X4) - read_coef_probs_common(fc->coef_probs[TX_8X8], r); - - if (tx_mode > ALLOW_8X8) - read_coef_probs_common(fc->coef_probs[TX_16X16], r); - - if (tx_mode > ALLOW_16X16) - read_coef_probs_common(fc->coef_probs[TX_32X32], r); + const TX_SIZE max_tx_size = tx_mode_to_biggest_tx_size[tx_mode]; + TX_SIZE tx_size; + for (tx_size = TX_4X4; tx_size <= max_tx_size; ++tx_size) + read_coef_probs_common(fc->coef_probs[tx_size], r); } static void setup_segmentation(struct segmentation *seg, -- cgit v1.2.3