Commit 9136ab7d authored by Urvang Joshi's avatar Urvang Joshi

Fix logical errors for TX64x64.

- Wrong function argument fix: this was not caught by compile test
because DCT_DCT has a value of 0, which was converted to a NULL pointer.
- Wrong prob array size.

Change-Id: Iaf1747dc7fb40db1d1ab35f965fb60994d8dec95
parent 2dc1c841
......@@ -1843,6 +1843,9 @@ int av1_get_palette_color_index_context(const uint8_t *color_map, int stride,
#if CONFIG_VAR_TX
static const aom_prob default_txfm_partition_probs[TXFM_PARTITION_CONTEXTS] = {
250, 231, 212, 241, 166, 66, 241, 230, 135, 243, 154, 64, 248, 161, 63, 128,
#if CONFIG_TX64X64
128, 128, 128, 128, 128, 128
#endif // CONFIG_TX64X64
};
#if CONFIG_NEW_MULTISYMBOL
static const aom_cdf_prob
......@@ -1862,10 +1865,18 @@ static const aom_cdf_prob
{ AOM_ICDF(248 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(161 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(63 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(128 * 128), AOM_ICDF(32768), 0 }
{ AOM_ICDF(128 * 128), AOM_ICDF(32768), 0 },
#if CONFIG_TX64X64
{ AOM_ICDF(128 * 128), AOM_ICDF(32768), 0 } { AOM_ICDF(128 * 128),
AOM_ICDF(32768), 0 } {
AOM_ICDF(128 * 128), AOM_ICDF(32768), 0 } { AOM_ICDF(128 * 128),
AOM_ICDF(32768), 0 } {
AOM_ICDF(128 * 128), AOM_ICDF(32768), 0 } { AOM_ICDF(128 * 128),
AOM_ICDF(32768), 0 }
#endif // CONFIG_TX64X64
};
#endif // CONFIG_NEW_MULTISYMBOL
#endif
#endif // CONFIG_VAR_TX
static const aom_prob default_skip_probs[SKIP_CONTEXTS] = { 192, 128, 64 };
#if CONFIG_NEW_MULTISYMBOL
......
......@@ -1519,7 +1519,7 @@ static void idct32x32_add(const tran_low_t *input, uint8_t *dest, int stride,
static void idct64x64_add(const tran_low_t *input, uint8_t *dest, int stride,
const TxfmParam *txfm_param) {
(void)txfm_param;
av1_iht64x64_4096_add(input, dest, stride, DCT_DCT);
av1_iht64x64_4096_add(input, dest, stride, txfm_param);
}
#endif // CONFIG_TX64X64
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment