From 587bd3669e07181147f7881af27b701c62d4e111 Mon Sep 17 00:00:00 2001 From: James Zern Date: Wed, 10 Jun 2015 15:20:07 -0700 Subject: [PATCH] vp9_decodeframe: hide vp9_dec_build_inter_predictors_sb + strip 'vp9_' prefix Change-Id: Ia057432095e5741473275d4da03ab665c37e924e --- vp9/decoder/vp9_decodeframe.c | 15 +++++++++++---- 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 30ca2d0..bac3280 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 8410c54..10a9e34 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 -- 2.7.4