diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-08-03 12:17:18 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2012-08-03 13:38:49 -0700 |
| commit | 2af5473a90306b993d145ef64faad6ad1ed21a4d (patch) | |
| tree | 6ca204f45bb96af6425a870bd206a8357737e951 /vp8/encoder/ratectrl.c | |
| parent | fcbff9ee04f5b67ce79fd329333c8b1970d9318d (diff) | |
| download | libvpx-2af5473a90306b993d145ef64faad6ad1ed21a4d.tar libvpx-2af5473a90306b993d145ef64faad6ad1ed21a4d.tar.gz libvpx-2af5473a90306b993d145ef64faad6ad1ed21a4d.tar.bz2 libvpx-2af5473a90306b993d145ef64faad6ad1ed21a4d.zip | |
Merging in high_precision_mv experiment
Merged in the high_precision_mv experiment to make it easier
to work on new mv encoding strategies. Also removed
coef_update_probs3().
Change-Id: I82d3b0bb642419fe05dba82528bc9ba010e90924
Diffstat (limited to 'vp8/encoder/ratectrl.c')
| -rw-r--r-- | vp8/encoder/ratectrl.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/vp8/encoder/ratectrl.c b/vp8/encoder/ratectrl.c index b0f92c942..80fc16ab4 100644 --- a/vp8/encoder/ratectrl.c +++ b/vp8/encoder/ratectrl.c @@ -134,10 +134,8 @@ void vp8_save_coding_context(VP8_COMP *cpi) { vp8_copy(cc->mvc, cm->fc.mvc); vp8_copy(cc->mvcosts, cpi->mb.mvcosts); -#if CONFIG_HIGH_PRECISION_MV vp8_copy(cc->mvc_hp, cm->fc.mvc_hp); vp8_copy(cc->mvcosts_hp, cpi->mb.mvcosts_hp); -#endif vp8_copy(cc->mv_ref_ct, cm->fc.mv_ref_ct); vp8_copy(cc->mode_context, cm->fc.mode_context); @@ -192,10 +190,8 @@ void vp8_restore_coding_context(VP8_COMP *cpi) { vp8_copy(cm->fc.mvc, cc->mvc); vp8_copy(cpi->mb.mvcosts, cc->mvcosts); -#if CONFIG_HIGH_PRECISION_MV vp8_copy(cm->fc.mvc_hp, cc->mvc_hp); vp8_copy(cpi->mb.mvcosts_hp, cc->mvcosts_hp); -#endif vp8_copy(cm->fc.mv_ref_ct, cc->mv_ref_ct); vp8_copy(cm->fc.mode_context, cc->mode_context); @@ -253,14 +249,11 @@ void vp8_setup_key_frame(VP8_COMP *cpi) { int flag[2] = {1, 1}; vp8_build_component_cost_table(cpi->mb.mvcost, (const MV_CONTEXT *) cpi->common.fc.mvc, flag); } -#if CONFIG_HIGH_PRECISION_MV vpx_memcpy(cpi->common.fc.mvc_hp, vp8_default_mv_context_hp, sizeof(vp8_default_mv_context_hp)); { int flag[2] = {1, 1}; vp8_build_component_cost_table_hp(cpi->mb.mvcost_hp, (const MV_CONTEXT_HP *) cpi->common.fc.mvc_hp, flag); } -#endif - cpi->common.txfm_mode = ALLOW_8X8; |