RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 17:47:44 +00:00
Code Issues Activity Actions

LibAudio: Make ResampleHelper templated for different sample types

Browse source 
Previously, ResampleHelper was fixed on handling double's, which makes
it unsuitable for the upcoming FLAC loader that needs to resample
integers. For this reason, ResampleHelper is templated to support
theoretically any type of sample, though only the necessary i32 and
double are templated right now.

The ResampleHelper implementations are moved from WavLoader.cpp to
Buffer.cpp.

This also improves some imports in the WavLoader files.
This commit is contained in:
kleines Filmröllchen 2021-06-25 13:37:38 +02:00 • committed by Ali Mohammad Pur
parent 2e00155275
commit 184a9e7e67
4 changed files with 73 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Userland/Libraries/LibAudio/WavLoader.cpp
View file

@ -5,11 +5,11 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "WavLoader.h"
#include "Buffer.h"
#include <AK/Debug.h>
#include <AK/NumericLimits.h>
#include <AK/OwnPtr.h>
#include <LibAudio/Buffer.h>
#include <LibAudio/WavLoader.h>
#include <LibCore/File.h>
#include <LibCore/FileStream.h>
@ -30,7 +30,7 @@ WavLoaderPlugin::WavLoaderPlugin(const StringView& path)
if (!valid)
return;
m_resampler = make<ResampleHelper>(m_sample_rate, m_device_sample_rate);
m_resampler = make<ResampleHelper<double>>(m_sample_rate, m_device_sample_rate);
}
WavLoaderPlugin::WavLoaderPlugin(const ByteBuffer& buffer)
@ -46,7 +46,7 @@ WavLoaderPlugin::WavLoaderPlugin(const ByteBuffer& buffer)
if (!valid)
return;
m_resampler = make<ResampleHelper>(m_sample_rate, m_device_sample_rate);
m_resampler = make<ResampleHelper<double>>(m_sample_rate, m_device_sample_rate);
}
RefPtr<Buffer> WavLoaderPlugin::get_more_samples(size_t max_bytes_to_read_from_input)
@ -284,28 +284,4 @@ bool WavLoaderPlugin::parse_header()
return true;
}
ResampleHelper::ResampleHelper(double source, double target)
: m_ratio(source / target)
{
}
void ResampleHelper::process_sample(double sample_l, double sample_r)
{
m_last_sample_l = sample_l;
m_last_sample_r = sample_r;
m_current_ratio += 1;
}
bool ResampleHelper::read_sample(double& next_l, double& next_r)
{
if (m_current_ratio > 0) {
m_current_ratio -= m_ratio;
next_l = m_last_sample_l;
next_r = m_last_sample_r;
return true;
}
return false;
}
}