diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2012-10-12 21:41:58 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2012-10-14 08:04:05 -0700 |
| commit | f1e629320b5526c02588a23de118f8810d13568a (patch) | |
| tree | 162011c5d424ca6dc1e8f70cd1b29bc6453d4afe /vp8/common | |
| parent | e03715fe6ce7b18ba87f54c6fe5ea215abe757ed (diff) | |
| download | libvpx-f1e629320b5526c02588a23de118f8810d13568a.tar libvpx-f1e629320b5526c02588a23de118f8810d13568a.tar.gz libvpx-f1e629320b5526c02588a23de118f8810d13568a.tar.bz2 libvpx-f1e629320b5526c02588a23de118f8810d13568a.zip | |
Add a _4x4 sufix to all 4x4-transform-related functions.
This includes trellis optimization, forward/inverse transform,
quantization, tokenization and stuffing functions.
Change-Id: Ibd34132e1bf0cd667671a57b3f25b3d361b9bf8a
Diffstat (limited to 'vp8/common')
| -rw-r--r-- | vp8/common/invtrans.c | 22 | ||||
| -rw-r--r-- | vp8/common/invtrans.h | 8 |
2 files changed, 15 insertions, 15 deletions
diff --git a/vp8/common/invtrans.c b/vp8/common/invtrans.c index 66e98ec00..a912642fb 100644 --- a/vp8/common/invtrans.c +++ b/vp8/common/invtrans.c @@ -31,7 +31,7 @@ static void recon_dcblock_8x8(MACROBLOCKD *xd) { } -void vp8_inverse_transform_b(const vp8_idct_rtcd_vtable_t *rtcd, BLOCKD *b, int pitch) { +void vp8_inverse_transform_b_4x4(const vp8_idct_rtcd_vtable_t *rtcd, BLOCKD *b, int pitch) { if (b->eob <= 1) IDCT_INVOKE(rtcd, idct1)(b->dqcoeff, b->diff, pitch); else @@ -39,8 +39,8 @@ void vp8_inverse_transform_b(const vp8_idct_rtcd_vtable_t *rtcd, BLOCKD *b, int } -void vp8_inverse_transform_mby(const vp8_idct_rtcd_vtable_t *rtcd, - MACROBLOCKD *xd) { +void vp8_inverse_transform_mby_4x4(const vp8_idct_rtcd_vtable_t *rtcd, + MACROBLOCKD *xd) { int i; BLOCKD *blockd = xd->block; @@ -50,24 +50,24 @@ void vp8_inverse_transform_mby(const vp8_idct_rtcd_vtable_t *rtcd, recon_dcblock(xd); for (i = 0; i < 16; i++) { - vp8_inverse_transform_b(rtcd, &blockd[i], 32); + vp8_inverse_transform_b_4x4(rtcd, &blockd[i], 32); } } -void vp8_inverse_transform_mbuv(const vp8_idct_rtcd_vtable_t *rtcd, - MACROBLOCKD *xd) { +void vp8_inverse_transform_mbuv_4x4(const vp8_idct_rtcd_vtable_t *rtcd, + MACROBLOCKD *xd) { int i; BLOCKD *blockd = xd->block; for (i = 16; i < 24; i++) { - vp8_inverse_transform_b(rtcd, &blockd[i], 16); + vp8_inverse_transform_b_4x4(rtcd, &blockd[i], 16); } } -void vp8_inverse_transform_mb(const vp8_idct_rtcd_vtable_t *rtcd, - MACROBLOCKD *xd) { +void vp8_inverse_transform_mb_4x4(const vp8_idct_rtcd_vtable_t *rtcd, + MACROBLOCKD *xd) { int i; BLOCKD *blockd = xd->block; @@ -81,12 +81,12 @@ void vp8_inverse_transform_mb(const vp8_idct_rtcd_vtable_t *rtcd, } for (i = 0; i < 16; i++) { - vp8_inverse_transform_b(rtcd, &blockd[i], 32); + vp8_inverse_transform_b_4x4(rtcd, &blockd[i], 32); } for (i = 16; i < 24; i++) { - vp8_inverse_transform_b(rtcd, &blockd[i], 16); + vp8_inverse_transform_b_4x4(rtcd, &blockd[i], 16); } } diff --git a/vp8/common/invtrans.h b/vp8/common/invtrans.h index 073076fe2..4944f6f50 100644 --- a/vp8/common/invtrans.h +++ b/vp8/common/invtrans.h @@ -16,10 +16,10 @@ #include "idct.h" #include "blockd.h" -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); -extern void vp8_inverse_transform_mbuv(const vp8_idct_rtcd_vtable_t *rtcd, MACROBLOCKD *xd); +extern void vp8_inverse_transform_b_4x4(const vp8_idct_rtcd_vtable_t *rtcd, BLOCKD *b, int pitch); +extern void vp8_inverse_transform_mb_4x4(const vp8_idct_rtcd_vtable_t *rtcd, MACROBLOCKD *xd); +extern void vp8_inverse_transform_mby_4x4(const vp8_idct_rtcd_vtable_t *rtcd, MACROBLOCKD *xd); +extern void vp8_inverse_transform_mbuv_4x4(const vp8_idct_rtcd_vtable_t *rtcd, MACROBLOCKD *xd); extern void vp8_inverse_transform_b_8x8(const vp8_idct_rtcd_vtable_t *rtcd, short *input_dqcoeff, short *output_coeff, int pitch); extern void vp8_inverse_transform_mb_8x8(const vp8_idct_rtcd_vtable_t *rtcd, MACROBLOCKD *xd); |