Merge branch 'v0.20.x'

This commit is contained in:
Max Kellermann
2018-01-05 10:10:17 +01:00
11 changed files with 150 additions and 48 deletions

View File

@@ -139,6 +139,14 @@ SoxrPcmResampler::Close() noexcept
soxr_delete(soxr);
}
void
SoxrPcmResampler::Reset() noexcept
{
#if SOXR_THIS_VERSION >= SOXR_VERSION(0,1,2)
soxr_clear(soxr);
#endif
}
ConstBuffer<void>
SoxrPcmResampler::Resample(ConstBuffer<void> src)
{

View File

@@ -41,6 +41,7 @@ class SoxrPcmResampler final : public PcmResampler {
public:
AudioFormat Open(AudioFormat &af, unsigned new_sample_rate) override;
void Close() noexcept override;
void Reset() noexcept override;
ConstBuffer<void> Resample(ConstBuffer<void> src) override;
ConstBuffer<void> Flush() override;
};