Commit 34e1201a authored by Nathan E. Egge's avatar Nathan E. Egge Committed by Nathan Egge

Force C implementation of 16-point Daala TX's.

This patch fixes a regression introduced in 1d190950 where the encoder
 was using the 16x16 VP9/AV1 transforms for RDO, but then used the Daala
 transforms for encoding.

subset1:

master-daala_dct16@2017-09-13T12:05:18.013Z ->
  master_daala_dct16_use_c@2017-09-13T13:05:02.252Z

   PSNR | PSNR Cb | PSNR Cr | PSNR HVS |    SSIM | MS SSIM | CIEDE 2000
-0.3654 | -0.7634 | -0.7407 |  -0.4884 | -0.4699 | -0.4945 |    -0.5104

master-no_rect_tx-no_var_tx@2017-09-12T00:23:18.153Z ->
  master_daala_dct16_use_c@2017-09-13T13:05:02.252Z

   PSNR | PSNR Cb | PSNR Cr | PSNR HVS |    SSIM | MS SSIM | CIEDE 2000
-0.0133 |  0.1040 | -0.0440 |  -0.0492 | -0.0151 | -0.0120 |     0.0699

Change-Id: Id1830d0975db4bd0320a47fdf45b4bca20881cfb
parent 22fe4a13
......@@ -1843,7 +1843,11 @@ static void inv_txfm_add_16x16(const tran_low_t *input, uint8_t *dest,
case ADST_DCT:
case DCT_ADST:
case ADST_ADST:
#if CONFIG_DAALA_DCT16
av1_iht16x16_256_add_c(input, dest, stride, txfm_param);
#else
av1_iht16x16_256_add(input, dest, stride, txfm_param);
#endif // CONFIG_DAALA_DCT16
break;
#if CONFIG_EXT_TX
case FLIPADST_DCT:
......@@ -1857,7 +1861,11 @@ static void inv_txfm_add_16x16(const tran_low_t *input, uint8_t *dest,
case H_ADST:
case V_FLIPADST:
case H_FLIPADST:
#if CONFIG_DAALA_DCT16
av1_iht16x16_256_add_c(input, dest, stride, txfm_param);
#else
av1_iht16x16_256_add(input, dest, stride, txfm_param);
#endif // CONFIG_DAALA_DCT16
break;
case IDTX: inv_idtx_add_c(input, dest, stride, 16, tx_type); break;
#endif // CONFIG_EXT_TX
......
......@@ -116,7 +116,11 @@ static void fwd_txfm_8x8(const int16_t *src_diff, tran_low_t *coeff,
static void fwd_txfm_16x16(const int16_t *src_diff, tran_low_t *coeff,
int diff_stride, TxfmParam *txfm_param) {
#if CONFIG_DAALA_DCT16
av1_fht16x16_c(src_diff, coeff, diff_stride, txfm_param);
#else
av1_fht16x16(src_diff, coeff, diff_stride, txfm_param);
#endif // CONFIG_DAALA_DCT16
}
static void fwd_txfm_32x32(const int16_t *src_diff, tran_low_t *coeff,
......
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