diff options
| author | Yaowu Xu <yaowu@google.com> | 2012-04-25 08:33:30 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2012-04-25 13:47:32 -0700 |
| commit | c1814d267a8a713fd781e6f938d37b717786cf7a (patch) | |
| tree | 6cf87f6e853cba71810025bfccb8ff3294c731cb /vp8/decoder/decodemv.c | |
| parent | ad06c9f051ce1fdd3b289dade25df3c611113345 (diff) | |
| download | libvpx-c1814d267a8a713fd781e6f938d37b717786cf7a.tar libvpx-c1814d267a8a713fd781e6f938d37b717786cf7a.tar.gz libvpx-c1814d267a8a713fd781e6f938d37b717786cf7a.tar.bz2 libvpx-c1814d267a8a713fd781e6f938d37b717786cf7a.zip | |
Merge UVINTRA experiment
The commit merges the UVINTRA experiment and removed the related
macros. The overall effect of the experiment is a small gain (.1%
on derf)
Change-Id: Ia34b3312fb9b5b34c9ba111bf0fa78c6f78ac80b
Diffstat (limited to 'vp8/decoder/decodemv.c')
| -rw-r--r-- | vp8/decoder/decodemv.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/vp8/decoder/decodemv.c b/vp8/decoder/decodemv.c index d2665df7d..ce012817a 100644 --- a/vp8/decoder/decodemv.c +++ b/vp8/decoder/decodemv.c @@ -190,13 +190,8 @@ static void vp8_kfread_modes(VP8D_COMP *pbi, } } else -#if CONFIG_UVINTRA m->mbmi.uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc, pbi->common.kf_uv_mode_prob[m->mbmi.mode]); -#else - m->mbmi.uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc, - pbi->common.kf_uv_mode_prob); -#endif #if CONFIG_COMP_INTRA_PRED m->mbmi.second_uv_mode = (MB_PREDICTION_MODE) (DC_PRED - 1); #endif @@ -568,20 +563,6 @@ static void mb_mode_mv_init(VP8D_COMP *pbi) } while (++i < VP8_YMODES-1); } -#if CONFIG_UVINTRA - //vp8_read_bit(bc); -#else - if (vp8_read_bit(bc)) - { - int i = 0; - - do - { - cm->fc.uv_mode_prob[i] = (vp8_prob) vp8_read_literal(bc, 8); - } - while (++i < VP8_UV_MODES-1); - } -#endif /* CONFIG_UVINTRA */ #if CONFIG_HIGH_PRECISION_MV if (xd->allow_high_precision_mv) read_mvcontexts_hp(bc, mvc_hp); @@ -1041,13 +1022,9 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, } } else -#if CONFIG_UVINTRA mbmi->uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc, pbi->common.fc.uv_mode_prob[mbmi->mode]); -#else - mbmi->uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc, - pbi->common.fc.uv_mode_prob); -#endif /*CONFIG_UVINTRA*/ + #if CONFIG_COMP_INTRA_PRED mbmi->second_uv_mode = (MB_PREDICTION_MODE) (DC_PRED - 1); #endif |