Merge pull request #2996 from birarda/master

add a mixer crash guard for meeting
This commit is contained in:
Stephen Birarda 2014-06-06 11:47:45 -07:00
commit 1c8cf20ec2

View file

@ -55,7 +55,9 @@ int PositionalAudioRingBuffer::parseData(const QByteArray& packet) {
readBytes += sizeof(int16_t);
addSilentFrame(numSilentSamples);
if (numSilentSamples > 0) {
addSilentFrame(numSilentSamples);
}
} else {
// there is audio data to read
readBytes += writeData(packet.data() + readBytes, packet.size() - readBytes);