From fb44d3e1da2982fef17cca17bd6c421e98273087 Mon Sep 17 00:00:00 2001 From: John Koleszar Date: Tue, 21 Aug 2012 09:31:31 -0700 Subject: [PATCH] hybridtransform8x8: fix compilation corrected ifdefs to include CONFIG_HYBRIDTRANSFORM8X8 for missing definitions Change-Id: I96cd08c98d74b5ba10866f3fa30252073ce92fa5 --- vp8/common/blockd.h | 2 +- vp8/common/idctllm.c | 6 +----- vp8/encoder/dct.c | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h index 1cba5d35a..4e5d9e813 100644 --- a/vp8/common/blockd.h +++ b/vp8/common/blockd.h @@ -233,7 +233,7 @@ static B_PREDICTION_MODE pred_mode_conv(MB_PREDICTION_MODE mode) { union b_mode_info { struct { B_PREDICTION_MODE first; -#if CONFIG_HYBRIDTRANSFORM +#if CONFIG_HYBRIDTRANSFORM8X8 || CONFIG_HYBRIDTRANSFORM B_PREDICTION_MODE test; TX_TYPE tx_type; #endif diff --git a/vp8/common/idctllm.c b/vp8/common/idctllm.c index ea39634b5..bf019af06 100644 --- a/vp8/common/idctllm.c +++ b/vp8/common/idctllm.c @@ -37,7 +37,7 @@ static const int rounding = 0; // TODO: these transforms can be further converted into integer forms // for complexity optimization -#if CONFIG_HYBRIDTRANSFORM +#if CONFIG_HYBRIDTRANSFORM || CONFIG_HYBRIDTRANSFORM8X8 float idct_4[16] = { 0.500000000000000, 0.653281482438188, 0.500000000000000, 0.270598050073099, 0.500000000000000, 0.270598050073099, -0.500000000000000, -0.653281482438188, @@ -51,9 +51,7 @@ float iadst_4[16] = { 0.577350269189626, 0, -0.577350269189626, 0.577350269189626, 0.656538502008139, -0.577350269189626, 0.428525073124359, -0.228013428883779 }; -#endif -#if CONFIG_HYBRIDTRANSFORM || CONFIG_HYBRIDTRANSFORM8X8 float idct_8[64] = { 0.353553390593274, 0.490392640201615, 0.461939766255643, 0.415734806151273, 0.353553390593274, 0.277785116509801, 0.191341716182545, 0.097545161008064, @@ -91,9 +89,7 @@ float iadst_8[64] = { 0.483002021635509, -0.466553967085785, 0.434217976756762, -0.387095214016348, 0.326790388032145, -0.255357107325375, 0.175227946595736, -0.089131608307532 }; -#endif -#if CONFIG_HYBRIDTRANSFORM8X8 || CONFIG_HYBRIDTRANSFORM void vp8_ihtllm_c(short *input, short *output, int pitch, TX_TYPE tx_type, int tx_dim) { int i, j, k; diff --git a/vp8/encoder/dct.c b/vp8/encoder/dct.c index a7747b843..5f46a9804 100644 --- a/vp8/encoder/dct.c +++ b/vp8/encoder/dct.c @@ -13,7 +13,7 @@ #include "vpx_ports/config.h" #include "vp8/common/idct.h" -#if CONFIG_HYBRIDTRANSFORM +#if CONFIG_HYBRIDTRANSFORM || CONFIG_HYBRIDTRANSFORM8X8 #include "vp8/common/blockd.h" @@ -32,9 +32,7 @@ float adst_4[16] = { 0.656538502008139, -0.228013428883779, -0.577350269189626, 0.428525073124359, 0.428525073124360, -0.656538502008139, 0.577350269189626, -0.228013428883779 }; -#endif -#if CONFIG_HYBRIDTRANSFORM || CONFIG_HYBRIDTRANSFORM8X8 float dct_8[64] = { 0.353553390593274, 0.353553390593274, 0.353553390593274, 0.353553390593274, 0.353553390593274, 0.353553390593274, 0.353553390593274, 0.353553390593274, -- 2.40.0