Replace vp8_inverse_htransform_b() by direct call to vp8_ihtllm_c().

Change-Id: I55ee7566341b04d7e7340fdab95189f82231a792

diff --git a/vp8/common/invtrans.c b/vp8/common/invtrans.c
index 3aba58ccf5ec995bab152a127ffe39278fd5fab6..66e98ec0034e6895c0426ad04e7d24d5f1d463aa 100644 (file)
--- a/vp8/common/invtrans.c
+++ b/vp8/common/invtrans.c
@@ -31,12 +31,6 @@ static void recon_dcblock_8x8(MACROBLOCKD *xd) {
 
 }
 
-#if CONFIG_HYBRIDTRANSFORM
-void vp8_inverse_htransform_b(const vp8_idct_rtcd_vtable_t *rtcd, BLOCKD *b, int pitch) {
-  vp8_ihtllm_c(b->dqcoeff, b->diff, pitch, b->bmi.as_mode.tx_type, 4);
-}
-#endif
-
 void vp8_inverse_transform_b(const vp8_idct_rtcd_vtable_t *rtcd, BLOCKD *b, int pitch) {
   if (b->eob <= 1)
     IDCT_INVOKE(rtcd, idct1)(b->dqcoeff, b->diff, pitch);

diff --git a/vp8/common/invtrans.h b/vp8/common/invtrans.h
index df12226c5874d5698128f05a54ef155b99fbc6cc..073076fe2c612f49f70719993e3f7a7c6943d830 100644 (file)
--- a/vp8/common/invtrans.h
+++ b/vp8/common/invtrans.h
@@ -16,10 +16,6 @@
 #include "idct.h"
 #include "blockd.h"
 
-#if CONFIG_HYBRIDTRANSFORM
-extern void vp8_inverse_htransform_b(const vp8_idct_rtcd_vtable_t *rtcd, BLOCKD *b, int pitch);
-#endif
-
 extern void vp8_inverse_transform_b(const vp8_idct_rtcd_vtable_t *rtcd, BLOCKD *b, int pitch);
 extern void vp8_inverse_transform_mb(const vp8_idct_rtcd_vtable_t *rtcd, MACROBLOCKD *xd);
 extern void vp8_inverse_transform_mby(const vp8_idct_rtcd_vtable_t *rtcd, MACROBLOCKD *xd);

diff --git a/vp8/encoder/encodeintra.c b/vp8/encoder/encodeintra.c
index 323df005b68e30edcd35d2c584220ad8e8f5f9b7..debdd94fb27dcc419046f648ddb5647e73b323df 100644 (file)
--- a/vp8/encoder/encodeintra.c
+++ b/vp8/encoder/encodeintra.c
@@ -90,7 +90,7 @@ void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *rtcd,
     txfm_map(b, b->bmi.as_mode.first);
     vp8_fht_c(be->src_diff, be->coeff, 32, b->bmi.as_mode.tx_type, 4);
     vp8_ht_quantize_b(be, b);
-    vp8_inverse_htransform_b(IF_RTCD(&rtcd->common->idct), b, 32) ;
+    vp8_ihtllm_c(b->dqcoeff, b->diff, 32, b->bmi.as_mode.tx_type, 4);
   } else {
     x->vp8_short_fdct4x4(be->src_diff, be->coeff, 32) ;
     x->quantize_b(be, b) ;