diff options
| author | Attila Nagy <attilanagy@google.com> | 2011-01-10 11:14:10 +0200 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-01-18 08:19:21 -0500 |
| commit | cb791aaa2f6faf0ceb2c8a84e0ae6e5ec7758f90 (patch) | |
| tree | e49928754fa8e046a8088fe0e842be515ecc2290 /vp8/encoder/mcomp.c | |
| parent | 339c512762542995d51086e1990cf47967687bb5 (diff) | |
| download | libvpx-cb791aaa2f6faf0ceb2c8a84e0ae6e5ec7758f90.tar libvpx-cb791aaa2f6faf0ceb2c8a84e0ae6e5ec7758f90.tar.gz libvpx-cb791aaa2f6faf0ceb2c8a84e0ae6e5ec7758f90.tar.bz2 libvpx-cb791aaa2f6faf0ceb2c8a84e0ae6e5ec7758f90.zip | |
Fix encoder real-time only configuration.
Remove allocation/deallocation of stats storage.
Remove full search functions in machine specific encoder inits.
Remove last pass validation in validate_config.
Change-Id: I7f29be69273981a4fef6e80ecdb6217c68cbad4e
Diffstat (limited to 'vp8/encoder/mcomp.c')
| -rw-r--r-- | vp8/encoder/mcomp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/encoder/mcomp.c b/vp8/encoder/mcomp.c index 9b91739cc..d9923fbe9 100644 --- a/vp8/encoder/mcomp.c +++ b/vp8/encoder/mcomp.c @@ -408,6 +408,7 @@ int vp8_find_best_sub_pixel_step(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *bestmv, diag = vfp->svf_halfpix_hv(y - 1, d->pre_stride, z, b->src_stride, &sse); break; case 3: + default: this_mv.col += 4; this_mv.row += 4; diag = vfp->svf_halfpix_hv(y, d->pre_stride, z, b->src_stride, &sse); @@ -1387,8 +1388,6 @@ int vp8_full_search_sadx3(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *ref_mv, int er else return INT_MAX; } -#endif - int vp8_full_search_sadx8(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *ref_mv, int error_per_bit, int distance, vp8_variance_fn_ptr_t *fn_ptr, int *mvcost[2], int *mvsadcost[2], MV *center_mv) { @@ -1541,6 +1540,7 @@ int vp8_full_search_sadx8(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *ref_mv, int er else return INT_MAX; } +#endif /* !(CONFIG_REALTIME_ONLY) */ #ifdef ENTROPY_STATS void print_mode_context(void) |