generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removing unused tt_activity_measure().

Browse Source 
Change-Id: Ifcb46e6904730d14b9ef76b648b4d0dc3cd5d0c5
This commit is contained in:
Dmitry Kovalev
2014-06-04 17:11:30 -07:00
parent 5bf11e128a
commit 580d72d3ea
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vp9/encoder/vp9_encodeframe.c
View File

@@ -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, static void update_state(VP9_COMP *cpi, PICK_MODE_CONTEXT *ctx,
int mi_row, int mi_col, BLOCK_SIZE bsize, int mi_row, int mi_col, BLOCK_SIZE bsize,
int output_enabled) { int output_enabled) {