aboutsummaryrefslogtreecommitdiffstats
path: root/alc/backends/jack.cpp
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2019-12-21 20:43:46 -0800
committerChris Robinson <[email protected]>2019-12-21 20:43:46 -0800
commit2e6a55a87ce24a9303c3039609b41fb0eb302483 (patch)
treef3bb706cac1689ac9233da4bdd78a9530b5c078a /alc/backends/jack.cpp
parentc2ca617ed60e26878a6ac10aaf0dc644b6a24d29 (diff)
Handle padding between device sample frames
The padding must be constant and sample type aligned (e.g. some fixed multiple of two bytes between the start of two consecutive frames for 16-bit output). The intent is to always have the ability for stereo output with WASAPI even if the device has some other unsupported configuration, as long as front-left and front-right exist.
Diffstat (limited to 'alc/backends/jack.cpp')
-rw-r--r--alc/backends/jack.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/alc/backends/jack.cpp b/alc/backends/jack.cpp
index c7bf8469..2be52e35 100644
--- a/alc/backends/jack.cpp
+++ b/alc/backends/jack.cpp
@@ -292,6 +292,8 @@ int JackPlayback::mixerProc()
SetRTPriority();
althrd_setname(MIXER_THREAD_NAME);
+ const size_t frame_step{mDevice->channelsFromFmt()};
+
std::unique_lock<JackPlayback> dlock{*this};
while(!mKillNow.load(std::memory_order_acquire) &&
mDevice->Connected.load(std::memory_order_acquire))
@@ -311,9 +313,9 @@ int JackPlayback::mixerProc()
ALuint len1{minu(static_cast<ALuint>(data.first.len), todo)};
ALuint len2{minu(static_cast<ALuint>(data.second.len), todo-len1)};
- aluMixData(mDevice, data.first.buf, len1);
+ aluMixData(mDevice, data.first.buf, len1, frame_step);
if(len2 > 0)
- aluMixData(mDevice, data.second.buf, len2);
+ aluMixData(mDevice, data.second.buf, len2, frame_step);
mRing->writeAdvance(todo);
}