diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-10-22 12:19:00 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2012-10-22 15:23:41 -0700 |
| commit | 78808ad9fb101cbd06652b383f94f4409f2eba2d (patch) | |
| tree | c3b30623e2574df50af9f06e973667923895a662 /vp8/decoder/decodframe.c | |
| parent | 12c1b180f8f30ecf75f9a24a60cc421d2cf8fd5a (diff) | |
| download | libvpx-78808ad9fb101cbd06652b383f94f4409f2eba2d.tar libvpx-78808ad9fb101cbd06652b383f94f4409f2eba2d.tar.gz libvpx-78808ad9fb101cbd06652b383f94f4409f2eba2d.tar.bz2 libvpx-78808ad9fb101cbd06652b383f94f4409f2eba2d.zip | |
Merge of the newmventropy experiment
Removes the old mv encoding code.
Change-Id: I1026d48cc5ac15ccb776f98463e929254c3dc7da
Diffstat (limited to 'vp8/decoder/decodframe.c')
| -rw-r--r-- | vp8/decoder/decodframe.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index d961c7b2a..f74be8bde 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -1354,12 +1354,7 @@ int vp8_decode_frame(VP8D_COMP *pbi) { vp8_copy(pbi->common.fc.pre_i8x8_mode_prob, pbi->common.fc.i8x8_mode_prob); vp8_copy(pbi->common.fc.pre_sub_mv_ref_prob, pbi->common.fc.sub_mv_ref_prob); vp8_copy(pbi->common.fc.pre_mbsplit_prob, pbi->common.fc.mbsplit_prob); -#if CONFIG_NEWMVENTROPY pbi->common.fc.pre_nmvc = pbi->common.fc.nmvc; -#else - vp8_copy(pbi->common.fc.pre_mvc, pbi->common.fc.mvc); - vp8_copy(pbi->common.fc.pre_mvc_hp, pbi->common.fc.mvc_hp); -#endif vp8_zero(pbi->common.fc.coef_counts); vp8_zero(pbi->common.fc.hybrid_coef_counts); vp8_zero(pbi->common.fc.coef_counts_8x8); @@ -1372,12 +1367,7 @@ int vp8_decode_frame(VP8D_COMP *pbi) { vp8_zero(pbi->common.fc.i8x8_mode_counts); vp8_zero(pbi->common.fc.sub_mv_ref_counts); vp8_zero(pbi->common.fc.mbsplit_counts); -#if CONFIG_NEWMVENTROPY vp8_zero(pbi->common.fc.NMVcount); -#else - vp8_zero(pbi->common.fc.MVcount); - vp8_zero(pbi->common.fc.MVcount_hp); -#endif vp8_zero(pbi->common.fc.mv_ref_ct); vp8_zero(pbi->common.fc.mv_ref_ct_a); @@ -1436,11 +1426,7 @@ int vp8_decode_frame(VP8D_COMP *pbi) { vp8_adapt_coef_probs(pc); if (pc->frame_type != KEY_FRAME) { vp8_adapt_mode_probs(pc); -#if CONFIG_NEWMVENTROPY vp8_adapt_nmv_probs(pc, xd->allow_high_precision_mv); -#else - vp8_adapt_mv_probs(pc); -#endif vp8_update_mode_context(&pbi->common); } |