diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-11-01 06:59:17 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-11-01 06:59:17 -0700 |
| commit | f0446164fbabe0f21ecbb4d29ec75b3cb130dfc8 (patch) | |
| tree | c41f4ebac40e6aaca1b6e1295fa1b6b36c9f16d1 /vp9 | |
| parent | 0e1756330b3da4e77c2f4a4f52dbbcdced43f6be (diff) | |
| parent | a49e77af50c663807721a6cfd757c69cf4b75deb (diff) | |
| download | libvpx-f0446164fbabe0f21ecbb4d29ec75b3cb130dfc8.tar libvpx-f0446164fbabe0f21ecbb4d29ec75b3cb130dfc8.tar.gz libvpx-f0446164fbabe0f21ecbb4d29ec75b3cb130dfc8.tar.bz2 libvpx-f0446164fbabe0f21ecbb4d29ec75b3cb130dfc8.zip | |
Merge "simplify read_coef_prob()"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 14 |
1 files 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, |