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

Fix crash when reimporting audio clip while it's being played

Browse Source
This commit is contained in:
Wojtek Figat
2023-04-20 10:56:57 +02:00
parent 6ec35e5175
commit d719ef8d03
2 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Editor/Viewport/Previews/AudioClipPreview.cs
View File

@@ -126,12 +126,18 @@ namespace FlaxEditor.Viewport.Previews
{
lock (_locker)
{
// Release any cached data
_pcmData = null;
if (_asset != null)
{
// Release any cached data
_pcmData = null;
// Invalidate any in-flight data download to reject cached data due to refresh
if (_pcmSequence != 0)
_pcmSequence++;
// Invalidate any in-flight data download to reject cached data due to refresh
if (_pcmSequence != 0)
_pcmSequence++;
// Use async task to gather PCM data (engine loads it from the asset)
Task.Run(DownloadData);
}
}
}

23
Source/Engine/Audio/AudioClip.cpp
View File

@@ -200,6 +200,8 @@ bool AudioClip::ExtractData(Array<byte>& resultData, AudioDataInfo& resultDataIn
ASSERT(!IsVirtual());
if (WaitForLoaded())
return true;
ScopeLock lock(Locker);
auto storageLock = Storage->LockSafe();
// Allocate memory
ASSERT(_totalChunksSize > 0);
@@ -245,6 +247,7 @@ bool AudioClip::ExtractDataRaw(Array<byte>& resultData, AudioDataInfo& resultDat
{
if (WaitForLoaded())
return true;
ScopeLock lock(Locker);
switch (Format())
{
case AudioFormat::Raw:
@@ -461,20 +464,32 @@ Asset::LoadResult AudioClip::load()
void AudioClip::unload(bool isReloading)
{
bool hasAnyBuffer = false;
for (const AUDIO_BUFFER_ID_TYPE bufferId : Buffers)
hasAnyBuffer |= bufferId != AUDIO_BUFFER_ID_INVALID;
// Stop any audio sources that are using this clip right now
// TODO: find better way to collect audio sources using audio clip and impl it for AudioStreamingHandler too
for (int32 sourceIndex = 0; sourceIndex < Audio::Sources.Count(); sourceIndex++)
{
const auto src = Audio::Sources[sourceIndex];
if (src->Clip == this)
src->Stop();
}
StopStreaming();
StreamingQueue.Clear();
if (Buffers.HasItems())
if (hasAnyBuffer)
{
for (int32 i = 0; i < Buffers.Count(); i++)
for (AUDIO_BUFFER_ID_TYPE bufferId : Buffers)
{
auto bufferId = Buffers[i];
if (bufferId != AUDIO_BUFFER_ID_INVALID)
{
AudioBackend::Buffer::Delete(bufferId);
}
}
Buffers.Clear();
}
Buffers.Clear();
_totalChunks = 0;
Platform::MemoryClear(&AudioHeader, sizeof(AudioHeader));
}