Mercurial > libavformat.hg
changeset 4653:34a843f958b7 libavformat
Merge ff_timefilter_read() and ff_timefilter_update(), this simplifies API and
avoids calling them in the wrong order.
| author | michael |
|---|---|
| date | Fri, 06 Mar 2009 00:14:44 +0000 |
| parents | 28b80bbf6288 |
| children | d90df812a2a1 |
| files | timefilter.c timefilter.h |
| diffstat | 2 files changed, 4 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/timefilter.c Fri Mar 06 00:09:14 2009 +0000 +++ b/timefilter.c Fri Mar 06 00:14:44 2009 +0000 @@ -53,7 +53,7 @@ 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 @@ 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; }
--- a/timefilter.h Fri Mar 06 00:09:14 2009 +0000 +++ b/timefilter.h Fri Mar 06 00:14:44 2009 +0000 @@ -68,22 +68,10 @@ * at (or as close as possible to) the moment the device hardware interrupt * occured (or any other event the device clock raises at the beginning of a * cycle). + * + * @return the filtered time, in seconds */ -void ff_timefilter_update(TimeFilter *self, double system_time, double period); - -/** - * Retrieve the filtered time - * - * The returned value represents the filtered time, in seconds, of the - * beginning of the current cycle as updated by the last call to - * ff_timefilter_update() - * - * This is the value that should be used for timestamping. - * - * Warning: you must call ff_timefilter_update() before this, otherwise the - * result is undetermined. - */ -double ff_timefilter_read(TimeFilter *); +double ff_timefilter_update(TimeFilter *self, double system_time, double period); /** * Reset the filter