Merge changes I96cd08c9,If8eeb8ff into experimental

* changes:
  hybridtransform8x8: fix compilation
  comp_intra_pred: fix compilation

4 files changed, 9 insertions, 13 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/common/reconintra.c b/vp8/common/reconintra.c
index d858cd153..e391fa9be 100644
--- a/vp8/common/reconintra.c
+++ b/vp8/common/reconintra.c
@@ -358,10 +358,12 @@ void vp8_build_comp_intra_predictors_mby(MACROBLOCKD *xd) {
 
   vp8_build_intra_predictors_internal(xd, xd->dst.y_buffer, xd->dst.y_stride,
                                       predictor[0], 16,
-                                      xd->mode_info_context->mbmi.mode);
+                                      xd->mode_info_context->mbmi.mode,
+                                      16);
   vp8_build_intra_predictors_internal(xd, xd->dst.y_buffer, xd->dst.y_stride,
                                       predictor[1], 16,
-                                      xd->mode_info_context->mbmi.second_mode);
+                                      xd->mode_info_context->mbmi.second_mode,
+                                      16);
 
   for (i = 0; i < 256; i++) {
     xd->predictor[i] = (predictor[0][i] + predictor[1][i] + 1) >> 1;
@@ -411,10 +413,10 @@ void vp8_build_comp_intra_predictors_mbuv(MACROBLOCKD *xd) {
 
   vp8_build_intra_predictors_mbuv_internal(
     xd, predictor[0][0], predictor[1][0], 8,
-    xd->mode_info_context->mbmi.uv_mode);
+    xd->mode_info_context->mbmi.uv_mode, 8);
   vp8_build_intra_predictors_mbuv_internal(
     xd, predictor[0][1], predictor[1][1], 8,
-    xd->mode_info_context->mbmi.second_uv_mode);
+    xd->mode_info_context->mbmi.second_uv_mode, 8);
   for (i = 0; i < 64; i++) {
     xd->predictor[256 + i] = (predictor[0][0][i] + predictor[0][1][i] + 1) >> 1;
     xd->predictor[256 + 64 + i] = (predictor[1][0][i] +
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,