ref: 213f7b0907b1af2453e4af0f0e8c39606aeab974
parent: 692b10858d8be54706f3e02ba3075c9718d7d683
parent: 513f8e681415eb8fc96fdf862ffa17a26b1a5bb2
author: Paul Wilkins <paulwilkins@google.com>
date: Wed Nov 10 21:39:20 EST 2010
Merge "Relax rate control for last few frames"
--- a/vp8/encoder/firstpass.c
+++ b/vp8/encoder/firstpass.c
@@ -1439,7 +1439,7 @@
// Boost for arf frame
Boost = (cpi->gfu_boost * 3 * GFQ_ADJUSTMENT) / (2 * 100);
- Boost += (cpi->baseline_gf_interval * 50);
+ Boost += (i * 50);
allocation_chunks = (i * 100) + Boost;
// Normalize Altboost and allocations chunck down to prevent overflow
@@ -1738,16 +1738,6 @@
vp8_avg_stats(§ionstats);
- if (sectionstats.pcnt_motion < .17)
- cpi->section_is_low_motion = 1;
- else
- cpi->section_is_low_motion = 0;
-
- if (sectionstats.mvc_abs + sectionstats.mvr_abs > 45)
- cpi->section_is_fast_motion = 1;
- else
- cpi->section_is_fast_motion = 0;
-
cpi->section_intra_rating = sectionstats.intra_error / DOUBLE_DIVIDE_CHECK(sectionstats.coded_error);
Ratio = sectionstats.intra_error / DOUBLE_DIVIDE_CHECK(sectionstats.coded_error);
@@ -1980,7 +1970,14 @@
cpi->ni_av_qi = cpi->worst_quality;
}
}
- else
+ // 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
+ // few surplus bits or get beneath the target rate.
+ else if ( (cpi->common.current_video_frame <
+ (((unsigned int)cpi->total_stats->count * 255)>>8)) &&
+ ((cpi->common.current_video_frame + cpi->baseline_gf_interval) <
+ (unsigned int)cpi->total_stats->count) )
{
if (frames_left < 1)
frames_left = 1;
@@ -2344,17 +2341,7 @@
vp8_avg_stats(§ionstats);
- if (sectionstats.pcnt_motion < .17)
- cpi->section_is_low_motion = 1;
- else
- cpi->section_is_low_motion = 0;
-
- if (sectionstats.mvc_abs + sectionstats.mvr_abs > 45)
- cpi->section_is_fast_motion = 1;
- else
- cpi->section_is_fast_motion = 0;
-
- cpi->section_intra_rating = sectionstats.intra_error / DOUBLE_DIVIDE_CHECK(sectionstats.coded_error);
+ cpi->section_intra_rating = sectionstats.intra_error / DOUBLE_DIVIDE_CHECK(sectionstats.coded_error);
Ratio = sectionstats.intra_error / DOUBLE_DIVIDE_CHECK(sectionstats.coded_error);
// if( (Ratio > 11) ) //&& (sectionstats.pcnt_second_ref < .20) )
--- a/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@ -614,9 +614,6 @@
unsigned int tempdata2;
int base_skip_false_prob[128];
- unsigned int section_is_low_motion;
- unsigned int section_benefits_from_aggresive_q;
- unsigned int section_is_fast_motion;
unsigned int section_intra_rating;
double section_max_qfactor;
--
⑨