Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
7e7ae66f
Commit
7e7ae66f
authored
Feb 10, 2014
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Feb 10, 2014
Browse files
Merge "Making vp9_activity_masking() static."
parents
4d6cd41b
1a30a874
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encodeframe.c
View file @
7e7ae66f
...
...
@@ -319,7 +319,7 @@ static void build_activity_map(VP9_COMP *cpi) {
}
// Macroblock activity masking
void
vp9_
activity_masking
(
VP9_COMP
*
cpi
,
MACROBLOCK
*
x
)
{
static
void
activity_masking
(
VP9_COMP
*
cpi
,
MACROBLOCK
*
x
)
{
#if USE_ACT_INDEX
x
->
rdmult
+=
*
(
x
->
mb_activity_ptr
)
*
(
x
->
rdmult
>>
2
);
x
->
errorperbit
=
x
->
rdmult
*
100
/
(
110
*
x
->
rddiv
);
...
...
@@ -673,7 +673,7 @@ static void rd_pick_sb_modes(VP9_COMP *cpi, const TileInfo *const tile,
}
if
(
cpi
->
oxcf
.
tuning
==
VP8_TUNE_SSIM
)
vp9_
activity_masking
(
cpi
,
x
);
activity_masking
(
cpi
,
x
);
if
(
cpi
->
oxcf
.
aq_mode
==
VARIANCE_AQ
)
{
vp9_clear_system_state
();
// __asm emms;
...
...
vp9/encoder/vp9_onyx_int.h
View file @
7e7ae66f
...
...
@@ -692,8 +692,6 @@ void vp9_encode_frame(VP9_COMP *cpi);
void
vp9_pack_bitstream
(
VP9_COMP
*
cpi
,
uint8_t
*
dest
,
size_t
*
size
);
void
vp9_activity_masking
(
VP9_COMP
*
cpi
,
MACROBLOCK
*
x
);
void
vp9_set_speed_features
(
VP9_COMP
*
cpi
);
int
vp9_calc_ss_err
(
const
YV12_BUFFER_CONFIG
*
source
,
...
...
Write
Preview
Markdown
is supported
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