diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2012-08-20 17:04:23 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-08-20 17:04:23 -0700 |
| commit | 4396441b8b6a97aae50694d49971cdc062c469e0 (patch) | |
| tree | c7e53cb1e8fe71b42bfff31d63554929bde20b63 /vp8/common/recon.h | |
| parent | fc892cc54d6c443f2e29e270c7ad0dc5e0f137a2 (diff) | |
| parent | 5d4cffb35f4bc23462eedc95a4802c65e32d7d5a (diff) | |
| download | libvpx-4396441b8b6a97aae50694d49971cdc062c469e0.tar libvpx-4396441b8b6a97aae50694d49971cdc062c469e0.tar.gz libvpx-4396441b8b6a97aae50694d49971cdc062c469e0.tar.bz2 libvpx-4396441b8b6a97aae50694d49971cdc062c469e0.zip | |
Merge "Superblock coding." into experimental
Diffstat (limited to 'vp8/common/recon.h')
| -rw-r--r-- | vp8/common/recon.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/vp8/common/recon.h b/vp8/common/recon.h index 2626a218d..3527fc14d 100644 --- a/vp8/common/recon.h +++ b/vp8/common/recon.h @@ -100,6 +100,11 @@ extern prototype_recon_macroblock(vp8_recon_recon_mb); #endif extern prototype_recon_macroblock(vp8_recon_recon_mby); +#ifndef vp8_recon_build_intra_predictors_sby_s +#define vp8_recon_build_intra_predictors_sby_s vp8_build_intra_predictors_sby_s +#endif +extern prototype_build_intra_predictors(vp8_recon_build_intra_predictors_sby_s); + #ifndef vp8_recon_build_intra_predictors_mby #define vp8_recon_build_intra_predictors_mby vp8_build_intra_predictors_mby #endif @@ -126,6 +131,11 @@ extern prototype_build_intra_predictors\ extern prototype_build_intra_predictors\ (vp8_recon_build_intra_predictors_mby_s); +#ifndef vp8_recon_build_intra_predictors_sbuv_s +#define vp8_recon_build_intra_predictors_sbuv_s vp8_build_intra_predictors_sbuv_s +#endif +extern prototype_build_intra_predictors(vp8_recon_build_intra_predictors_sbuv_s); + #ifndef vp8_recon_build_intra_predictors_mbuv #define vp8_recon_build_intra_predictors_mbuv vp8_build_intra_predictors_mbuv #endif @@ -214,11 +224,17 @@ typedef struct vp8_recon_rtcd_vtable { vp8_recon_fn_t recon4; vp8_recon_mb_fn_t recon_mb; vp8_recon_mb_fn_t recon_mby; +#if CONFIG_SUPERBLOCKS + vp8_build_intra_pred_fn_t build_intra_predictors_sby_s; +#endif vp8_build_intra_pred_fn_t build_intra_predictors_mby_s; vp8_build_intra_pred_fn_t build_intra_predictors_mby; #if CONFIG_COMP_INTRA_PRED vp8_build_intra_pred_fn_t build_comp_intra_predictors_mby; #endif +#if CONFIG_SUPERBLOCKS + vp8_build_intra_pred_fn_t build_intra_predictors_sbuv_s; +#endif vp8_build_intra_pred_fn_t build_intra_predictors_mbuv_s; vp8_build_intra_pred_fn_t build_intra_predictors_mbuv; #if CONFIG_COMP_INTRA_PRED |