X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=resampling_queue.cpp;h=06dc6fbf417bb1a13aae39f4cbf527e7740e5b6f;hb=ffd68fbfb90242069af957f2a28908f0559f8348;hp=7286d5cba535ebad5b757bc3ed1c2d2399d6d528;hpb=e0dd9e22b11a7e812b9ff708370426c564ac8005;p=nageru diff --git a/resampling_queue.cpp b/resampling_queue.cpp index 7286d5c..06dc6fb 100644 --- a/resampling_queue.cpp +++ b/resampling_queue.cpp @@ -49,6 +49,8 @@ void ResamplingQueue::add_input_samples(steady_clock::time_point ts, const float return; } + assert(duration(ts.time_since_epoch()).count() >= 0.0); + bool good_sample = (rate_adjustment_policy == ADJUST_RATE); if (good_sample && a1.good_sample) { a0 = a1; @@ -88,6 +90,12 @@ bool ResamplingQueue::get_output_samples(steady_clock::time_point ts, float *sam // good point. Note that we could be extrapolating backward or // forward, depending on the timing of the calls. const InputPoint &base_point = a1.good_sample ? a1 : a0; + assert(duration(base_point.ts.time_since_epoch()).count() >= 0.0); + + // NOTE: Due to extrapolation, input_samples_received can + // actually go negative here the few first calls (ie., we asked + // about a timestamp where we hadn't actually started producing + // samples yet), but that is harmless. const double input_samples_received = base_point.input_samples_received + current_estimated_freq_in * duration(ts - base_point.ts).count(); @@ -148,8 +156,6 @@ bool ResamplingQueue::get_output_samples(steady_clock::time_point ts, float *sam if (rcorr < 0.95) rcorr = 0.95; assert(!isnan(rcorr)); vresampler.set_rratio(rcorr); - } else { - assert(rate_adjustment_policy == DO_NOT_ADJUST_RATE); } // Finally actually resample, producing exactly output samples.