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
46a951c8
Commit
46a951c8
authored
Jan 13, 2014
by
Dmitry Kovalev
Browse files
Using clamp() function instead of the same raw code.
Change-Id: Ia2ffca072f5391b277ce1a0c4e5b4ece9ffc6831
parent
dd31f2e4
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_firstpass.c
View file @
46a951c8
...
...
@@ -1932,12 +1932,9 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) {
// Allocate bits to a normal frame that is neither a gf an arf or a key frame.
static
void
assign_std_frame_bits
(
VP9_COMP
*
cpi
,
FIRSTPASS_STATS
*
this_frame
)
{
int
target_frame_size
;
double
modified_err
;
double
err_fraction
;
// Max for a single frame.
int
max_bits
=
frame_max_bits
(
cpi
);
const
int
max_bits
=
frame_max_bits
(
cpi
);
// Max for a single frame.
// Calculate modified prediction error used in bit allocation.
modified_err
=
calculate_modified_err
(
cpi
,
this_frame
);
...
...
@@ -1953,15 +1950,8 @@ static void assign_std_frame_bits(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) {
// Clip target size to 0 - max_bits (or cpi->twopass.gf_group_bits) at
// the top end.
if
(
target_frame_size
<
0
)
{
target_frame_size
=
0
;
}
else
{
if
(
target_frame_size
>
max_bits
)
target_frame_size
=
max_bits
;
if
(
target_frame_size
>
cpi
->
twopass
.
gf_group_bits
)
target_frame_size
=
(
int
)
cpi
->
twopass
.
gf_group_bits
;
}
target_frame_size
=
clamp
(
target_frame_size
,
0
,
MIN
(
max_bits
,
(
int
)
cpi
->
twopass
.
gf_group_bits
));
// Adjust error and bits remaining.
cpi
->
twopass
.
gf_group_error_left
-=
(
int64_t
)
modified_err
;
...
...
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