3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-06-03 19:31:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

Resample only if needed

Browse source
This commit is contained in:
badaix 2020-09-26 22:35:04 +02:00
parent b1a990be57
commit fcb40f325a
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
server/streamreader/meta_stream.cpp
View file

@ -16,11 +16,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
***/ ***/
#include "meta_stream.hpp"
#include "common/aixlog.hpp" #include "common/aixlog.hpp"
#include "common/snap_exception.hpp" #include "common/snap_exception.hpp"
#include "common/utils/string_utils.hpp" #include "common/utils/string_utils.hpp"
#include "encoder/encoder_factory.hpp" #include "encoder/encoder_factory.hpp"
#include "meta_stream.hpp"
using namespace std; using namespace std;
@ -62,7 +62,10 @@ MetaStream::MetaStream(PcmListener* pcmListener, std::vector<std::shared_ptr<Pcm
if (!streams_.empty()) if (!streams_.empty())
{ {
active_stream_ = streams_.front(); active_stream_ = streams_.front();
resampler_ = make_unique<Resampler>(active_stream_->getSampleFormat(), sampleFormat_); if ((sampleFormat_.rate() != active_stream_->getSampleFormat().rate()) || (sampleFormat_.bits() != active_stream_->getSampleFormat().bits()))
resampler_ = make_unique<Resampler>(active_stream_->getSampleFormat(), sampleFormat_);
else
resampler_ = nullptr;
} }
} }
@ -109,7 +112,10 @@ void MetaStream::onStateChanged(const PcmStream* pcmStream, ReaderState state)
if (active_stream_ != stream) if (active_stream_ != stream)
{ {
active_stream_ = stream; active_stream_ = stream;
resampler_ = make_unique<Resampler>(active_stream_->getSampleFormat(), sampleFormat_); if ((sampleFormat_.rate() != active_stream_->getSampleFormat().rate()) || (sampleFormat_.bits() != active_stream_->getSampleFormat().bits()))
resampler_ = make_unique<Resampler>(active_stream_->getSampleFormat(), sampleFormat_);
else
resampler_ = nullptr;
} }
setState(ReaderState::kPlaying); setState(ReaderState::kPlaying);
@ -158,10 +164,14 @@ void MetaStream::onChunkRead(const PcmStream* pcmStream, const msg::PcmChunk& ch
} }
} }
auto resampled_chunk = resampler_->resample(std::make_shared<msg::PcmChunk>(chunk)); if (resampler_)
if (resampled_chunk) {
chunkRead(*resampled_chunk); auto resampled_chunk = resampler_->resample(std::make_shared<msg::PcmChunk>(chunk));
// chunkRead(chunk); if (resampled_chunk)
chunkRead(*resampled_chunk);
}
else
chunkRead(chunk);
} }