diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2013-08-15 02:12:48 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-08-15 02:12:48 -0700 |
| commit | 1a3641d91b7179631113ece6c0f4bb25ad9b881f (patch) | |
| tree | 8dc787a0e02feba5140815e6d014ef22d48d1ceb /vp9/decoder | |
| parent | adfc54a464ff82c7c2a39ae2f3df9d09415699a8 (diff) | |
| parent | 26fead7ecf7d390c6a6d9e25a3ae578d1ff07036 (diff) | |
| download | libvpx-1a3641d91b7179631113ece6c0f4bb25ad9b881f.tar libvpx-1a3641d91b7179631113ece6c0f4bb25ad9b881f.tar.gz libvpx-1a3641d91b7179631113ece6c0f4bb25ad9b881f.tar.bz2 libvpx-1a3641d91b7179631113ece6c0f4bb25ad9b881f.zip | |
Merge "Renaming in MB_MODE_INFO"
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 8 | ||||
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index e5de8f65a..f09f19a75 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -159,7 +159,7 @@ static void read_intra_frame_mode_info(VP9D_COMP *pbi, MODE_INFO *m, const int mis = cm->mode_info_stride; mbmi->segment_id = read_intra_segment_id(pbi, mi_row, mi_col, r); - mbmi->mb_skip_coeff = read_skip_coeff(pbi, mbmi->segment_id, r); + mbmi->skip_coeff = read_skip_coeff(pbi, mbmi->segment_id, r); mbmi->txfm_size = read_tx_size(pbi, cm->tx_mode, bsize, 1, r); mbmi->ref_frame[0] = INTRA_FRAME; mbmi->ref_frame[1] = NONE; @@ -457,7 +457,7 @@ static void read_inter_block_mode_info(VP9D_COMP *pbi, MODE_INFO *mi, ref0, mbmi->ref_mvs[ref0], cm->ref_frame_sign_bias, mi_row, mi_col); - inter_mode_ctx = mbmi->mb_mode_context[ref0]; + inter_mode_ctx = mbmi->mode_context[ref0]; if (vp9_segfeature_active(&xd->seg, mbmi->segment_id, SEG_LVL_SKIP)) mbmi->mode = ZEROMV; @@ -598,10 +598,10 @@ static void read_inter_frame_mode_info(VP9D_COMP *pbi, MODE_INFO *mi, mbmi->mv[0].as_int = 0; mbmi->mv[1].as_int = 0; mbmi->segment_id = read_inter_segment_id(pbi, mi_row, mi_col, r); - mbmi->mb_skip_coeff = read_skip_coeff(pbi, mbmi->segment_id, r); + mbmi->skip_coeff = read_skip_coeff(pbi, mbmi->segment_id, r); inter_block = read_is_inter_block(pbi, mbmi->segment_id, r); mbmi->txfm_size = read_tx_size(pbi, cm->tx_mode, mbmi->sb_type, - !mbmi->mb_skip_coeff || !inter_block, r); + !mbmi->skip_coeff || !inter_block, r); if (inter_block) read_inter_block_mode_info(pbi, mi, mi_row, mi_col, r); diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index a1c396970..93a5c49c3 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -160,7 +160,7 @@ static void decode_block_intra(int plane, int block, BLOCK_SIZE_TYPE bsize, dst, pd->dst.stride); // Early exit if there are no coefficients - if (mi->mbmi.mb_skip_coeff) + if (mi->mbmi.skip_coeff) return; decode_block(plane, block, bsize, ss_txfrm_size, arg); @@ -169,7 +169,7 @@ static void decode_block_intra(int plane, int block, BLOCK_SIZE_TYPE bsize, static int decode_tokens(VP9D_COMP *pbi, BLOCK_SIZE_TYPE bsize, vp9_reader *r) { MACROBLOCKD *const xd = &pbi->mb; - if (xd->mode_info_context->mbmi.mb_skip_coeff) { + if (xd->mode_info_context->mbmi.skip_coeff) { reset_skip_context(xd, bsize); return -1; } else { |