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
be8a4cbb
Commit
be8a4cbb
authored
Nov 05, 2013
by
Deb Mukherjee
Committed by
Gerrit Code Review
Nov 05, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Remove one shot q experiment"
parents
f3efb990
1df7ef29
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
18 deletions
+0
-18
configure
configure
+0
-1
vp9/encoder/vp9_firstpass.c
vp9/encoder/vp9_firstpass.c
+0
-4
vp9/encoder/vp9_onyx_if.c
vp9/encoder/vp9_onyx_if.c
+0
-8
vp9/encoder/vp9_onyx_int.h
vp9/encoder/vp9_onyx_int.h
+0
-5
No files found.
configure
View file @
be8a4cbb
...
...
@@ -249,7 +249,6 @@ HAVE_LIST="
unistd_h
"
EXPERIMENT_LIST
=
"
oneshotq
multiple_arf
non420
alpha
...
...
vp9/encoder/vp9_firstpass.c
View file @
be8a4cbb
...
...
@@ -2169,17 +2169,14 @@ void vp9_second_pass(VP9_COMP *cpi) {
cpi
->
ni_av_qi
=
tmp_q
;
cpi
->
avg_q
=
vp9_convert_qindex_to_q
(
tmp_q
);
#ifndef ONE_SHOT_Q_ESTIMATE
// Limit the maxq value returned subsequently.
// This increases the risk of overspend or underspend if the initial
// estimate for the clip is bad, but helps prevent excessive
// variation in Q, especially near the end of a clip
// where for example a small overspend may cause Q to crash
adjust_maxq_qrange
(
cpi
);
#endif
}
#ifndef ONE_SHOT_Q_ESTIMATE
// The last few frames of a clip almost always have to few or too many
// bits and for the sake of over exact rate control we dont want to make
// radical adjustments to the allowed quantizer range just to use up a
...
...
@@ -2202,7 +2199,6 @@ void vp9_second_pass(VP9_COMP *cpi) {
cpi
->
active_worst_quality
=
adjust_active_maxq
(
cpi
->
active_worst_quality
,
tmp_q
);
}
#endif
}
vp9_zero
(
this_frame
);
if
(
EOF
==
input_stats
(
cpi
,
&
this_frame
))
...
...
vp9/encoder/vp9_onyx_if.c
View file @
be8a4cbb
...
...
@@ -2850,19 +2850,11 @@ static int pick_q_and_adjust_q_bounds(VP9_COMP *cpi,
if
(
cpi
->
oxcf
.
end_usage
==
USAGE_CONSTANT_QUALITY
)
{
cpi
->
active_best_quality
=
cpi
->
cq_target_quality
;
}
else
{
#ifdef ONE_SHOT_Q_ESTIMATE
#ifdef STRICT_ONE_SHOT_Q
cpi
->
active_best_quality
=
q
;
#else
cpi
->
active_best_quality
=
inter_minq
[
q
];
#endif
#else
cpi
->
active_best_quality
=
inter_minq
[
q
];
// 1-pass: for now, use the average Q for the active_best, if its lower
// than active_worst.
if
(
cpi
->
pass
==
0
&&
(
cpi
->
avg_frame_qindex
<
q
))
cpi
->
active_best_quality
=
inter_minq
[
cpi
->
avg_frame_qindex
];
#endif
// For the constrained quality mode we don't want
// q to fall below the cq level.
...
...
vp9/encoder/vp9_onyx_int.h
View file @
be8a4cbb
...
...
@@ -29,11 +29,6 @@
#include "vp9/common/vp9_findnearmv.h"
#include "vp9/encoder/vp9_lookahead.h"
// Experimental rate control switches
#if CONFIG_ONESHOTQ
#define ONE_SHOT_Q_ESTIMATE 0
#define STRICT_ONE_SHOT_Q 0
#endif
#define DISABLE_RC_LONG_TERM_MEM 0
// #define MODE_TEST_HIT_STATS
...
...
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