3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-30 09:26:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use soxr_process instead of soxr_oneshot

Browse source
This commit is contained in:
badaix 2020-01-12 14:29:46 +01:00
parent 2d64ee25a2
commit ed8479873c
2 changed files with 44 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

62
client/stream.cpp
View file

@ -38,6 +38,7 @@ Stream::Stream(const SampleFormat& sampleFormat)
input_rate_ = format_.rate; input_rate_ = format_.rate;
format_.rate = 48000; format_.rate = 48000;
output_rate_ = static_cast<double>(format_.rate);
/* /*
48000 x 48000 x
------- = ----- ------- = -----
@ -47,12 +48,14 @@ Stream::Stream(const SampleFormat& sampleFormat)
*/ */
// setRealSampleRate(format_.rate); // setRealSampleRate(format_.rate);
// double const irate = 48000.; soxr_error_t error;
// double const orate = 44100.; soxr_io_spec_t iospec = soxr_io_spec(SOXR_INT16_I, SOXR_INT16_I);
// soxr_error_t error; soxr_quality_spec_t q_spec = soxr_quality_spec(SOXR_HQ, 0);
// soxr_io_spec_t iospec = soxr_io_spec(SOXR_INT16_I, SOXR_INT16_I); soxr_ = soxr_create(static_cast<double>(input_rate_), static_cast<double>(format_.rate), format_.channels, &error, &iospec, &q_spec, NULL);
// soxr_t soxr = soxr_create(static_cast<double>(format_.rate), orate, format_.channels, &error, /* To report any error during creation. */ if (error)
// &iospec, NULL, NULL); {
LOG(ERROR) << "Error soxr_create: " << error << "\n";
}
} }
@ -86,20 +89,39 @@ void Stream::addChunk(msg::PcmChunk* chunk)
while (chunks_.size() * chunk->duration<cs::msec>().count() > 10000) while (chunks_.size() * chunk->duration<cs::msec>().count() > 10000)
chunks_.pop(); chunks_.pop();
size_t idone; if (std::abs(input_rate_ - output_rate_) <= 0.0000001)
size_t odone; {
auto out = new msg::PcmChunk(format_, 0); chunks_.push(shared_ptr<msg::PcmChunk>(chunk));
out->timestamp = chunk->timestamp; }
out->payloadSize = ceil(chunk->payloadSize * static_cast<double>(format_.rate) / static_cast<double>(input_rate_)); else
out->payload = (char*)malloc(out->payloadSize); {
soxr_io_spec_t iospec = soxr_io_spec(SOXR_INT16_I, SOXR_INT16_I); size_t idone;
soxr_quality_spec_t q_spec = soxr_quality_spec(SOXR_HQ, 0); size_t odone;
auto error = soxr_oneshot(static_cast<double>(input_rate_), static_cast<double>(format_.rate), format_.channels, chunk->payload, chunk->getFrameCount(), &idone, out->payload, out->payloadSize, &odone, &iospec, &q_spec, nullptr); auto out = new msg::PcmChunk(format_, 0);
out->payloadSize = odone * out->format.frameSize; out->timestamp = chunk->timestamp;
//LOG(INFO) << "Resample idone: " << idone << "/" << chunk->getFrameCount() << ", odone: " << odone << "/" << out->payloadSize / out->format.frameSize << "\n"; out->payloadSize = ceil(chunk->payloadSize * static_cast<double>(output_rate_) / static_cast<double>(input_rate_));
delete chunk; out->payload = (char*)malloc(out->payloadSize);
chunks_.push(shared_ptr<msg::PcmChunk>(out));
// LOG(DEBUG) << "new chunk: " << chunk->duration<cs::msec>().count() << ", Chunks: " << chunks_.size() << "\n"; soxr_io_spec_t iospec = soxr_io_spec(SOXR_INT16_I, SOXR_INT16_I);
soxr_quality_spec_t q_spec = soxr_quality_spec(SOXR_HQ, 0);
// auto error = soxr_oneshot(static_cast<double>(input_rate_), output_rate_, format_.channels, chunk->payload, chunk->getFrameCount(), &idone,
// out->payload, out->payloadSize, &odone, &iospec, &q_spec, nullptr);
auto error = soxr_process(soxr_, chunk->payload, chunk->getFrameCount(), &idone, out->payload, out->getFrameCount(), &odone);
if (error)
{
LOG(ERROR) << "Error soxr_process: " << error << "\n";
delete out;
}
else
{
out->payloadSize = odone * out->format.frameSize;
LOG(TRACE) << "Resample idone: " << idone << "/" << chunk->getFrameCount() << ", odone: " << odone << "/"
<< out->payloadSize / out->format.frameSize << "\n";
chunks_.push(shared_ptr<msg::PcmChunk>(out));
}
delete chunk;
}
LOG(TRACE) << "new chunk: " << chunk->duration<cs::msec>().count() << ", Chunks: " << chunks_.size() << "\n";
} }

3
client/stream.hpp
View file

@ -85,7 +85,8 @@ private:
long correctAfterXFrames_; long correctAfterXFrames_;
chronos::msec bufferMs_; chronos::msec bufferMs_;
size_t input_rate_; size_t input_rate_;
//soxr_t soxr_; double output_rate_;
soxr_t soxr_;
}; };