generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve framerate adaptation

Browse Source 
This patch improves the accuracy of frame rate estimation by using a
larger, 1 second window. It also more quickly adapts to step changes
in the input frame rate (ie 30fps to 15fps)

Change-Id: I39e48a8f5ac880b4c4b2ebd81049259b81a0218e
This commit is contained in:
John Koleszar
2011-05-12 15:04:06 -04:00
parent 71a7501bcf
commit 5ed116e220
1 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
vp8/encoder/onyx_if.c
View File

@@ -4699,23 +4699,48 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon
// adjust frame rates based on timestamps given // adjust frame rates based on timestamps given
if (!cm->refresh_alt_ref_frame) if (!cm->refresh_alt_ref_frame)
{ {
long long this_duration;
int step = 0;
if (cpi->source->ts_start == cpi->first_time_stamp_ever) if (cpi->source->ts_start == cpi->first_time_stamp_ever)
{ {
double this_fps = 10000000.000 / (cpi->source->ts_end - cpi->source->ts_start); this_duration = cpi->source->ts_end - cpi->source->ts_start;
step = 1;
vp8_new_frame_rate(cpi, this_fps);
} }
else else
{ {
long long nanosecs = cpi->source->ts_end long long last_duration;
- cpi->last_end_time_stamp_seen;
if (nanosecs > 0) this_duration = cpi->source->ts_end - cpi->last_end_time_stamp_seen;
{ last_duration = cpi->last_end_time_stamp_seen
double this_fps = 10000000.000 / nanosecs; - cpi->last_time_stamp_seen;
vp8_new_frame_rate(cpi, (7 * cpi->oxcf.frame_rate + this_fps) / 8); // do a step update if the duration changes by 10%
if (last_duration)
step = ((this_duration - last_duration) * 10 / last_duration);
} }
if (this_duration)
{
if (step)
vp8_new_frame_rate(cpi, 10000000.0 / this_duration);
else
{
double avg_duration, interval;
/* Average this frame's rate into the last second's average
* frame rate. If we haven't seen 1 second yet, then average
* over the whole interval seen.
*/
interval = cpi->source->ts_end - cpi->first_time_stamp_ever;
if(interval > 10000000.0)
interval = 10000000;
avg_duration = 10000000.0 / cpi->oxcf.frame_rate;
avg_duration *= (interval - avg_duration + this_duration);
avg_duration /= interval;
vp8_new_frame_rate(cpi, 10000000.0 / avg_duration);
}
} }
cpi->last_time_stamp_seen = cpi->source->ts_start; cpi->last_time_stamp_seen = cpi->source->ts_start;