diff options
Diffstat (limited to 'vp8/common/recon.h')
| -rw-r--r-- | vp8/common/recon.h | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/vp8/common/recon.h b/vp8/common/recon.h index decd11479..9fb12c85d 100644 --- a/vp8/common/recon.h +++ b/vp8/common/recon.h @@ -29,6 +29,11 @@ #define prototype_intra4x4_predict(sym) \ void sym(BLOCKD *x, int b_mode, unsigned char *predictor) +#if CONFIG_COMP_INTRA_PRED +#define prototype_comp_intra4x4_predict(sym) \ + void sym(BLOCKD *x, int b_mode, int mode2, unsigned char *predictor) +#endif + struct vp8_recon_rtcd_vtable; #if ARCH_X86 || ARCH_X86_64 @@ -101,6 +106,14 @@ extern prototype_recon_macroblock(vp8_recon_recon_mby); extern prototype_build_intra_predictors\ (vp8_recon_build_intra_predictors_mby); +#if CONFIG_COMP_INTRA_PRED +#ifndef vp8_recon_build_comp_intra_predictors_mby +#define vp8_recon_build_comp_intra_predictors_mby vp8_build_comp_intra_predictors_mby +#endif +extern prototype_build_intra_predictors\ + (vp8_recon_build_comp_intra_predictors_mby); +#endif + #ifndef vp8_recon_build_intra8x8_predictors_mby #define vp8_recon_build_intra8x8_predictors_mby vp8_build_intra8x8_predictors_mby #endif @@ -131,29 +144,64 @@ extern prototype_build_intra_predictors\ extern prototype_build_intra_predictors\ (vp8_recon_build_intra_predictors_mbuv_s); +#if CONFIG_COMP_INTRA_PRED +#ifndef vp8_recon_build_comp_intra_predictors_mbuv +#define vp8_recon_build_comp_intra_predictors_mbuv vp8_build_comp_intra_predictors_mbuv +#endif +extern prototype_build_intra_predictors\ + (vp8_recon_build_comp_intra_predictors_mbuv); +#endif + #ifndef vp8_recon_intra4x4_predict #define vp8_recon_intra4x4_predict vp8_intra4x4_predict #endif extern prototype_intra4x4_predict\ (vp8_recon_intra4x4_predict); +#if CONFIG_COMP_INTRA_PRED +#ifndef vp8_recon_comp_intra4x4_predict +#define vp8_recon_comp_intra4x4_predict vp8_comp_intra4x4_predict +#endif +extern prototype_comp_intra4x4_predict\ + (vp8_recon_comp_intra4x4_predict); +#endif + #ifndef vp8_recon_intra8x8_predict #define vp8_recon_intra8x8_predict vp8_intra8x8_predict #endif extern prototype_intra4x4_predict\ (vp8_recon_intra8x8_predict); +#if CONFIG_COMP_INTRA_PRED +#ifndef vp8_recon_comp_intra8x8_predict +#define vp8_recon_comp_intra8x8_predict vp8_comp_intra8x8_predict +#endif +extern prototype_comp_intra4x4_predict\ + (vp8_recon_comp_intra8x8_predict); +#endif + #ifndef vp8_recon_intra_uv4x4_predict #define vp8_recon_intra_uv4x4_predict vp8_intra_uv4x4_predict #endif extern prototype_intra4x4_predict\ (vp8_recon_intra_uv4x4_predict); +#if CONFIG_COMP_INTRA_PRED +#ifndef vp8_recon_comp_intra_uv4x4_predict +#define vp8_recon_comp_intra_uv4x4_predict vp8_comp_intra_uv4x4_predict +#endif +extern prototype_comp_intra4x4_predict\ + (vp8_recon_comp_intra_uv4x4_predict); +#endif + typedef prototype_copy_block((*vp8_copy_block_fn_t)); typedef prototype_recon_block((*vp8_recon_fn_t)); typedef prototype_recon_macroblock((*vp8_recon_mb_fn_t)); typedef prototype_build_intra_predictors((*vp8_build_intra_pred_fn_t)); typedef prototype_intra4x4_predict((*vp8_intra4x4_pred_fn_t)); +#if CONFIG_COMP_INTRA_PRED +typedef prototype_comp_intra4x4_predict((*vp8_comp_intra4x4_pred_fn_t)); +#endif typedef struct vp8_recon_rtcd_vtable { vp8_copy_block_fn_t copy16x16; @@ -169,11 +217,26 @@ typedef struct vp8_recon_rtcd_vtable vp8_recon_mb_fn_t recon_mby; 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 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 + vp8_build_intra_pred_fn_t build_comp_intra_predictors_mbuv; +#endif vp8_intra4x4_pred_fn_t intra4x4_predict; +#if CONFIG_COMP_INTRA_PRED + vp8_comp_intra4x4_pred_fn_t comp_intra4x4_predict; +#endif vp8_intra4x4_pred_fn_t intra8x8_predict; +#if CONFIG_COMP_INTRA_PRED + vp8_comp_intra4x4_pred_fn_t comp_intra8x8_predict; +#endif vp8_intra4x4_pred_fn_t intra_uv4x4_predict; +#if CONFIG_COMP_INTRA_PRED + vp8_comp_intra4x4_pred_fn_t comp_intra_uv4x4_predict; +#endif } vp8_recon_rtcd_vtable_t; #if CONFIG_RUNTIME_CPU_DETECT |