Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
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
Options
Browse Files
Download
Plain Diff
Merge "Making vp9_activity_masking() static."
parents
4d6cd41b
1a30a874
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_encodeframe.c
+2
-2
vp9/encoder/vp9_onyx_int.h
vp9/encoder/vp9_onyx_int.h
+0
-2
No files found.
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