From 52ade14d7f0b5803e8f47cfa1fde7832fef51eea Mon Sep 17 00:00:00 2001
From: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
Date: Wed, 30 Oct 2019 17:47:47 -0400
Subject: [PATCH] audio: resample in call tone
Fix crash on macOS when receiving a call during another running call
Change-Id: I251fe0ca34a6ec12ebe63f6c3915c535821e25e6
---
src/media/audio/audiolayer.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/media/audio/audiolayer.cpp b/src/media/audio/audiolayer.cpp
index a2c4e55320..bf688c7ebb 100644
--- a/src/media/audio/audiolayer.cpp
+++ b/src/media/audio/audiolayer.cpp
@@ -155,7 +155,7 @@ AudioLayer::getToPlay(AudioFormat format, size_t writableSamples)
while (!(playbackBuf = playbackQueue_->dequeue())) {
if (auto urgentSamples = urgentRingBuffer_.get(RingBufferPool::DEFAULT_ID)) {
bufferPool.discard(1, RingBufferPool::DEFAULT_ID);
- playbackQueue_->enqueue(std::move(urgentSamples));
+ playbackQueue_->enqueue(resampler_->resample(std::move(urgentSamples),format));
} else if (auto toneToPlay = Manager::instance().getTelephoneTone()) {
playbackQueue_->enqueue(resampler_->resample(toneToPlay->getNext(), format));
} else if (auto buf = bufferPool.getData(RingBufferPool::DEFAULT_ID)) {
--
GitLab