New probs for filters/tx_size and a few others
* New probs for subpel filters/tx_count * Makes a change to not reset to defaults for the tx_size probs if an intermediate frame reverts to using a fixed tx_size. * A few updates to the parameters for backward adaptation for mode/mv * some cosmetic cleanups derf300: +0.06% Change-Id: I22994d659bc31ca7a4fc8820fde24001e64a2920
This commit is contained in:
@@ -61,32 +61,25 @@ static void setup_txfm_mode(VP9_COMMON *pc, int lossless, vp9_reader *r) {
|
||||
int i, j;
|
||||
for (i = 0; i < TX_SIZE_CONTEXTS; ++i) {
|
||||
for (j = 0; j < TX_SIZE_MAX_SB - 3; ++j) {
|
||||
if (vp9_read(r, VP9_DEF_UPDATE_PROB))
|
||||
if (vp9_read(r, VP9_MODE_UPDATE_PROB))
|
||||
pc->fc.tx_probs_8x8p[i][j] =
|
||||
vp9_read_prob_diff_update(r, pc->fc.tx_probs_8x8p[i][j]);
|
||||
}
|
||||
}
|
||||
for (i = 0; i < TX_SIZE_CONTEXTS; ++i) {
|
||||
for (j = 0; j < TX_SIZE_MAX_SB - 2; ++j) {
|
||||
if (vp9_read(r, VP9_DEF_UPDATE_PROB))
|
||||
if (vp9_read(r, VP9_MODE_UPDATE_PROB))
|
||||
pc->fc.tx_probs_16x16p[i][j] =
|
||||
vp9_read_prob_diff_update(r, pc->fc.tx_probs_16x16p[i][j]);
|
||||
}
|
||||
}
|
||||
for (i = 0; i < TX_SIZE_CONTEXTS; ++i) {
|
||||
for (j = 0; j < TX_SIZE_MAX_SB - 1; ++j) {
|
||||
if (vp9_read(r, VP9_DEF_UPDATE_PROB))
|
||||
if (vp9_read(r, VP9_MODE_UPDATE_PROB))
|
||||
pc->fc.tx_probs_32x32p[i][j] =
|
||||
vp9_read_prob_diff_update(r, pc->fc.tx_probs_32x32p[i][j]);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
vpx_memcpy(pc->fc.tx_probs_8x8p, vp9_default_tx_probs_8x8p,
|
||||
sizeof(vp9_default_tx_probs_8x8p));
|
||||
vpx_memcpy(pc->fc.tx_probs_16x16p, vp9_default_tx_probs_16x16p,
|
||||
sizeof(vp9_default_tx_probs_16x16p));
|
||||
vpx_memcpy(pc->fc.tx_probs_32x32p, vp9_default_tx_probs_32x32p,
|
||||
sizeof(vp9_default_tx_probs_32x32p));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user