Commit 37234c12 authored by Sebastien Alaiwan's avatar Sebastien Alaiwan

Remove special cases about CONFIG_HIGHBITDEPTH

Change-Id: I51e4a61bfca6d662330476e2d90680f1a9a80304
parent 721847c1
......@@ -58,8 +58,6 @@
(((value) + ((1 << (n)) - 1)) & ~((1 << (n)) - 1))
#define CONVERT_TO_SHORTPTR(x) ((uint16_t *)(((uintptr_t)(x)) << 1))
#if CONFIG_HIGHBITDEPTH
#define CONVERT_TO_BYTEPTR(x) ((uint8_t *)(((uintptr_t)(x)) >> 1))
#endif // CONFIG_HIGHBITDEPTH
#endif // AOM_PORTS_MEM_H_
......@@ -2187,9 +2187,7 @@ static void init_txfm_param(const MACROBLOCKD *xd, TX_SIZE tx_size,
txfm_param->tx_size = tx_size;
txfm_param->eob = eob;
txfm_param->lossless = xd->lossless[xd->mi[0]->mbmi.segment_id];
#if CONFIG_HIGHBITDEPTH
txfm_param->bd = xd->bd;
#endif
#if CONFIG_LGT
txfm_param->is_inter = is_inter_block(&xd->mi[0]->mbmi);
#endif
......@@ -2222,19 +2220,14 @@ void av1_inverse_transform_block(const MACROBLOCKD *xd,
const BLOCK_SIZE tx_bsize = txsize_to_bsize[tx_size];
const int txb_width = block_size_wide[tx_bsize];
const int txb_height = block_size_high[tx_bsize];
int r, c;
#if CONFIG_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
for (r = 0; r < txb_height; r++)
for (c = 0; c < txb_width; c++)
for (int r = 0; r < txb_height; r++)
for (int c = 0; c < txb_width; c++)
CONVERT_TO_SHORTPTR(dst)[r * stride + c] = 0;
} else {
#endif // CONFIG_HIGHBITDEPTH
for (r = 0; r < txb_height; r++)
for (c = 0; c < txb_width; c++) dst[r * stride + c] = 0;
#if CONFIG_HIGHBITDEPTH
for (int r = 0; r < txb_height; r++)
for (int c = 0; c < txb_width; c++) dst[r * stride + c] = 0;
}
#endif // CONFIG_HIGHBITDEPTH
#endif // CONFIG_PVQ
TxfmParam txfm_param;
init_txfm_param(xd, tx_size, tx_type, eob, &txfm_param);
......
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