Merge "tx64x64 experiment fix for high-bitdepth" into nextgen

This commit is contained in:
Debargha Mukherjee 2015-09-25 03:22:54 +00:00 committed by Gerrit Code Review
commit 1e2cbf515e
2 changed files with 4 additions and 3 deletions

View File

@ -3788,8 +3788,9 @@ void vp9_highbd_iht16x16_add(TX_TYPE tx_type, const tran_low_t *input,
}
#if CONFIG_TX64X64
void vp9_highbd_idct64x64_4096_add_c(const tran_low_t *input, uint8_t *dest,
void vp9_highbd_idct64x64_4096_add_c(const tran_low_t *input, uint8_t *dest8,
int stride, int bd) {
uint16_t *dest = CONVERT_TO_SHORTPTR(dest8);
// vp9_clear_system_state(); // Make it simd safe : __asm emms;
{
double out[64 * 64], out2[64 * 64];

View File

@ -543,12 +543,12 @@ static void inverse_transform_block(MACROBLOCKD* xd, int plane, int block,
xd->bd);
break;
case TX_32X32:
tx_type = DCT_DCT;
tx_type = get_tx_type_large(plane_type, xd);
vp9_highbd_idct32x32_add(dqcoeff, dst, stride, eob, xd->bd);
break;
#if CONFIG_TX64X64
case TX_64X64:
tx_type = DCT_DCT;
tx_type = get_tx_type_large(plane_type, xd);
vp9_highbd_idct64x64_add(dqcoeff, dst, stride, eob, xd->bd);
break;
#endif // CONFIG_TX64X64