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/block.h | |
| 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/block.h')
| -rw-r--r-- | vp8/encoder/block.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/vp8/encoder/block.h b/vp8/encoder/block.h index 0019d5e8c..2c1e29cc0 100644 --- a/vp8/encoder/block.h +++ b/vp8/encoder/block.h @@ -119,12 +119,11 @@ typedef struct { int *mvcost[2]; int mvsadcosts[2][MVfpvals + 1]; int *mvsadcost[2]; -#if CONFIG_HIGH_PRECISION_MV int mvcosts_hp[2][MVvals_hp + 1]; int *mvcost_hp[2]; int mvsadcosts_hp[2][MVfpvals_hp + 1]; int *mvsadcost_hp[2]; -#endif + int mbmode_cost[2][MB_MODE_COUNT]; int intra_uv_mode_cost[2][MB_MODE_COUNT]; int bmode_costs[VP8_BINTRAMODES][VP8_BINTRAMODES][VP8_BINTRAMODES]; @@ -156,9 +155,7 @@ typedef struct { unsigned char *active_ptr; MV_CONTEXT *mvc; -#if CONFIG_HIGH_PRECISION_MV MV_CONTEXT_HP *mvc_hp; -#endif unsigned int token_costs[BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS][MAX_ENTROPY_TOKENS]; |