diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-07-27 11:29:46 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2012-07-27 12:12:39 -0700 |
| commit | 9984a155d6bb7b81bbe2260e0f5807208fa103e2 (patch) | |
| tree | 2918641823325be67304c719165ab25f982ad5e8 /vp8/common/reconintra.c | |
| parent | 10a492847f2af49eb8842b17658c5063fae3689b (diff) | |
| download | libvpx-9984a155d6bb7b81bbe2260e0f5807208fa103e2.tar libvpx-9984a155d6bb7b81bbe2260e0f5807208fa103e2.tar.gz libvpx-9984a155d6bb7b81bbe2260e0f5807208fa103e2.tar.bz2 libvpx-9984a155d6bb7b81bbe2260e0f5807208fa103e2.zip | |
Merges several experiments
The following five experiments are merged:
newentropy
newupdate
adaptive_entropy (also includes a couple of parameter changes
that improves results a little
in common/entropymode.c and encoder/modecosts.c
that were not merged from the internal branch)
newintramodes
expanded_coef_context
Change-Id: I8a142a831786ee9dc936f22be1d42a8bced7d270
Diffstat (limited to 'vp8/common/reconintra.c')
| -rw-r--r-- | vp8/common/reconintra.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/vp8/common/reconintra.c b/vp8/common/reconintra.c index e06d914ba..6e9bb645d 100644 --- a/vp8/common/reconintra.c +++ b/vp8/common/reconintra.c @@ -18,7 +18,6 @@ * vp8_build_intra_predictors_mbuv_s(MACROBLOCKD *x). */ -#if CONFIG_NEWINTRAMODES void d27_predictor(unsigned char *ypred_ptr, int y_stride, int n, unsigned char *yabove_row, unsigned char *yleft_col) { int r, c, h, w, v; @@ -196,7 +195,6 @@ void d153_predictor(unsigned char *ypred_ptr, int y_stride, int n, ypred_ptr += y_stride; } } -#endif /* CONFIG_NEWINTRAMODES */ void vp8_recon_intra_mbuv(const vp8_recon_rtcd_vtable_t *rtcd, MACROBLOCKD *x) { int i; @@ -293,7 +291,6 @@ void vp8_build_intra_predictors_mby_internal(MACROBLOCKD *x, unsigned char *ypre } break; -#if CONFIG_NEWINTRAMODES case D45_PRED: { d45_predictor(ypred_ptr, y_stride, 16, yabove_row, yleft_col); } @@ -318,7 +315,6 @@ void vp8_build_intra_predictors_mby_internal(MACROBLOCKD *x, unsigned char *ypre d63_predictor(ypred_ptr, y_stride, 16, yabove_row, yleft_col); } break; -#endif #if CONIFG_I8X8 case I8X8_PRED: #endif @@ -475,7 +471,6 @@ void vp8_build_intra_predictors_mbuv_internal(MACROBLOCKD *x, } break; -#if CONFIG_NEWINTRAMODES case D45_PRED: { d45_predictor(upred_ptr, uv_stride, 8, uabove_row, uleft_col); d45_predictor(vpred_ptr, uv_stride, 8, vabove_row, vleft_col); @@ -506,7 +501,6 @@ void vp8_build_intra_predictors_mbuv_internal(MACROBLOCKD *x, d63_predictor(vpred_ptr, uv_stride, 8, vabove_row, vleft_col); } break; -#endif case B_PRED: case NEARESTMV: case NEARMV: @@ -617,7 +611,6 @@ void vp8_intra8x8_predict(BLOCKD *x, } } break; -#if CONFIG_NEWINTRAMODES case D45_PRED: { d45_predictor(predictor, 16, 8, yabove_row, yleft_col); } @@ -642,7 +635,6 @@ void vp8_intra8x8_predict(BLOCKD *x, d63_predictor(predictor, 16, 8, yabove_row, yleft_col); } break; -#endif } } @@ -732,7 +724,6 @@ void vp8_intra_uv4x4_predict(BLOCKD *x, } } break; -#if CONFIG_NEWINTRAMODES case D45_PRED: { d45_predictor(predictor, 8, 4, above_row, left_col); } @@ -757,7 +748,6 @@ void vp8_intra_uv4x4_predict(BLOCKD *x, d63_predictor(predictor, 8, 4, above_row, left_col); } break; -#endif } } |