diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-11-11 11:12:06 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-11-11 11:12:06 -0800 |
| commit | c53a9c70fbf766107501e7b981f047d4bd2ae8b7 (patch) | |
| tree | c35cc19631ad96632b37cd0b56acff25c1318e08 /vp9/decoder/vp9_decodemv.c | |
| parent | f6baa62cd8aa861f7370bb782624bd76615f2f86 (diff) | |
| parent | 815189613bcf61aebe808047f5a35f14d25c4f69 (diff) | |
| download | libvpx-c53a9c70fbf766107501e7b981f047d4bd2ae8b7.tar libvpx-c53a9c70fbf766107501e7b981f047d4bd2ae8b7.tar.gz libvpx-c53a9c70fbf766107501e7b981f047d4bd2ae8b7.tar.bz2 libvpx-c53a9c70fbf766107501e7b981f047d4bd2ae8b7.zip | |
Merge "Localizing NEARESTMV special cases in the code."
Diffstat (limited to 'vp9/decoder/vp9_decodemv.c')
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index abdcf955c..14f2ce57a 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -48,12 +48,13 @@ static MB_PREDICTION_MODE read_intra_mode_uv(VP9_COMMON *cm, vp9_reader *r, } static MB_PREDICTION_MODE read_inter_mode(VP9_COMMON *cm, vp9_reader *r, - uint8_t context) { - const MB_PREDICTION_MODE mode = treed_read(r, vp9_inter_mode_tree, - cm->fc.inter_mode_probs[context]); + int ctx) { + const int mode = treed_read(r, vp9_inter_mode_tree, + cm->fc.inter_mode_probs[ctx]); if (!cm->frame_parallel_decoding_mode) - ++cm->counts.inter_mode[context][inter_mode_offset(mode)]; - return mode; + ++cm->counts.inter_mode[ctx][mode]; + + return NEARESTMV + mode; } static int read_segment_id(vp9_reader *r, const struct segmentation *seg) { |