diff options
| author | James Zern <jzern@google.com> | 2015-06-10 15:20:07 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-06-10 15:31:55 -0700 |
| commit | 587bd3669e07181147f7881af27b701c62d4e111 (patch) | |
| tree | 31c9e56abafd4cc6cac2be6c92a0eac8e9390b2d | |
| parent | 44afbbb72d8a5fa0528f8a571a5023a843d02f33 (diff) | |
| download | libvpx-587bd3669e07181147f7881af27b701c62d4e111.tar libvpx-587bd3669e07181147f7881af27b701c62d4e111.tar.gz libvpx-587bd3669e07181147f7881af27b701c62d4e111.tar.bz2 libvpx-587bd3669e07181147f7881af27b701c62d4e111.zip | |
vp9_decodeframe: hide vp9_dec_build_inter_predictors_sb
+ strip 'vp9_' prefix
Change-Id: Ia057432095e5741473275d4da03ab665c37e924e
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 15 | ||||
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.h | 3 |
2 files changed, 11 insertions, 7 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 30ca2d08a..bac328010 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -374,6 +374,12 @@ static MB_MODE_INFO *set_offsets(VP9_COMMON *const cm, MACROBLOCKD *const xd, return &xd->mi[0]->mbmi; } +// TODO(jzern): relocate this function to avoid the static prototype. +static void dec_build_inter_predictors_sb(VP9Decoder *const pbi, + MACROBLOCKD *xd, + int mi_row, int mi_col, + BLOCK_SIZE bsize); + static void decode_block(VP9Decoder *const pbi, MACROBLOCKD *const xd, const TileInfo *const tile, int mi_row, int mi_col, @@ -405,7 +411,7 @@ static void decode_block(VP9Decoder *const pbi, MACROBLOCKD *const xd, predict_and_reconstruct_intra_block, &arg); } else { // Prediction - vp9_dec_build_inter_predictors_sb(pbi, xd, mi_row, mi_col, bsize); + dec_build_inter_predictors_sb(pbi, xd, mi_row, mi_col, bsize); // Reconstruction if (!mbmi->skip) { @@ -2022,9 +2028,10 @@ static void dec_build_inter_predictors(VP9Decoder *const pbi, MACROBLOCKD *xd, #endif // CONFIG_VP9_HIGHBITDEPTH } -void vp9_dec_build_inter_predictors_sb(VP9Decoder *const pbi, MACROBLOCKD *xd, - int mi_row, int mi_col, - BLOCK_SIZE bsize) { +static void dec_build_inter_predictors_sb(VP9Decoder *const pbi, + MACROBLOCKD *xd, + int mi_row, int mi_col, + BLOCK_SIZE bsize) { int plane; const int mi_x = mi_col * MI_SIZE; const int mi_y = mi_row * MI_SIZE; diff --git a/vp9/decoder/vp9_decodeframe.h b/vp9/decoder/vp9_decodeframe.h index 8410c541e..10a9e3462 100644 --- a/vp9/decoder/vp9_decodeframe.h +++ b/vp9/decoder/vp9_decodeframe.h @@ -31,9 +31,6 @@ void vp9_read_frame_size(struct vp9_read_bit_buffer *rb, int *width, int *height); BITSTREAM_PROFILE vp9_read_profile(struct vp9_read_bit_buffer *rb); -void vp9_dec_build_inter_predictors_sb(struct VP9Decoder *const pbi, - MACROBLOCKD *xd, int mi_row, int mi_col, - BLOCK_SIZE bsize); #ifdef __cplusplus } // extern "C" #endif |