Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
c7780075
Commit
c7780075
authored
Mar 04, 2016
by
paulwilkins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug in stats output for HBD.
Change-Id: Ic3b033e22cdcdc4a0f78cef433b2208fd254c27b
parent
dd6729f8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
1 deletion
+17
-1
vp9/encoder/vp9_encoder.c
vp9/encoder/vp9_encoder.c
+16
-0
vp9/encoder/vp9_ratectrl.c
vp9/encoder/vp9_ratectrl.c
+1
-1
No files found.
vp9/encoder/vp9_encoder.c
View file @
c7780075
...
...
@@ -2719,6 +2719,13 @@ 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
,
...
...
@@ -2730,6 +2737,7 @@ 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
)))
{
...
...
@@ -3076,7 +3084,15 @@ 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 @
c7780075
...
...
@@ -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
.
9
0
,
bit_depth
);
inter
[
i
]
=
get_minq_index
(
maxq
,
0
.
00000271
,
-
0
.
00113
,
0
.
7
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