Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
e0c65072
Commit
e0c65072
authored
Jun 09, 2014
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Jun 09, 2014
Browse files
Merge "Removing unused tt_activity_measure()."
parents
61c4295a
580d72d3
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encodeframe.c
View file @
e0c65072
...
...
@@ -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
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment