diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-06-18 10:16:25 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-06-18 10:16:25 -0700 |
| commit | dfc0385291c31cb0c7308d9645607a411560b707 (patch) | |
| tree | b7f07f5bb1b6babb097b9f0dc6bfdfdf130b1101 /vp9/encoder | |
| parent | 9524765557cb48a74c5d31c8a2b141511d8f98ac (diff) | |
| parent | 686b99741cd85ef91a92b6db752de599c70d1698 (diff) | |
| download | libvpx-dfc0385291c31cb0c7308d9645607a411560b707.tar libvpx-dfc0385291c31cb0c7308d9645607a411560b707.tar.gz libvpx-dfc0385291c31cb0c7308d9645607a411560b707.tar.bz2 libvpx-dfc0385291c31cb0c7308d9645607a411560b707.zip | |
Merge "Removing vp9_invtrans.{c, h} files."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 1 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encodeintra.c | 1 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encodemb.c | 18 |
3 files changed, 13 insertions, 7 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index bb784db12..f0f2ef5d3 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 fe4e9fd0f..f29dba0c1 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 90f00d2be..f0202450e 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; |