From efc7535bebd272ae1e6d9ba23126164a3fc205c2 Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Mon, 31 Oct 2016 09:46:42 -0700 Subject: [PATCH] Refactor: read_tx_size_probs() Change-Id: Ibdedd9b8e0b6646b882bc159856ac7c7e7073149 --- av1/decoder/decodeframe.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c index e63a865df..32f6a31dd 100644 --- a/av1/decoder/decodeframe.c +++ b/av1/decoder/decodeframe.c @@ -115,6 +115,14 @@ static TX_MODE read_tx_mode(struct aom_read_bit_buffer *rb) { return aom_rb_read_bit(rb) ? TX_MODE_SELECT : aom_rb_read_literal(rb, 2); } +static void read_tx_size_probs(FRAME_CONTEXT *fc, aom_reader *r) { + int i, j, k; + for (i = 0; i < MAX_TX_DEPTH; ++i) + for (j = 0; j < TX_SIZE_CONTEXTS; ++j) + for (k = 0; k < i + 1; ++k) + av1_diff_update_prob(r, &fc->tx_size_probs[i][j][k], ACCT_STR); +} + #if !CONFIG_EC_ADAPT static void read_switchable_interp_probs(FRAME_CONTEXT *fc, aom_reader *r) { int i, j; @@ -3721,12 +3729,7 @@ static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data, decode_restoration(cm, &r); #endif - if (cm->tx_mode == TX_MODE_SELECT) { - for (i = 0; i < MAX_TX_DEPTH; ++i) - for (j = 0; j < TX_SIZE_CONTEXTS; ++j) - for (k = 0; k < i + 1; ++k) - av1_diff_update_prob(&r, &fc->tx_size_probs[i][j][k], ACCT_STR); - } + if (cm->tx_mode == TX_MODE_SELECT) read_tx_size_probs(fc, &r); read_coef_probs(fc, cm->tx_mode, &r); -- 2.49.0