diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2012-02-28 17:12:08 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2012-02-28 17:41:03 -0800 |
| commit | d476165107297a26d548fd63b1b77353d08b559d (patch) | |
| tree | a4dd17ddede06635684add5220d5f8c18fc0f0a4 /vp8/common/generic/systemdependent.c | |
| parent | af5c774b5c8a4cdf6d6792e63ce09d2702909de5 (diff) | |
| download | libvpx-d476165107297a26d548fd63b1b77353d08b559d.tar libvpx-d476165107297a26d548fd63b1b77353d08b559d.tar.gz libvpx-d476165107297a26d548fd63b1b77353d08b559d.tar.bz2 libvpx-d476165107297a26d548fd63b1b77353d08b559d.zip | |
Compound intra prediction (b_pred/4x4 only, for now),
Also remove duplicate build_intra_predictors_mby/uv().
Change-Id: I78607e7304952a9b962a5b25af9bb9c48692187b
Diffstat (limited to 'vp8/common/generic/systemdependent.c')
| -rw-r--r-- | vp8/common/generic/systemdependent.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/vp8/common/generic/systemdependent.c b/vp8/common/generic/systemdependent.c index 90ff889fa..0adefe54c 100644 --- a/vp8/common/generic/systemdependent.c +++ b/vp8/common/generic/systemdependent.c @@ -48,18 +48,38 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) rtcd->recon.recon_mby = vp8_recon_mby_c; rtcd->recon.build_intra_predictors_mby = vp8_build_intra_predictors_mby; +#if CONFIG_COMP_INTRA_PRED + rtcd->recon.build_comp_intra_predictors_mby = + vp8_build_comp_intra_predictors_mby; +#endif rtcd->recon.build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s; rtcd->recon.build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv; rtcd->recon.build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s; +#if CONFIG_COMP_INTRA_PRED + rtcd->recon.build_comp_intra_predictors_mbuv = + vp8_build_comp_intra_predictors_mbuv; +#endif rtcd->recon.intra4x4_predict = vp8_intra4x4_predict; +#if CONFIG_COMP_INTRA_PRED + rtcd->recon.comp_intra4x4_predict = + vp8_comp_intra4x4_predict; +#endif rtcd->recon.intra8x8_predict = vp8_intra8x8_predict; +#if CONFIG_COMP_INTRA_PRED + rtcd->recon.comp_intra8x8_predict = + vp8_comp_intra8x8_predict; +#endif rtcd->recon.intra_uv4x4_predict = vp8_intra_uv4x4_predict; +#if CONFIG_COMP_INTRA_PRED + rtcd->recon.comp_intra_uv4x4_predict = + vp8_comp_intra_uv4x4_predict; +#endif rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_c; rtcd->subpix.sixtap8x8 = vp8_sixtap_predict8x8_c; |