diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-10-10 10:49:27 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-10-10 10:49:27 -0700 |
| commit | 1e8fc24af8ded08c3ce0e1d3d60008c808bcf0cd (patch) | |
| tree | cf2a449231b27a9bd79d4731946f37f8857189ce /vp9/encoder/vp9_onyx_if.c | |
| parent | 9a1250e3e03ab9e79b0f357139d47d9dc2371240 (diff) | |
| parent | c983c966cbed4919d008c7fc168292af75593bcd (diff) | |
| download | libvpx-1e8fc24af8ded08c3ce0e1d3d60008c808bcf0cd.tar libvpx-1e8fc24af8ded08c3ce0e1d3d60008c808bcf0cd.tar.gz libvpx-1e8fc24af8ded08c3ce0e1d3d60008c808bcf0cd.tar.bz2 libvpx-1e8fc24af8ded08c3ce0e1d3d60008c808bcf0cd.zip | |
Merge "Removing inv_txm4x4_1_add and inv_txm4x4_add function pointers."
Diffstat (limited to 'vp9/encoder/vp9_onyx_if.c')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 7339f42ae..342ff8473 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -17,6 +17,7 @@ #include "vp9/common/vp9_alloccommon.h" #include "vp9/common/vp9_filter.h" +#include "vp9/common/vp9_idct.h" #if CONFIG_VP9_POSTPROC #include "vp9/common/vp9_postproc.h" #endif @@ -1227,14 +1228,8 @@ void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) { cpi->oxcf.cq_level = q_trans[cpi->oxcf.cq_level]; cpi->oxcf.lossless = oxcf->lossless; - if (cpi->oxcf.lossless) { - cpi->mb.e_mbd.inv_txm4x4_1_add = vp9_iwht4x4_1_add; - cpi->mb.e_mbd.inv_txm4x4_add = vp9_iwht4x4_16_add; - } else { - cpi->mb.e_mbd.inv_txm4x4_1_add = vp9_idct4x4_1_add; - cpi->mb.e_mbd.inv_txm4x4_add = vp9_idct4x4_16_add; - } - + cpi->mb.e_mbd.itxm_add = cpi->oxcf.lossless ? vp9_iwht4x4_add + : vp9_idct4x4_add; cpi->baseline_gf_interval = DEFAULT_GF_INTERVAL; cpi->ref_frame_flags = VP9_ALT_FLAG | VP9_GOLD_FLAG | VP9_LAST_FLAG; |