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
69f58b40
Commit
69f58b40
authored
Feb 10, 2014
by
Jim Bankoski
Browse files
Convert header static functions to inline or make them global.
Change-Id: Ib26fbfef3505299f754e5af6c437a85d7746fc28
parent
6a9e58cb
Changes
4
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_entropymode.c
View file @
69f58b40
...
...
@@ -345,7 +345,7 @@ static int adapt_prob(vp9_prob pre_prob, const unsigned int ct[2]) {
static
void
adapt_probs
(
const
vp9_tree_index
*
tree
,
const
vp9_prob
*
pre_probs
,
const
unsigned
int
*
counts
,
vp9_prob
*
probs
)
{
tree_merge_probs
(
tree
,
pre_probs
,
counts
,
COUNT_SAT
,
MAX_UPDATE_FACTOR
,
vp9_
tree_merge_probs
(
tree
,
pre_probs
,
counts
,
COUNT_SAT
,
MAX_UPDATE_FACTOR
,
probs
);
}
...
...
vp9/common/vp9_entropymv.c
View file @
69f58b40
...
...
@@ -192,8 +192,8 @@ static vp9_prob adapt_prob(vp9_prob prep, const unsigned int ct[2]) {
static
void
adapt_probs
(
const
vp9_tree_index
*
tree
,
const
vp9_prob
*
pre_probs
,
const
unsigned
int
*
counts
,
vp9_prob
*
probs
)
{
tree_merge_probs
(
tree
,
pre_probs
,
counts
,
MV_COUNT_SAT
,
MV_MAX_UPDATE_FACTOR
,
probs
);
vp9_
tree_merge_probs
(
tree
,
pre_probs
,
counts
,
MV_COUNT_SAT
,
MV_MAX_UPDATE_FACTOR
,
probs
);
}
void
vp9_adapt_mv_probs
(
VP9_COMMON
*
cm
,
int
allow_hp
)
{
...
...
vp9/common/vp9_prob.c
View file @
69f58b40
...
...
@@ -28,3 +28,34 @@ DECLARE_ALIGNED(16, const uint8_t, vp9_norm[256]) = {
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
static
unsigned
int
tree_merge_probs_impl
(
unsigned
int
i
,
const
vp9_tree_index
*
tree
,
const
vp9_prob
*
pre_probs
,
const
unsigned
int
*
counts
,
unsigned
int
count_sat
,
unsigned
int
max_update
,
vp9_prob
*
probs
)
{
const
int
l
=
tree
[
i
];
const
unsigned
int
left_count
=
(
l
<=
0
)
?
counts
[
-
l
]
:
tree_merge_probs_impl
(
l
,
tree
,
pre_probs
,
counts
,
count_sat
,
max_update
,
probs
);
const
int
r
=
tree
[
i
+
1
];
const
unsigned
int
right_count
=
(
r
<=
0
)
?
counts
[
-
r
]
:
tree_merge_probs_impl
(
r
,
tree
,
pre_probs
,
counts
,
count_sat
,
max_update
,
probs
);
const
unsigned
int
ct
[
2
]
=
{
left_count
,
right_count
};
probs
[
i
>>
1
]
=
merge_probs
(
pre_probs
[
i
>>
1
],
ct
,
count_sat
,
max_update
);
return
left_count
+
right_count
;
}
void
vp9_tree_merge_probs
(
const
vp9_tree_index
*
tree
,
const
vp9_prob
*
pre_probs
,
const
unsigned
int
*
counts
,
unsigned
int
count_sat
,
unsigned
int
max_update_factor
,
vp9_prob
*
probs
)
{
tree_merge_probs_impl
(
0
,
tree
,
pre_probs
,
counts
,
count_sat
,
max_update_factor
,
probs
);
}
vp9/common/vp9_prob.h
View file @
69f58b40
...
...
@@ -79,37 +79,10 @@ static INLINE vp9_prob merge_probs(vp9_prob pre_prob,
return
weighted_prob
(
pre_prob
,
prob
,
factor
);
}
static
unsigned
int
tree_merge_probs_impl
(
unsigned
int
i
,
const
vp9_tree_index
*
tree
,
const
vp9_prob
*
pre_probs
,
const
unsigned
int
*
counts
,
unsigned
int
count_sat
,
unsigned
int
max_update_factor
,
vp9_prob
*
probs
)
{
const
int
l
=
tree
[
i
];
const
unsigned
int
left_count
=
(
l
<=
0
)
?
counts
[
-
l
]
:
tree_merge_probs_impl
(
l
,
tree
,
pre_probs
,
counts
,
count_sat
,
max_update_factor
,
probs
);
const
int
r
=
tree
[
i
+
1
];
const
unsigned
int
right_count
=
(
r
<=
0
)
?
counts
[
-
r
]
:
tree_merge_probs_impl
(
r
,
tree
,
pre_probs
,
counts
,
count_sat
,
max_update_factor
,
probs
);
const
unsigned
int
ct
[
2
]
=
{
left_count
,
right_count
};
probs
[
i
>>
1
]
=
merge_probs
(
pre_probs
[
i
>>
1
],
ct
,
count_sat
,
max_update_factor
);
return
left_count
+
right_count
;
}
void
vp9_tree_merge_probs
(
const
vp9_tree_index
*
tree
,
const
vp9_prob
*
pre_probs
,
const
unsigned
int
*
counts
,
unsigned
int
count_sat
,
unsigned
int
max_update_factor
,
vp9_prob
*
probs
);
static
void
tree_merge_probs
(
const
vp9_tree_index
*
tree
,
const
vp9_prob
*
pre_probs
,
const
unsigned
int
*
counts
,
unsigned
int
count_sat
,
unsigned
int
max_update_factor
,
vp9_prob
*
probs
)
{
tree_merge_probs_impl
(
0
,
tree
,
pre_probs
,
counts
,
count_sat
,
max_update_factor
,
probs
);
}
DECLARE_ALIGNED
(
16
,
extern
const
uint8_t
,
vp9_norm
[
256
]);
...
...
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