diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-12-05 17:01:03 -0800 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-12-05 17:01:03 -0800 |
| commit | 6fd71e1b09eaa664030a3a3634322f253e6c6d26 (patch) | |
| tree | 3c99e7f72b248f4aaceae5f6a4fc0025cfc483af /vp9/decoder/vp9_decodemv.c | |
| parent | da519166e9f8a0c9bfa9dbda61195a5fef466476 (diff) | |
| download | libvpx-6fd71e1b09eaa664030a3a3634322f253e6c6d26.tar libvpx-6fd71e1b09eaa664030a3a3634322f253e6c6d26.tar.gz libvpx-6fd71e1b09eaa664030a3a3634322f253e6c6d26.tar.bz2 libvpx-6fd71e1b09eaa664030a3a3634322f253e6c6d26.zip | |
vp9_get_pred_context_intra_inter() clean up.
Renaming:
vp9_get_pred_context_intra_inter => vp9_get_intra_inter_context
vp9_get_pred_prob_intra_inter => vp9_get_intra_inter_prob
Change-Id: I2c1affea2e84f4e616137c6df82adb11c7845781
Diffstat (limited to 'vp9/decoder/vp9_decodemv.c')
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index 327a9166c..7858e16c8 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -408,8 +408,8 @@ static int read_is_inter_block(VP9_COMMON *const cm, MACROBLOCKD *const xd, return vp9_get_segdata(&cm->seg, segment_id, SEG_LVL_REF_FRAME) != INTRA_FRAME; } else { - const int ctx = vp9_get_pred_context_intra_inter(xd); - const int is_inter = vp9_read(r, vp9_get_pred_prob_intra_inter(cm, xd)); + const int ctx = vp9_get_intra_inter_context(xd); + const int is_inter = vp9_read(r, cm->fc.intra_inter_prob[ctx]); if (!cm->frame_parallel_decoding_mode) ++cm->counts.intra_inter[ctx][is_inter]; return is_inter; |