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
afd86930
Commit
afd86930
authored
Mar 15, 2016
by
Paul Wilkins
Committed by
Gerrit Code Review
Mar 15, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Revert "Fix bug in stats output for HBD.""
parents
2bf51c76
a132100e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
17 deletions
+1
-17
vp9/encoder/vp9_encoder.c
vp9/encoder/vp9_encoder.c
+0
-16
vp9/encoder/vp9_ratectrl.c
vp9/encoder/vp9_ratectrl.c
+1
-1
No files found.
vp9/encoder/vp9_encoder.c
View file @
afd86930
...
...
@@ -2722,13 +2722,6 @@ static int scale_down(VP9_COMP *cpi, int q) {
return
scale
;
}
static
int
big_rate_miss
(
VP9_COMP
*
cpi
,
int
high_limit
,
int
low_limit
)
{
const
RATE_CONTROL
*
const
rc
=
&
cpi
->
rc
;
return
(
rc
->
projected_frame_size
>
((
high_limit
*
3
)
/
2
))
||
(
rc
->
projected_frame_size
<
(
low_limit
/
2
));
}
// Function to test for conditions that indicate we should loop
// back and recode a frame.
static
int
recode_loop_test
(
VP9_COMP
*
cpi
,
...
...
@@ -2740,7 +2733,6 @@ static int recode_loop_test(VP9_COMP *cpi,
int
force_recode
=
0
;
if
((
rc
->
projected_frame_size
>=
rc
->
max_frame_bandwidth
)
||
big_rate_miss
(
cpi
,
high_limit
,
low_limit
)
||
(
cpi
->
sf
.
recode_loop
==
ALLOW_RECODE
)
||
(
frame_is_kfgfarf
&&
(
cpi
->
sf
.
recode_loop
==
ALLOW_RECODE_KFARFGF
)))
{
...
...
@@ -3087,15 +3079,7 @@ static void output_frame_level_debug_stats(VP9_COMP *cpi) {
vpx_clear_system_state();
#if CONFIG_VP9_HIGHBITDEPTH
if (cm->use_highbitdepth) {
recon_err = vp9_highbd_get_y_sse(cpi->Source, get_frame_new_buffer(cm));
} else {
recon_err = vp9_get_y_sse(cpi->Source, get_frame_new_buffer(cm));
}
#else
recon_err = vp9_get_y_sse(cpi->Source, get_frame_new_buffer(cm));
#endif // CONFIG_VP9_HIGHBITDEPTH
if (cpi->twopass.total_left_stats.coded_error != 0.0)
fprintf(f, "%10u %dx%d %10d %10d %d %d %10d %10d %10d %10d"
...
...
vp9/encoder/vp9_ratectrl.c
View file @
afd86930
...
...
@@ -133,7 +133,7 @@ static void init_minq_luts(int *kf_low_m, int *kf_high_m,
kf_high_m
[
i
]
=
get_minq_index
(
maxq
,
0
.
0000021
,
-
0
.
00125
,
0
.
55
,
bit_depth
);
arfgf_low
[
i
]
=
get_minq_index
(
maxq
,
0
.
0000015
,
-
0
.
000
9
,
0
.
30
,
bit_depth
);
arfgf_high
[
i
]
=
get_minq_index
(
maxq
,
0
.
0000021
,
-
0
.
00125
,
0
.
55
,
bit_depth
);
inter
[
i
]
=
get_minq_index
(
maxq
,
0
.
00000271
,
-
0
.
00113
,
0
.
7
0
,
bit_depth
);
inter
[
i
]
=
get_minq_index
(
maxq
,
0
.
00000271
,
-
0
.
00113
,
0
.
9
0
,
bit_depth
);
rtc
[
i
]
=
get_minq_index
(
maxq
,
0
.
00000271
,
-
0
.
00113
,
0
.
70
,
bit_depth
);
}
}
...
...
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