libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-21 17:45:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AUDIO: Fix data race in PacketizedMP3Stream

Browse Source
This commit is contained in:
Colin Snover 2017-11-19 20:44:18 -06:00
parent dbba22e571
commit 9fc24e19f2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
audio/decoders/mp3.cpp
View File

@ -119,6 +119,7 @@ public:
// AudioStream API
int readBuffer(int16 *buffer, const int numSamples);
bool endOfData() const;
bool endOfStream() const;
// PacketizedAudioStream API
@ -484,12 +485,17 @@ int PacketizedMP3Stream::readBuffer(int16 *buffer, const int numSamples) {
return samples;
}
bool PacketizedMP3Stream::endOfData() const {
Common::StackLock lock(_mutex);
return BaseMP3Stream::endOfData();
}
bool PacketizedMP3Stream::endOfStream() const {
Common::StackLock lock(_mutex);
if (!endOfData())
return false;
// Lock the mutex
Common::StackLock lock(_mutex);
if (!_queue.empty())
return false;