Commit 6731510d authored by Yushin Cho's avatar Yushin Cho

[dist-8x8] Disable it if lossless mode

If "--enable-dist-8x8=1" with a lossless mode, exit with system error.

BUG=aomedia:1027

Change-Id: I08b4cdfd7b94d6098702091d2aab0f94d651ceb9
parent 19b7e051
......@@ -399,6 +399,8 @@ static aom_codec_err_t validate_config(aom_codec_alg_priv_t *ctx,
#endif
#if CONFIG_DIST_8X8
if (extra_cfg->enable_dist_8x8 && extra_cfg->lossless)
ERROR("dist-8x8 cannot be used with lossless compression.");
RANGE_CHECK(extra_cfg, tuning, AOM_TUNE_PSNR, AOM_TUNE_DAALA_DIST);
#else
RANGE_CHECK(extra_cfg, tuning, AOM_TUNE_PSNR, AOM_TUNE_SSIM);
......
......@@ -2259,14 +2259,14 @@ static void dist_8x8_sub8x8_txfm_rd(const AV1_COMP *const cpi, MACROBLOCK *x,
#if CONFIG_HIGHBITDEPTH
uint8_t *pred8;
DECLARE_ALIGNED(16, uint16_t, pred16[MAX_TX_SQUARE]);
DECLARE_ALIGNED(16, uint16_t, pred16[MAX_SB_SQUARE]);
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH)
pred8 = CONVERT_TO_BYTEPTR(pred16);
else
pred8 = (uint8_t *)pred16;
#else
DECLARE_ALIGNED(16, uint8_t, pred8[MAX_TX_SQUARE]);
DECLARE_ALIGNED(16, uint8_t, pred8[MAX_SB_SQUARE]);
#endif // CONFIG_HIGHBITDEPTH
#if CONFIG_HIGHBITDEPTH
......
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