edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 06:28:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8273 from Robyt3/Sound-Various-Fixes

Browse source 
Fix crashes and memory leaks related to editor map sounds and opus file decoding, refactoring
This commit is contained in:
Dennis Felsing 2024-04-27 15:45:55 +00:00 committed by GitHub
parent a36ae188a8 9cf3094934
commit 516315e0e2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 42 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/engine/client/sound.cpp
View file

@ -292,14 +292,15 @@ CSample *CSound::AllocSample()
return nullptr;
CSample *pSample = &m_aSamples[m_FirstFreeSampleIndex];
m_FirstFreeSampleIndex = pSample->m_NextFreeSampleIndex;
pSample->m_NextFreeSampleIndex = SAMPLE_INDEX_USED;
if(pSample->m_pData != nullptr)
if(pSample->m_pData != nullptr || pSample->m_NextFreeSampleIndex == SAMPLE_INDEX_USED)
{
char aError[64];
str_format(aError, sizeof(aError), "Sample was not unloaded (index=%d, duration=%f)", pSample->m_Index, pSample->TotalTime());
char aError[128];
str_format(aError, sizeof(aError), "Sample was not unloaded (index=%d, next=%d, duration=%f, data=%p)",
pSample->m_Index, pSample->m_NextFreeSampleIndex, pSample->TotalTime(), pSample->m_pData);
dbg_assert(false, aError);
}
m_FirstFreeSampleIndex = pSample->m_NextFreeSampleIndex;
pSample->m_NextFreeSampleIndex = SAMPLE_INDEX_USED;
return pSample;
}
@ -341,29 +342,36 @@ void CSound::RateConvert(CSample &Sample) const
bool CSound::DecodeOpus(CSample &Sample, const void *pData, unsigned DataSize) const
{
OggOpusFile *pOpusFile = op_open_memory((const unsigned char *)pData, DataSize, nullptr);
int OpusError = 0;
OggOpusFile *pOpusFile = op_open_memory((const unsigned char *)pData, DataSize, &OpusError);
if(pOpusFile)
{
const int NumChannels = op_channel_count(pOpusFile, -1);
const int NumSamples = op_pcm_total(pOpusFile, -1); // per channel!
Sample.m_Channels = NumChannels;
if(Sample.m_Channels > 2)
if(NumChannels > 2)
{
op_free(pOpusFile);
dbg_msg("sound/opus", "file is not mono or stereo.");
return false;
}
Sample.m_pData = (short *)calloc((size_t)NumSamples * NumChannels, sizeof(short));
const int NumSamples = op_pcm_total(pOpusFile, -1); // per channel!
if(NumSamples < 0)
{
op_free(pOpusFile);
dbg_msg("sound/opus", "failed to get number of samples, error %d", NumSamples);
return false;
}
short *pSampleData = (short *)calloc((size_t)NumSamples * NumChannels, sizeof(short));
int Pos = 0;
while(Pos < NumSamples)
{
const int Read = op_read(pOpusFile, Sample.m_pData + Pos * NumChannels, NumSamples * NumChannels, nullptr);
const int Read = op_read(pOpusFile, pSampleData + Pos * NumChannels, (NumSamples - Pos) * NumChannels, nullptr);
if(Read < 0)
{
free(Sample.m_pData);
free(pSampleData);
op_free(pOpusFile);
dbg_msg("sound/opus", "op_read error %d at %d", Read, Pos);
return false;
}
@ -372,15 +380,19 @@ bool CSound::DecodeOpus(CSample &Sample, const void *pData, unsigned DataSize) c
Pos += Read;
}
op_free(pOpusFile);
Sample.m_pData = pSampleData;
Sample.m_NumFrames = Pos;
Sample.m_Rate = 48000;
Sample.m_Channels = NumChannels;
Sample.m_LoopStart = -1;
Sample.m_LoopEnd = -1;
Sample.m_PausedAt = 0;
}
else
{
dbg_msg("sound/opus", "failed to decode sample");
dbg_msg("sound/opus", "failed to decode sample, error %d", OpusError);
return false;
}
@ -459,10 +471,7 @@ bool CSound::DecodeWV(CSample &Sample, const void *pData, unsigned DataSize) con
const unsigned int SampleRate = WavpackGetSampleRate(pContext);
const int NumChannels = WavpackGetNumChannels(pContext);
Sample.m_Channels = NumChannels;
Sample.m_Rate = SampleRate;
if(Sample.m_Channels > 2)
if(NumChannels > 2)
{
dbg_msg("sound/wv", "file is not mono or stereo.");
s_pWVBuffer = nullptr;
@ -498,6 +507,8 @@ bool CSound::DecodeWV(CSample &Sample, const void *pData, unsigned DataSize) con
#endif
Sample.m_NumFrames = NumSamples;
Sample.m_Rate = SampleRate;
Sample.m_Channels = NumChannels;
Sample.m_LoopStart = -1;
Sample.m_LoopEnd = -1;
Sample.m_PausedAt = 0;

18
src/game/editor/editor.cpp
View file

@ -1379,12 +1379,17 @@ void CEditor::DoToolbarSounds(CUIRect ToolBar)
if(pSelectedSound->m_SoundId != m_ToolbarPreviewSound && m_ToolbarPreviewSound >= 0 && Sound()->IsPlaying(m_ToolbarPreviewSound))
Sound()->Stop(m_ToolbarPreviewSound);
m_ToolbarPreviewSound = pSelectedSound->m_SoundId;
}
else
{
m_ToolbarPreviewSound = -1;
}
if(m_ToolbarPreviewSound >= 0)
{
static int s_PlayPauseButton, s_StopButton, s_SeekBar = 0;
DoAudioPreview(ToolBarBottom, &s_PlayPauseButton, &s_StopButton, &s_SeekBar, m_ToolbarPreviewSound);
}
else
m_ToolbarPreviewSound = -1;
}
static void Rotate(const CPoint *pCenter, CPoint *pPoint, float Rotation)
@ -8705,11 +8710,10 @@ void CEditor::OnClose()
void CEditor::OnDialogClose()
{
if(m_FilePreviewSound >= 0)
{
Sound()->UnloadSample(m_FilePreviewSound);
m_FilePreviewSound = -1;
}
Graphics()->UnloadTexture(&m_FilePreviewImage);
Sound()->UnloadSample(m_FilePreviewSound);
m_FilePreviewSound = -1;
m_FilePreviewState = PREVIEW_UNLOADED;
}
void CEditor::LoadCurrentMap()

2
src/game/editor/mapitems/sound.h
View file

@ -10,7 +10,7 @@ public:
explicit CEditorSound(CEditor *pEditor);
~CEditorSound();
int m_SoundId = 0;
int m_SoundId = -1;
char m_aName[IO_MAX_PATH_LENGTH] = "";
void *m_pData = nullptr;