diff --git a/vp9/common/vp9_invtrans.c b/vp9/common/vp9_invtrans.c deleted file mode 100644 index d47fca190b4cb5bdf38746c911511a4ea078fe65..0000000000000000000000000000000000000000 --- a/vp9/common/vp9_invtrans.c +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2010 The WebM project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#include "vp9/common/vp9_invtrans.h" -#include "./vp9_rtcd.h" - -void vp9_inverse_transform_b_4x4_add(MACROBLOCKD *xd, int eob, int16_t *dqcoeff, - uint8_t *dest, int stride) { - if (eob <= 1) - xd->inv_txm4x4_1_add(dqcoeff, dest, stride); - else - xd->inv_txm4x4_add(dqcoeff, dest, stride); -} diff --git a/vp9/common/vp9_invtrans.h b/vp9/common/vp9_invtrans.h deleted file mode 100644 index dbdc50a2a4a774c2581721923a2dec6e04356f89..0000000000000000000000000000000000000000 --- a/vp9/common/vp9_invtrans.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2010 The WebM project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef VP9_COMMON_VP9_INVTRANS_H_ -#define VP9_COMMON_VP9_INVTRANS_H_ - -#include "./vpx_config.h" -#include "vpx/vpx_integer.h" -#include "vp9/common/vp9_blockd.h" - -void vp9_inverse_transform_b_4x4_add(MACROBLOCKD *xd, int eob, int16_t *dqcoeff, - uint8_t *dest, int stride); -#endif // VP9_COMMON_VP9_INVTRANS_H_ diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 9569507bf609b4cf18ffe38238c69c3c8edf8014..a7be1d42a972077d6f2c44bf1d29114f207e98a1 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -20,7 +20,6 @@ #include "vp9/common/vp9_reconintra.h" #include "vp9/common/vp9_reconinter.h" #include "vp9/common/vp9_entropy.h" -#include "vp9/common/vp9_invtrans.h" #include "vp9/common/vp9_alloccommon.h" #include "vp9/common/vp9_entropymode.h" #include "vp9/common/vp9_quant_common.h" diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index bb784db1221fb4235d0ee4ffd1476bcab366b58d..f0f2ef5d3779ae9b050affea93172883cf353ae8 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -23,7 +23,6 @@ #include "vp9/encoder/vp9_segmentation.h" #include "vp9/encoder/vp9_encodeintra.h" #include "vp9/common/vp9_reconinter.h" -#include "vp9/common/vp9_invtrans.h" #include "vp9/encoder/vp9_rdopt.h" #include "vp9/common/vp9_findnearmv.h" #include "vp9/common/vp9_reconintra.h" diff --git a/vp9/encoder/vp9_encodeintra.c b/vp9/encoder/vp9_encodeintra.c index fe4e9fd0f909856daf5510d675bd9e50f6eaea42..f29dba0c113a2a22dd85c20ec1b2d418a980987d 100644 --- a/vp9/encoder/vp9_encodeintra.c +++ b/vp9/encoder/vp9_encodeintra.c @@ -13,7 +13,6 @@ #include "vp9/encoder/vp9_quantize.h" #include "vp9/common/vp9_reconintra.h" #include "vp9/encoder/vp9_encodemb.h" -#include "vp9/common/vp9_invtrans.h" #include "vp9/encoder/vp9_encodeintra.h" int vp9_encode_intra(VP9_COMP *cpi, MACROBLOCK *x, int use_16x16_pred) { diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index 90f00d2be14c6672fc51d1d7b35ab1c1ee5daa9a..f0202450eefc7e0ef0249742fd9265268da35d6e 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -13,7 +13,6 @@ #include "vp9/common/vp9_reconinter.h" #include "vp9/encoder/vp9_quantize.h" #include "vp9/encoder/vp9_tokenize.h" -#include "vp9/common/vp9_invtrans.h" #include "vp9/common/vp9_reconintra.h" #include "vpx_mem/vpx_mem.h" #include "vp9/encoder/vp9_rdopt.h" @@ -39,6 +38,15 @@ void vp9_subtract_block(int rows, int cols, } } +static void inverse_transform_b_4x4_add(MACROBLOCKD *xd, int eob, + int16_t *dqcoeff, uint8_t *dest, + int stride) { + if (eob <= 1) + xd->inv_txm4x4_1_add(dqcoeff, dest, stride); + else + xd->inv_txm4x4_add(dqcoeff, dest, stride); +} + static void subtract_plane(MACROBLOCK *x, BLOCK_SIZE_TYPE bsize, int plane) { struct macroblock_plane *const p = &x->plane[plane]; @@ -527,8 +535,8 @@ static void encode_block(int plane, int block, BLOCK_SIZE_TYPE bsize, // this is like vp9_short_idct4x4 but has a special case around eob<=1 // which is significant (not just an optimization) for the lossless // case. - vp9_inverse_transform_b_4x4_add(xd, pd->eobs[block], dqcoeff, - dst, pd->dst.stride); + inverse_transform_b_4x4_add(xd, pd->eobs[block], dqcoeff, + dst, pd->dst.stride); else vp9_short_iht4x4_add(dqcoeff, dst, pd->dst.stride, tx_type); break; @@ -667,8 +675,8 @@ static void encode_block_intra(int plane, int block, BLOCK_SIZE_TYPE bsize, // this is like vp9_short_idct4x4 but has a special case around eob<=1 // which is significant (not just an optimization) for the lossless // case. - vp9_inverse_transform_b_4x4_add(xd, pd->eobs[block], dqcoeff, - dst, pd->dst.stride); + inverse_transform_b_4x4_add(xd, pd->eobs[block], dqcoeff, + dst, pd->dst.stride); else vp9_short_iht4x4_add(dqcoeff, dst, pd->dst.stride, tx_type); break; diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk index b6d50f8efb52695bb16a241478204a09023865cd..c78334485ccc5f2e1ae003a7a2f2ca1958e58b81 100644 --- a/vp9/vp9_common.mk +++ b/vp9/vp9_common.mk @@ -38,7 +38,6 @@ VP9_COMMON_SRCS-yes += common/vp9_enums.h VP9_COMMON_SRCS-yes += common/vp9_extend.h VP9_COMMON_SRCS-yes += common/vp9_findnearmv.h VP9_COMMON_SRCS-yes += common/vp9_idct.h -VP9_COMMON_SRCS-yes += common/vp9_invtrans.h VP9_COMMON_SRCS-yes += common/vp9_loopfilter.h VP9_COMMON_SRCS-yes += common/vp9_modecont.h VP9_COMMON_SRCS-yes += common/vp9_mv.h @@ -59,7 +58,6 @@ VP9_COMMON_SRCS-yes += common/vp9_textblit.h VP9_COMMON_SRCS-yes += common/vp9_tile_common.h VP9_COMMON_SRCS-yes += common/vp9_tile_common.c VP9_COMMON_SRCS-yes += common/vp9_treecoder.h -VP9_COMMON_SRCS-yes += common/vp9_invtrans.c VP9_COMMON_SRCS-yes += common/vp9_loopfilter.c VP9_COMMON_SRCS-yes += common/vp9_loopfilter_filters.c VP9_COMMON_SRCS-yes += common/vp9_mbpitch.c