diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-03-26 11:29:10 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2014-03-26 11:29:10 -0700 |
| commit | 0abe813c0e0cf39c0f51dfb00b14a7c11578fb5f (patch) | |
| tree | 7b3d6e7a302ab90f8c1b2c592ba5fce727d8c6eb /vp9/encoder/vp9_rdopt.c | |
| parent | 2ec04d1f84aba18359eb28e0f781994aecba3527 (diff) | |
| download | libvpx-0abe813c0e0cf39c0f51dfb00b14a7c11578fb5f.tar libvpx-0abe813c0e0cf39c0f51dfb00b14a7c11578fb5f.tar.gz libvpx-0abe813c0e0cf39c0f51dfb00b14a7c11578fb5f.tar.bz2 libvpx-0abe813c0e0cf39c0f51dfb00b14a7c11578fb5f.zip | |
Moving thresh_mult{,_sub8x8} from SPEED_FEATURES to VP9_COMP.
SPEED_FEATURES should contain only configuration parameters.
Change-Id: I7d6d0636879c3e87dad09bc9455c1cf1dc039da8
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 4c389092f..26d1992ca 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -244,7 +244,6 @@ void vp9_initialize_me_consts(VP9_COMP *cpi, int qindex) { static void set_block_thresholds(VP9_COMP *cpi) { const VP9_COMMON *const cm = &cpi->common; - const SPEED_FEATURES *const sf = &cpi->sf; int i, bsize, segment_id; for (segment_id = 0; segment_id < MAX_SEGMENTS; ++segment_id) { @@ -261,13 +260,13 @@ static void set_block_thresholds(VP9_COMP *cpi) { for (i = 0; i < MAX_MODES; ++i) cpi->rd_threshes[segment_id][bsize][i] = - sf->thresh_mult[i] < thresh_max ? sf->thresh_mult[i] * t / 4 + cpi->rd_thresh_mult[i] < thresh_max ? cpi->rd_thresh_mult[i] * t / 4 : INT_MAX; for (i = 0; i < MAX_REFS; ++i) { cpi->rd_thresh_sub8x8[segment_id][bsize][i] = - sf->thresh_mult_sub8x8[i] < thresh_max - ? sf->thresh_mult_sub8x8[i] * t / 4 + cpi->rd_thresh_mult_sub8x8[i] < thresh_max + ? cpi->rd_thresh_mult_sub8x8[i] * t / 4 : INT_MAX; } } |