generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Separate intra and inter tx_size counting" into nextgenv2

Browse Source
This commit is contained in:
Jingning Han
2016-10-24 15:56:33 +00:00
committed by Gerrit Code Review
parent a59d71a678 dc9ad312be
commit 57d093793e
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
av1/decoder/decodemv.c
View File

@@ -1792,12 +1792,11 @@ static void read_inter_frame_mode_info(AV1Decoder *const pbi,
const int width = num_4x4_blocks_wide_lookup[bsize]; const int width = num_4x4_blocks_wide_lookup[bsize];
const int height = num_4x4_blocks_high_lookup[bsize]; const int height = num_4x4_blocks_high_lookup[bsize];
int idx, idy; int idx, idy;
int tx_size_cat = inter_tx_size_cat_lookup[bsize];
#if CONFIG_EXT_TX && CONFIG_RECT_TX #if CONFIG_EXT_TX && CONFIG_RECT_TX
int is_rect_tx_allowed = inter_block && is_rect_tx_allowed_bsize(bsize) && int is_rect_tx_allowed = inter_block && is_rect_tx_allowed_bsize(bsize) &&
!xd->lossless[mbmi->segment_id]; !xd->lossless[mbmi->segment_id];
int use_rect_tx = 0; int use_rect_tx = 0;
int tx_size_cat = inter_tx_size_cat_lookup[bsize];
if (is_rect_tx_allowed) { if (is_rect_tx_allowed) {
use_rect_tx = aom_read(r, cm->fc->rect_tx_prob[tx_size_cat], ACCT_STR); use_rect_tx = aom_read(r, cm->fc->rect_tx_prob[tx_size_cat], ACCT_STR);
if (xd->counts) { if (xd->counts) {
@@ -1817,11 +1816,6 @@ static void read_inter_frame_mode_info(AV1Decoder *const pbi,
#if CONFIG_EXT_TX && CONFIG_RECT_TX #if CONFIG_EXT_TX && CONFIG_RECT_TX
} }
#endif #endif
if (xd->counts) {
const int ctx = get_tx_size_context(xd);
++xd->counts->tx_size[tx_size_cat][ctx]
[txsize_sqr_up_map[mbmi->tx_size]];
}
} else { } else {
if (inter_block) if (inter_block)
mbmi->tx_size = read_tx_size_inter(cm, xd, !mbmi->skip, r); mbmi->tx_size = read_tx_size_inter(cm, xd, !mbmi->skip, r);

4
av1/encoder/encodeframe.c
View File

@@ -5261,11 +5261,15 @@ static void encode_superblock(const AV1_COMP *const cpi, ThreadData *td,
#endif // CONFIG_EXT_TX && CONFIG_RECT_TX #endif // CONFIG_EXT_TX && CONFIG_RECT_TX
if (is_inter) if (is_inter)
tx_partition_count_update(cm, xd, bsize, mi_row, mi_col, td->counts); tx_partition_count_update(cm, xd, bsize, mi_row, mi_col, td->counts);
else
++td->counts->tx_size[tx_size_cat][tx_size_ctx][coded_tx_size];
#if CONFIG_EXT_TX && CONFIG_RECT_TX #if CONFIG_EXT_TX && CONFIG_RECT_TX
} }
#endif #endif
#endif #endif
#if !CONFIG_VAR_TX
++td->counts->tx_size[tx_size_cat][tx_size_ctx][coded_tx_size]; ++td->counts->tx_size[tx_size_cat][tx_size_ctx][coded_tx_size];
#endif
} else { } else {
int i, j; int i, j;
TX_SIZE tx_size; TX_SIZE tx_size;