diff options
| -rw-r--r-- | vp9/common/vp9_alloccommon.c | 8 | ||||
| -rw-r--r-- | vp9/common/vp9_onyxc_int.h | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 15 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.h | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_int.h | 4 |
5 files changed, 16 insertions, 17 deletions
diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c index 5e526a83c..f0c653f72 100644 --- a/vp9/common/vp9_alloccommon.c +++ b/vp9/common/vp9_alloccommon.c @@ -58,13 +58,13 @@ void vp9_free_frame_buffers(VP9_COMMON *cm) { } static void set_mb_mi(VP9_COMMON *cm, int aligned_width, int aligned_height) { - cm->mb_cols = (aligned_width + 8) >> 4; - cm->mb_rows = (aligned_height + 8) >> 4; - cm->MBs = cm->mb_rows * cm->mb_cols; - cm->mi_cols = aligned_width >> MI_SIZE_LOG2; cm->mi_rows = aligned_height >> MI_SIZE_LOG2; cm->mode_info_stride = cm->mi_cols + MI_BLOCK_SIZE; + + cm->mb_cols = (cm->mi_cols + 1) >> 1; + cm->mb_rows = (cm->mi_rows + 1) >> 1; + cm->MBs = cm->mb_rows * cm->mb_cols; } static void setup_mi(VP9_COMMON *cm) { diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index f7d639103..953764c85 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -291,10 +291,6 @@ static void set_mi_row_col(VP9_COMMON *cm, MACROBLOCKD *xd, xd->right_available = (mi_col + bw < cm->cur_tile_mi_col_end); } -static int get_token_alloc(int mb_rows, int mb_cols) { - return mb_rows * mb_cols * (48 * 16 + 4); -} - static void set_prev_mi(VP9_COMMON *cm) { const int use_prev_in_find_mv_refs = cm->width == cm->last_width && cm->height == cm->last_height && diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 8950a05a8..7a4dee4d5 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -461,18 +461,17 @@ static void update_state(VP9_COMP *cpi, PICK_MODE_CONTEXT *ctx, } void vp9_setup_src_planes(MACROBLOCK *x, const YV12_BUFFER_CONFIG *src, - int mb_row, int mb_col) { - uint8_t *buffers[4] = {src->y_buffer, src->u_buffer, src->v_buffer, src - ->alpha_buffer}; - int strides[4] = {src->y_stride, src->uv_stride, src->uv_stride, src - ->alpha_stride}; + int mi_row, int mi_col) { + uint8_t *const buffers[4] = {src->y_buffer, src->u_buffer, src->v_buffer, + src->alpha_buffer}; + const int strides[4] = {src->y_stride, src->uv_stride, src->uv_stride, + src->alpha_stride}; int i; - for (i = 0; i < MAX_MB_PLANE; i++) { - setup_pred_plane(&x->plane[i].src, buffers[i], strides[i], mb_row, mb_col, + for (i = 0; i < MAX_MB_PLANE; i++) + setup_pred_plane(&x->plane[i].src, buffers[i], strides[i], mi_row, mi_col, NULL, x->e_mbd.plane[i].subsampling_x, x->e_mbd.plane[i].subsampling_y); - } } static void set_offsets(VP9_COMP *cpi, int mi_row, int mi_col, diff --git a/vp9/encoder/vp9_encodeframe.h b/vp9/encoder/vp9_encodeframe.h index 399196927..3e9f5381c 100644 --- a/vp9/encoder/vp9_encodeframe.h +++ b/vp9/encoder/vp9_encodeframe.h @@ -17,6 +17,6 @@ struct yv12_buffer_config; void vp9_setup_src_planes(struct macroblock *x, const struct yv12_buffer_config *src, - int mb_row, int mb_col); + int mi_row, int mi_col); #endif // VP9_ENCODER_VP9_ENCODEFRAME_H_ diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index aeb316b37..0beff0dd0 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -697,4 +697,8 @@ int vp9_calc_ss_err(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest); void vp9_alloc_compressor_data(VP9_COMP *cpi); +static int get_token_alloc(int mb_rows, int mb_cols) { + return mb_rows * mb_cols * (48 * 16 + 4); +} + #endif // VP9_ENCODER_VP9_ONYX_INT_H_ |