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

Fix 2 bugs when using both SUPERTX and EXT_TX

Browse Source 
Change-Id: Ibcbe470a97880c294600345337054ed9af84de2b
This commit is contained in:
Geza Lore
2016-01-07 16:03:58 +00:00
committed by Debargha Mukherjee
parent c67fca154e
commit a167244346
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vp10/decoder/decodeframe.c
View File

@@ -1756,7 +1756,7 @@ static void decode_partition(VP10Decoder *const pbi, MACROBLOCKD *const xd,
reset_skip_context(xd, bsize);
#if CONFIG_EXT_TX
if (!skip) {
if (supertx_size <= TX_16X16) {
if (get_ext_tx_types(supertx_size, bsize, 1) > 1) {
int eset = get_ext_tx_set(supertx_size, bsize, 1);
if (eset > 0) {
txfm = vpx_read_tree(r, vp10_ext_tx_inter_tree[eset],

3
vp10/encoder/bitstream.c
View File

@@ -826,6 +826,9 @@ static void pack_inter_mode_mvs(VP10_COMP *cpi, const MODE_INFO *mi,
#if CONFIG_EXT_TX
if (get_ext_tx_types(mbmi->tx_size, bsize, is_inter) > 1 &&
cm->base_qindex > 0 && !mbmi->skip &&
#if CONFIG_SUPERTX
!supertx_enabled &&
#endif // CONFIG_SUPERTX
!segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP)) {
int eset = get_ext_tx_set(mbmi->tx_size, bsize, is_inter);
if (is_inter) {

5
vp10/encoder/encodeframe.c
View File

@@ -1988,8 +1988,9 @@ static void encode_sb(VP10_COMP *cpi, ThreadData *td,
[partition_supertx_context_lookup[partition]][supertx_size][1]++;
td->counts->supertx_size[supertx_size]++;
#if CONFIG_EXT_TX
if (supertx_size <= TX_16X16 && !xd->mi[0]->mbmi.skip) {
int eset = get_ext_tx_types(supertx_size, bsize, 1);
if (get_ext_tx_types(supertx_size, bsize, 1) > 1 &&
!xd->mi[0]->mbmi.skip) {
int eset = get_ext_tx_set(supertx_size, bsize, 1);
if (eset > 0) {
++td->counts->inter_ext_tx[eset][supertx_size]
[xd->mi[0]->mbmi.tx_type];