diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-07-12 16:02:09 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-07-12 16:02:09 -0700 |
| commit | aa518af8c71b1d9ab9798053bdc7113e0c4366dc (patch) | |
| tree | a2ad24a849574d03c8f2a18b68d24969960cbfc1 /vp9/decoder | |
| parent | 444c8d4c53f218f815088a835f30f43521096370 (diff) | |
| parent | cc662dd768ac7375e920c30b0f83e2c1e4b43041 (diff) | |
| download | libvpx-aa518af8c71b1d9ab9798053bdc7113e0c4366dc.tar libvpx-aa518af8c71b1d9ab9798053bdc7113e0c4366dc.tar.gz libvpx-aa518af8c71b1d9ab9798053bdc7113e0c4366dc.tar.bz2 libvpx-aa518af8c71b1d9ab9798053bdc7113e0c4366dc.zip | |
Merge "Adding struct tx_probs and struct tx_counts to cleanup the code."
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 6 | ||||
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 14 |
2 files changed, 8 insertions, 12 deletions
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index eb6cd2ba6..e99ab9c8c 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -60,11 +60,11 @@ static TX_SIZE read_selected_txfm_size(VP9_COMMON *cm, MACROBLOCKD *xd, } if (bsize >= BLOCK_SIZE_SB32X32) - cm->fc.tx_count_32x32p[context][txfm_size]++; + cm->fc.tx_counts.p32x32[context][txfm_size]++; else if (bsize >= BLOCK_SIZE_MB16X16) - cm->fc.tx_count_16x16p[context][txfm_size]++; + cm->fc.tx_counts.p16x16[context][txfm_size]++; else - cm->fc.tx_count_8x8p[context][txfm_size]++; + cm->fc.tx_counts.p8x8[context][txfm_size]++; return txfm_size; } diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 7d134ffdf..5fd9a9fb8 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -68,17 +68,17 @@ static void read_tx_probs(FRAME_CONTEXT *fc, vp9_reader *r) { for (i = 0; i < TX_SIZE_CONTEXTS; ++i) for (j = 0; j < TX_SIZE_MAX_SB - 3; ++j) if (vp9_read(r, VP9_MODE_UPDATE_PROB)) - vp9_diff_update_prob(r, &fc->tx_probs_8x8p[i][j]); + vp9_diff_update_prob(r, &fc->tx_probs.p8x8[i][j]); for (i = 0; i < TX_SIZE_CONTEXTS; ++i) for (j = 0; j < TX_SIZE_MAX_SB - 2; ++j) if (vp9_read(r, VP9_MODE_UPDATE_PROB)) - vp9_diff_update_prob(r, &fc->tx_probs_16x16p[i][j]); + vp9_diff_update_prob(r, &fc->tx_probs.p16x16[i][j]); for (i = 0; i < TX_SIZE_CONTEXTS; ++i) for (j = 0; j < TX_SIZE_MAX_SB - 1; ++j) if (vp9_read(r, VP9_MODE_UPDATE_PROB)) - vp9_diff_update_prob(r, &fc->tx_probs_32x32p[i][j]); + vp9_diff_update_prob(r, &fc->tx_probs.p32x32[i][j]); } static void mb_init_dequantizer(VP9_COMMON *pc, MACROBLOCKD *xd) { @@ -604,9 +604,7 @@ static void update_frame_context(FRAME_CONTEXT *fc) { fc->pre_nmvc = fc->nmvc; vp9_copy(fc->pre_switchable_interp_prob, fc->switchable_interp_prob); vp9_copy(fc->pre_inter_mode_probs, fc->inter_mode_probs); - vp9_copy(fc->pre_tx_probs_8x8p, fc->tx_probs_8x8p); - vp9_copy(fc->pre_tx_probs_16x16p, fc->tx_probs_16x16p); - vp9_copy(fc->pre_tx_probs_32x32p, fc->tx_probs_32x32p); + fc->pre_tx_probs = fc->tx_probs; vp9_copy(fc->pre_mbskip_probs, fc->mbskip_probs); vp9_zero(fc->coef_counts); @@ -621,9 +619,7 @@ static void update_frame_context(FRAME_CONTEXT *fc) { vp9_zero(fc->comp_inter_count); vp9_zero(fc->single_ref_count); vp9_zero(fc->comp_ref_count); - vp9_zero(fc->tx_count_8x8p); - vp9_zero(fc->tx_count_16x16p); - vp9_zero(fc->tx_count_32x32p); + vp9_zero(fc->tx_counts); vp9_zero(fc->mbskip_count); } |