diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2012-10-09 09:18:21 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2012-10-09 09:18:21 -0700 |
| commit | 9ca3c8b2c467d31abac9a5270d114105e503fe9e (patch) | |
| tree | 6b7218ed3a712ec531c6434d6101a0a1ee8b966d /vp8/common/onyxc_int.h | |
| parent | 54434bdba2003c316701bc409c50deffb9fd60e7 (diff) | |
| download | libvpx-9ca3c8b2c467d31abac9a5270d114105e503fe9e.tar libvpx-9ca3c8b2c467d31abac9a5270d114105e503fe9e.tar.gz libvpx-9ca3c8b2c467d31abac9a5270d114105e503fe9e.tar.bz2 libvpx-9ca3c8b2c467d31abac9a5270d114105e503fe9e.zip | |
Selectable transform size try 2.
Results: derf (vanilla or +hybridtx) +0.2% and (+hybrid16x16
or +tx16x16) +0.7%-0.8%; HD (vanilla or +hybridtx) +0.1-0.2%
and (+hybrid16x16 or +tx16x16) +1.4%, STD/HD (vanilla or +hybridtx)
about even, and (+hybrid16x16 or +tx16x16) +0.8-1.0%.
Change-Id: I03899e2f7a64e725a863f32e55366035ba77aa62
Diffstat (limited to 'vp8/common/onyxc_int.h')
| -rw-r--r-- | vp8/common/onyxc_int.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h index 7c6093b41..e3361556f 100644 --- a/vp8/common/onyxc_int.h +++ b/vp8/common/onyxc_int.h @@ -163,10 +163,16 @@ typedef enum { NB_PREDICTION_TYPES = 3, } COMPPREDMODE_TYPE; -/* TODO: allows larger transform */ typedef enum { ONLY_4X4 = 0, - ALLOW_8X8 = 1 + ALLOW_8X8 = 1, +#if CONFIG_TX16X16 + ALLOW_16X16 = 2, +#endif +#if CONFIG_TX_SELECT + TX_MODE_SELECT = 2 + CONFIG_TX16X16, +#endif + NB_TXFM_MODES = 2 + CONFIG_TX16X16 + CONFIG_TX_SELECT, } TXFM_MODE; typedef struct VP8_COMMON_RTCD { @@ -306,6 +312,11 @@ typedef struct VP8Common { vp8_prob prob_comppred[COMP_PRED_CONTEXTS]; +#if CONFIG_TX_SELECT + // FIXME contextualize + vp8_prob prob_tx[TX_SIZE_MAX - 1]; +#endif + vp8_prob mbskip_pred_probs[MBSKIP_CONTEXTS]; FRAME_CONTEXT lfc_a; /* last alt ref entropy */ |