diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-07-08 20:09:19 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-07-08 20:09:19 -0700 |
| commit | c6c279aff0e9b63c58a906062e547eb06ae1115f (patch) | |
| tree | 97dcfb5aa5a816cf7924358f19ed41bc6c5ddcf0 /vp9/encoder | |
| parent | 1c65c580d69bae12c7a8c6eb9585f39333f16b04 (diff) | |
| parent | b7559258a45e4ad67cc492ca02e3c45319bd843e (diff) | |
| download | libvpx-c6c279aff0e9b63c58a906062e547eb06ae1115f.tar libvpx-c6c279aff0e9b63c58a906062e547eb06ae1115f.tar.gz libvpx-c6c279aff0e9b63c58a906062e547eb06ae1115f.tar.bz2 libvpx-c6c279aff0e9b63c58a906062e547eb06ae1115f.zip | |
Merge "Using mi_cols instead of mb_cols."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 7c95a90fc..56e8eac26 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -1475,8 +1475,8 @@ void vp9_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, unsigned long *size) { unsigned char *data_ptr = cx_data + header_bc.pos; TOKENEXTRA *tok[4][1 << 6], *tok_end; - vpx_memset(cpi->common.above_seg_context, 0, sizeof(PARTITION_CONTEXT) * - mi_cols_aligned_to_sb(&cpi->common)); + vpx_memset(pc->above_seg_context, 0, sizeof(PARTITION_CONTEXT) * + mi_cols_aligned_to_sb(pc->mi_cols)); tok[0][0] = cpi->tok; for (tile_row = 0; tile_row < pc->tile_rows; tile_row++) { if (tile_row) { diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index ac6effa59..8c3d9a594 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1697,9 +1697,10 @@ static void encode_sb_row(VP9_COMP *cpi, int mi_row, TOKENEXTRA **tp, } static void init_encode_frame_mb_context(VP9_COMP *cpi) { - MACROBLOCK * const x = &cpi->mb; - VP9_COMMON * const cm = &cpi->common; - MACROBLOCKD * const xd = &x->e_mbd; + MACROBLOCK *const x = &cpi->mb; + VP9_COMMON *const cm = &cpi->common; + MACROBLOCKD *const xd = &x->e_mbd; + const int aligned_mi_cols = mi_cols_aligned_to_sb(cm->mi_cols); x->act_zbin_adj = 0; cpi->seg0_idx = 0; @@ -1742,11 +1743,10 @@ static void init_encode_frame_mb_context(VP9_COMP *cpi) { // Note: this memset assumes above_context[0], [1] and [2] // are allocated as part of the same buffer. - vpx_memset( - cm->above_context[0], 0, - sizeof(ENTROPY_CONTEXT) * 2 * MAX_MB_PLANE * mi_cols_aligned_to_sb(cm)); + vpx_memset(cm->above_context[0], 0, + sizeof(ENTROPY_CONTEXT) * 2 * MAX_MB_PLANE * aligned_mi_cols); vpx_memset(cm->above_seg_context, 0, - sizeof(PARTITION_CONTEXT) * mi_cols_aligned_to_sb(cm)); + sizeof(PARTITION_CONTEXT) * aligned_mi_cols); } static void switch_lossless_mode(VP9_COMP *cpi, int lossless) { |