diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-06-09 10:45:56 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-06-09 10:45:56 -0700 |
| commit | e0c6507229a9bddcecef1d3ce5530a6ded8577c3 (patch) | |
| tree | d088f52158861cb7681635776c624ac7440b7a64 /vp9 | |
| parent | 61c4295af8c56c3dbe3a97a8a80a29099e587c69 (diff) | |
| parent | 580d72d3eafc24b16004a918f0a089f54979d635 (diff) | |
| download | libvpx-e0c6507229a9bddcecef1d3ce5530a6ded8577c3.tar libvpx-e0c6507229a9bddcecef1d3ce5530a6ded8577c3.tar.gz libvpx-e0c6507229a9bddcecef1d3ce5530a6ded8577c3.tar.bz2 libvpx-e0c6507229a9bddcecef1d3ce5530a6ded8577c3.zip | |
Merge "Removing unused tt_activity_measure()."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 914bb370a..ddb836e0e 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -547,22 +547,6 @@ static void choose_partitioning(VP9_COMP *cpi, } } -// Original activity measure from Tim T's code. -static unsigned int tt_activity_measure(MACROBLOCK *x) { - unsigned int sse; - // TODO: This could also be done over smaller areas (8x8), but that would - // require extensive changes elsewhere, as lambda is assumed to be fixed - // over an entire MB in most of the code. - // Another option is to compute four 8x8 variances, and pick a single - // lambda using a non-linear combination (e.g., the smallest, or second - // smallest, etc.). - const unsigned int act = vp9_variance16x16(x->plane[0].src.buf, - x->plane[0].src.stride, - VP9_VAR_OFFS, 0, &sse) << 4; - // If the region is flat, lower the activity some more. - return act < (8 << 12) ? MIN(act, 5 << 12) : act; -} - static void update_state(VP9_COMP *cpi, PICK_MODE_CONTEXT *ctx, int mi_row, int mi_col, BLOCK_SIZE bsize, int output_enabled) { |