diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2012-05-30 12:54:34 +0100 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2012-06-12 17:15:29 +0100 |
| commit | 7eb66d82ca46377f602b512df789fc21ac20c277 (patch) | |
| tree | 8ad9a9bb53bb968efb38b581709211174609b5f2 /vp8/encoder/quantize.c | |
| parent | 0cb4985b51b804109819249322fad23fca39acd9 (diff) | |
| download | libvpx-7eb66d82ca46377f602b512df789fc21ac20c277.tar libvpx-7eb66d82ca46377f602b512df789fc21ac20c277.tar.gz libvpx-7eb66d82ca46377f602b512df789fc21ac20c277.tar.bz2 libvpx-7eb66d82ca46377f602b512df789fc21ac20c277.zip | |
Merge of further two pass rc clean up and adjustments.
Changes to calculation of sr_coded_error to include 0,0 case.
Experimental use of sr_coded_error in calculating correction factor
for estimating the allowable Q range.
Reinstated some code needed for calculating section_intra_rating.
Add flash detection in calculation of KF boost
Increased tolerance in testing candidate key frames (needed with
longer motion search as this tends to slightly increase inter %.
Zbin changes for 8x8.
Other minor adjustments, refactoring and bug fixes.
Reinstated some motion break out clauses in boost loop
as their removal hurt a few 50fps clips badly in the std set.
It may be possible to remove them again later if a better way
can be found of preventing overly long gf intervals.
Change-Id: Iee686d0c31072828bb1ccd2bc63f5f1c7c548ea2
Diffstat (limited to 'vp8/encoder/quantize.c')
| -rw-r--r-- | vp8/encoder/quantize.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/vp8/encoder/quantize.c b/vp8/encoder/quantize.c index 37e5b6d37..c0b1be324 100644 --- a/vp8/encoder/quantize.c +++ b/vp8/encoder/quantize.c @@ -297,17 +297,18 @@ void vp8cx_init_quantizer(VP8_COMP *cpi) int zbin_boost[16] = { 0, 0, 8, 10, 12, 14, 16, 20, 24, 28, 32, 36, 40, 44, 44, 44}; - int zbin_boost_8x8[64] = { 0, 0, 8, 10, 12, 14, 16, 20, - 24, 28, 32, 36, 40, 44, 48, 52, - 56, 60, 64, 68, 72, 76, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80 }; + int zbin_boost_8x8[64] = { 0, 0, 0, 8, 8, 8, 10, 12, + 14, 16, 18, 20, 22, 24, 26, 28, + 30, 32, 34, 36, 38, 40, 42, 44, + 46, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48 }; int qrounding_factor = 48; + for (Q = 0; Q < QINDEX_RANGE; Q++) { int qzbin_factor = (vp8_dc_quant(Q,0) < 148) ? 84 : 80; |