Skip to content
GitLab
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
3d22d3ae
Commit
3d22d3ae
authored
Sep 10, 2013
by
Deb Mukherjee
Committed by
Gerrit Code Review
Sep 10, 2013
Browse files
Merge "Small tweaks on the constant quality mode"
parents
0607abc3
09830aa0
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_onyx_if.c
View file @
3d22d3ae
...
...
@@ -2811,28 +2811,17 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
// TODO(debargha): Refine the logic below
if
(
cpi
->
oxcf
.
end_usage
==
USAGE_CONSTANT_QUALITY
)
{
if
(
!
cpi
->
refresh_alt_ref_frame
)
{
if
(
cpi
->
gfu_boost
>
high
)
{
cpi
->
active_best_quality
=
cpi
->
cq_target_quality
*
14
/
16
;
}
else
if
(
cpi
->
gfu_boost
<
low
)
{
cpi
->
active_best_quality
=
cpi
->
cq_target_quality
;
}
else
{
const
int
gap
=
high
-
low
;
const
int
offset
=
high
-
cpi
->
gfu_boost
;
const
int
qdiff
=
cpi
->
cq_target_quality
*
2
/
16
;
const
int
adjustment
=
((
offset
*
qdiff
)
+
(
gap
>>
1
))
/
gap
;
cpi
->
active_best_quality
=
cpi
->
cq_target_quality
*
14
/
16
+
adjustment
;
}
cpi
->
active_best_quality
=
cpi
->
cq_target_quality
;
}
else
{
if
(
cpi
->
frames_since_key
>
1
)
{
if
(
cpi
->
gfu_boost
>
high
)
{
cpi
->
active_best_quality
=
cpi
->
cq_target_quality
*
6
/
16
;
}
else
if
(
cpi
->
gfu_boost
<
low
)
{
cpi
->
active_best_quality
=
cpi
->
cq_target_quality
*
1
0
/
16
;
cpi
->
active_best_quality
=
cpi
->
cq_target_quality
*
1
1
/
16
;
}
else
{
const
int
gap
=
high
-
low
;
const
int
offset
=
high
-
cpi
->
gfu_boost
;
const
int
qdiff
=
cpi
->
cq_target_quality
*
4
/
16
;
const
int
qdiff
=
cpi
->
cq_target_quality
*
5
/
16
;
const
int
adjustment
=
((
offset
*
qdiff
)
+
(
gap
>>
1
))
/
gap
;
cpi
->
active_best_quality
=
cpi
->
cq_target_quality
*
6
/
16
+
adjustment
;
...
...
@@ -2867,11 +2856,6 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
cpi
->
active_best_quality
=
cpi
->
cq_target_quality
;
}
}
/*
if (cm->current_video_frame == 1)
printf("q/active_best/worst_quality = %d %d %d\n",
q, cpi->active_best_quality, cpi->active_worst_quality);
*/
}
// Clip the active best and worst quality values to limits
...
...
@@ -3394,7 +3378,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
// in this frame.
// update_base_skip_probs(cpi);
#if
0 //
CONFIG_INTERNAL_STATS
#if CONFIG_INTERNAL_STATS
{
FILE
*
f
=
fopen
(
"tmp.stt"
,
cm
->
current_video_frame
?
"a"
:
"w"
);
int
recon_err
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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