system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-04 15:09:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

AudioServer: Use AK::Stream to serialize mixed samples

Browse source
This commit is contained in:
Tim Schumacher 2023-02-07 15:02:43 +01:00 committed by Linus Groh
parent 185787d29d
commit a86184c997
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Userland/Services/AudioServer/Mixer.cpp
View file

@ -7,8 +7,8 @@
#include "Mixer.h"
#include <AK/Array.h>
#include <AK/DeprecatedMemoryStream.h>
#include <AK/Format.h>
#include <AK/MemoryStream.h>
#include <AK/NumericLimits.h>
#include <AudioServer/ConnectionFromClient.h>
#include <AudioServer/Mixer.h>
@ -99,7 +99,7 @@ void Mixer::mix()
if (m_muted || m_main_volume < 0.01) {
m_device->write(m_zero_filled_buffer.data(), static_cast<int>(m_zero_filled_buffer.size()));
} else {
DeprecatedOutputMemoryStream stream { m_stream_buffer };
FixedMemoryStream stream { m_stream_buffer.span() };
for (auto& mixed_sample : mixed_buffer) {
mixed_sample.log_multiply(static_cast<float>(m_main_volume));
@ -107,15 +107,15 @@ void Mixer::mix()
LittleEndian<i16> out_sample;
out_sample = static_cast<i16>(mixed_sample.left * NumericLimits<i16>::max());
stream << out_sample;
MUST(stream.write_value(out_sample));
out_sample = static_cast<i16>(mixed_sample.right * NumericLimits<i16>::max());
stream << out_sample;
MUST(stream.write_value(out_sample));
}
VERIFY(stream.is_end());
VERIFY(!stream.has_any_error());
m_device->write(stream.data(), static_cast<int>(stream.size()));
auto buffered_bytes = MUST(stream.tell());
VERIFY(buffered_bytes == m_stream_buffer.size());
m_device->write(m_stream_buffer.data(), static_cast<int>(buffered_bytes));
}
}
}