diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2011-12-15 14:23:36 -0500 |
|---|---|---|
| committer | Scott LaVarnway <slavarnway@google.com> | 2011-12-15 14:23:41 -0500 |
| commit | a53d5a4c442a84cacbd8225fac72db3789b3e10c (patch) | |
| tree | 85b3431c866bcfcf3a7ce9412ca26857b5dafd7a /vp8/decoder/decodframe.c | |
| parent | c8df1656bd94928059204242e778bd5b8b9dc7aa (diff) | |
| download | libvpx-a53d5a4c442a84cacbd8225fac72db3789b3e10c.tar libvpx-a53d5a4c442a84cacbd8225fac72db3789b3e10c.tar.gz libvpx-a53d5a4c442a84cacbd8225fac72db3789b3e10c.tar.bz2 libvpx-a53d5a4c442a84cacbd8225fac72db3789b3e10c.zip | |
Moved dequant idct into common
These functions are now used by the encoder.
This is WIP with the goal of creating a common idct/add for
the encoder and decoder. A boost of 1.8% was seen for
the HD rt test clip used.
[Tero] Added needed changes to ARM side.
Change-Id: Ibbb8000be09034203d7adffc457d3c3f8b06a5bf
Diffstat (limited to 'vp8/decoder/decodframe.c')
| -rw-r--r-- | vp8/decoder/decodframe.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index 31eafcf54..4ab09c596 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -15,7 +15,7 @@ #include "vp8/common/reconintra4x4.h" #include "vp8/common/recon.h" #include "vp8/common/reconinter.h" -#include "dequantize.h" +#include "vp8/common/dequantize.h" #include "detokenize.h" #include "vp8/common/invtrans.h" #include "vp8/common/alloccommon.h" @@ -32,7 +32,7 @@ #endif #include "vpx_mem/vpx_mem.h" #include "vp8/common/idct.h" -#include "dequantize.h" + #include "vp8/common/threading.h" #include "decoderthreading.h" #include "dboolhuff.h" @@ -218,7 +218,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, { if (xd->eobs[i] > 1) { - DEQUANT_INVOKE(&pbi->dequant, idct_add) + DEQUANT_INVOKE(&pbi->common.rtcd.dequant, idct_add) (b->qcoeff, b->dequant, *(b->base_dst) + b->dst, b->dst_stride); } @@ -247,7 +247,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, /* do 2nd order transform on the dc block */ if (xd->eobs[24] > 1) { - DEQUANT_INVOKE(&pbi->dequant, block)(b); + DEQUANT_INVOKE(&pbi->common.rtcd.dequant, block)(b); IDCT_INVOKE(RTCD_VTABLE(idct), iwalsh16)(&b->dqcoeff[0], xd->qcoeff); @@ -272,7 +272,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, DQC[0] = 1; } - DEQUANT_INVOKE (&pbi->dequant, idct_add_y_block) + DEQUANT_INVOKE (&pbi->common.rtcd.dequant, idct_add_y_block) (xd->qcoeff, xd->block[0].dequant, xd->dst.y_buffer, xd->dst.y_stride, xd->eobs); @@ -281,7 +281,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, DQC[0] = dc_dequant_temp; } - DEQUANT_INVOKE (&pbi->dequant, idct_add_uv_block) + DEQUANT_INVOKE (&pbi->common.rtcd.dequant, idct_add_uv_block) (xd->qcoeff+16*16, xd->block[16].dequant, xd->dst.u_buffer, xd->dst.v_buffer, xd->dst.uv_stride, xd->eobs+16); |