diff options
| author | Debargha Mukherjee <debargha@google.com> | 2016-01-06 11:24:57 -0800 |
|---|---|---|
| committer | Debargha Mukherjee <debargha@google.com> | 2016-01-08 11:13:46 -0800 |
| commit | f7dfa4ece7b4e2aef190923abe4a3f1d3ca3ece8 (patch) | |
| tree | 4f775faea7fd1be5147f090025b413ed62e428ab /vp10/encoder/encodeframe.c | |
| parent | 2bd4f444092bf1902a1caca66e14e8e75189191d (diff) | |
| download | libvpx-f7dfa4ece7b4e2aef190923abe4a3f1d3ca3ece8.tar libvpx-f7dfa4ece7b4e2aef190923abe4a3f1d3ca3ece8.tar.gz libvpx-f7dfa4ece7b4e2aef190923abe4a3f1d3ca3ece8.tar.bz2 libvpx-f7dfa4ece7b4e2aef190923abe4a3f1d3ca3ece8.zip | |
Modifies inter/intra coding to allow all tx types
The nominal tx_type for a given mode is used as a context
to encode the actual tx_type for intra.
Results:
derflr: -0.241% BDRATE
hevcmr: -0.366% BDRATE
Change-Id: Icfe7b0a58d79bc6497a06e3441779afec6e01e21
Diffstat (limited to 'vp10/encoder/encodeframe.c')
| -rw-r--r-- | vp10/encoder/encodeframe.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/vp10/encoder/encodeframe.c b/vp10/encoder/encodeframe.c index 9381b653d..b65d52281 100644 --- a/vp10/encoder/encodeframe.c +++ b/vp10/encoder/encodeframe.c @@ -3024,5 +3024,18 @@ static void encode_superblock(VP10_COMP *cpi, ThreadData *td, } ++td->counts->tx.tx_totals[mbmi->tx_size]; ++td->counts->tx.tx_totals[get_uv_tx_size(mbmi, &xd->plane[1])]; +#if CONFIG_EXT_TX + if (mbmi->tx_size < TX_32X32 && + cm->base_qindex > 0 && !mbmi->skip && + !segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP)) { + if (is_inter_block(mbmi)) { + ++td->counts->inter_ext_tx[mbmi->tx_size][mbmi->tx_type]; + } else { + ++td->counts->intra_ext_tx[mbmi->tx_size] + [intra_mode_to_tx_type_context[mbmi->mode]] + [mbmi->tx_type]; + } + } +#endif // CONFIG_EXT_TX } } |