Merge ff_timefilter_read() and ff_timefilter_update(), this simplifies API and

avoids calling them in the wrong order.

Originally committed as revision 17841 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2009-03-06 00:14:44 +00:00
parent 08ffd3708b
commit 55b5859867
2 changed files with 4 additions and 20 deletions

View File

@@ -53,7 +53,7 @@ void ff_timefilter_reset(TimeFilter *self)
self->cycle_time = 0;
}
void ff_timefilter_update(TimeFilter *self, double system_time, double period)
double ff_timefilter_update(TimeFilter *self, double system_time, double period)
{
if (!self->cycle_time) {
/// init loop
@@ -68,9 +68,5 @@ void ff_timefilter_update(TimeFilter *self, double system_time, double period)
self->cycle_time += self->feedback2_factor * loop_error;
self->integrator2_state += self->feedback3_factor * loop_error / period;
}
}
double ff_timefilter_read(TimeFilter *self)
{
return self->cycle_time;
}