diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2012-11-13 12:09:02 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2012-11-14 08:58:24 -0800 |
| commit | 1e3dd49fe389dcbd0745dafa556235d118674515 (patch) | |
| tree | ca043ca111681f1f2eb1ebef270470d76fd92647 /vp9 | |
| parent | c79ae1713cc18f0a7952bffa3c244ab1d07aa249 (diff) | |
| download | libvpx-1e3dd49fe389dcbd0745dafa556235d118674515.tar libvpx-1e3dd49fe389dcbd0745dafa556235d118674515.tar.gz libvpx-1e3dd49fe389dcbd0745dafa556235d118674515.tar.bz2 libvpx-1e3dd49fe389dcbd0745dafa556235d118674515.zip | |
Don't use hybrid transform (ADST) for superblocks.
This is in line with other cases where we disable ADST if prediction
size and transform size don't match. Before this patch, the RD loop
will use ADST for superblocks, but frame encoding/decoding won't.
Change-Id: I700368c632eb72b5e089c22ef25649d99d7697d0
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/blockd.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vp9/common/blockd.h b/vp9/common/blockd.h index 0cfa9dcff..7722ed108 100644 --- a/vp9/common/blockd.h +++ b/vp9/common/blockd.h @@ -501,6 +501,9 @@ static TX_TYPE get_tx_type_8x8(const MACROBLOCKD *xd, const BLOCKD *b) { static TX_TYPE get_tx_type_16x16(const MACROBLOCKD *xd, const BLOCKD *b) { TX_TYPE tx_type = DCT_DCT; if (xd->mode_info_context->mbmi.mode < I8X8_PRED && +#if CONFIG_SUPERBLOCKS + !xd->mode_info_context->mbmi.encoded_as_sb && +#endif xd->q_index < ACTIVE_HT16) { tx_type = txfm_map(pred_mode_conv(xd->mode_info_context->mbmi.mode)); } |