GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix various issues with audio clip data buffers to reduce artifacts (especially when using 24-bit data)

Browse Source
This commit is contained in:
Wojtek Figat
2023-10-06 14:19:22 +02:00
parent e29d3d02a2
commit 92e28f66af
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Audio/AudioSource.cpp
View File

@@ -183,7 +183,7 @@ void AudioSource::Stop()
float AudioSource::GetTime() const
{
if (_state == States::Stopped || SourceIDs.IsEmpty())
if (_state == States::Stopped || SourceIDs.IsEmpty() || !Clip->IsLoaded())
return 0.0f;
float time = AudioBackend::Source::GetCurrentBufferTime(this);

9
Source/Engine/ContentImporters/ImportAudio.cpp
View File

@@ -64,6 +64,10 @@ CreateAssetResult ImportAudio::Import(CreateAssetContext& context, AudioDecoder&
}
}
// Vorbis uses fixed 16-bit depth
if (options.Format == AudioFormat::Vorbis)
options.BitDepth = AudioTool::BitDepth::_16;
LOG_STR(Info, options.ToString());
// Open the file
@@ -155,8 +159,9 @@ CreateAssetResult ImportAudio::Import(CreateAssetContext& context, AudioDecoder&
else
{
// Split audio data into a several chunks (uniform data spread)
const int32 MinChunkSize = 1 * 1024 * 1024; // 1 MB
const int32 chunkSize = Math::Max<int32>(MinChunkSize, (int32)Math::AlignUp<uint32>(bufferSize / ASSET_FILE_DATA_CHUNKS, 256));
const int32 minChunkSize = 1 * 1024 * 1024; // 1 MB
const int32 dataAlignment = info.NumChannels * bytesPerSample; // Ensure to never split samples in-between (eg. 24-bit that uses 3 bytes)
const int32 chunkSize = Math::Max<int32>(minChunkSize, (int32)Math::AlignUp<uint32>(bufferSize / ASSET_FILE_DATA_CHUNKS, dataAlignment));
const int32 chunksCount = Math::CeilToInt((float)bufferSize / chunkSize);
ASSERT(chunksCount > 0 && chunksCount <= ASSET_FILE_DATA_CHUNKS);