diff options
| author | Jingning Han <jingning@google.com> | 2013-04-23 15:07:35 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2013-04-23 15:39:19 -0700 |
| commit | a26c1edbb40fc9f77bd163aa7b4d292d9fb6c8f8 (patch) | |
| tree | b1eab0227692638121284772a42816a52a5d4ad9 /vp9/common/vp9_reconintra.h | |
| parent | e6ac91800b560563af8b18210f02e065d813bb2c (diff) | |
| download | libvpx-a26c1edbb40fc9f77bd163aa7b4d292d9fb6c8f8.tar libvpx-a26c1edbb40fc9f77bd163aa7b4d292d9fb6c8f8.tar.gz libvpx-a26c1edbb40fc9f77bd163aa7b4d292d9fb6c8f8.tar.bz2 libvpx-a26c1edbb40fc9f77bd163aa7b4d292d9fb6c8f8.zip | |
Enable rectangular support for comp inter-intra
This commit enables rectangular block prediction of compound
inter-intra mode. It combines the mb/sb32/sb64 prediction functions
into a unified version with configurable block width and height.
This fixes the enc/dec mismatch of the codebase when
comp-interintra-pred is enabled.
Change-Id: I1d0db2f1f184007802df04fcd12b9dadb3189ff0
Diffstat (limited to 'vp9/common/vp9_reconintra.h')
| -rw-r--r-- | vp9/common/vp9_reconintra.h | 47 |
1 files changed, 18 insertions, 29 deletions
diff --git a/vp9/common/vp9_reconintra.h b/vp9/common/vp9_reconintra.h index 1e0cfa42d..e94359683 100644 --- a/vp9/common/vp9_reconintra.h +++ b/vp9/common/vp9_reconintra.h @@ -21,35 +21,24 @@ B_PREDICTION_MODE vp9_find_dominant_direction(uint8_t *ptr, B_PREDICTION_MODE vp9_find_bpred_context(MACROBLOCKD *xd, BLOCKD *x); #if CONFIG_COMP_INTERINTRA_PRED -void vp9_build_interintra_16x16_predictors_mb(MACROBLOCKD *xd, - uint8_t *ypred, - uint8_t *upred, - uint8_t *vpred, - int ystride, - int uvstride); - -void vp9_build_interintra_16x16_predictors_mby(MACROBLOCKD *xd, - uint8_t *ypred, - int ystride); - -void vp9_build_interintra_16x16_predictors_mbuv(MACROBLOCKD *xd, - uint8_t *upred, - uint8_t *vpred, - int uvstride); +void vp9_build_interintra_predictors(MACROBLOCKD *xd, + uint8_t *ypred, + uint8_t *upred, + uint8_t *vpred, + int ystride, + int uvstride, + BLOCK_SIZE_TYPE bsize); + +void vp9_build_interintra_predictors_sby(MACROBLOCKD *xd, + uint8_t *ypred, + int ystride, + BLOCK_SIZE_TYPE bsize); + +void vp9_build_interintra_predictors_sbuv(MACROBLOCKD *xd, + uint8_t *upred, + uint8_t *vpred, + int uvstride, + BLOCK_SIZE_TYPE bsize); #endif // CONFIG_COMP_INTERINTRA_PRED -void vp9_build_interintra_32x32_predictors_sb(MACROBLOCKD *xd, - uint8_t *ypred, - uint8_t *upred, - uint8_t *vpred, - int ystride, - int uvstride); - -void vp9_build_interintra_64x64_predictors_sb(MACROBLOCKD *xd, - uint8_t *ypred, - uint8_t *upred, - uint8_t *vpred, - int ystride, - int uvstride); - #endif // VP9_COMMON_VP9_RECONINTRA_H_ |