slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't add the beginning of the file to the end of the last period

Browse Source 
If we're in the last loop, it is not necessary to provide a full period
on read. Just provide the remaining of the data and hit the end of the
stream by returning less than requested, otherwise we potentially
generate some garbage noise.

Change-Id: I9d3a632ddc0c3289957c9f876d5dbe2999b50ebd
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
This commit is contained in:
Kevin Ottens
2012-08-30 15:43:13 +02:00
committed by The Qt Project
parent 690b4c4978
commit 2f2b317318
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/multimedia/audio/qsoundeffect_qaudio_p.cpp
View File

@@ -412,6 +412,9 @@ qint64 PrivateSoundSource::readData( char* data, qint64 len)
dataOffset += (sampleSize - m_offset); dataOffset += (sampleSize - m_offset);
m_offset = 0; m_offset = 0;
if (m_runningCount > 0 && m_runningCount != QSoundEffect::Infinite)
soundeffect->setLoopsRemaining(m_runningCount-1);
if (m_runningCount > 0 || m_runningCount == QSoundEffect::Infinite) { if (m_runningCount > 0 || m_runningCount == QSoundEffect::Infinite) {
// There are still more loops of this sound to play, append the start of sound to make up full period // There are still more loops of this sound to play, append the start of sound to make up full period
memcpy(data + dataOffset, sampleData + m_offset, wrapLen); memcpy(data + dataOffset, sampleData + m_offset, wrapLen);
@@ -423,8 +426,6 @@ qint64 PrivateSoundSource::readData( char* data, qint64 len)
<< ", part2=" << wrapLen; << ", part2=" << wrapLen;
qDebug() << "part1 + part2 should be a period " << periodSize; qDebug() << "part1 + part2 should be a period " << periodSize;
#endif #endif
if (m_runningCount != QSoundEffect::Infinite)
soundeffect->setLoopsRemaining(m_runningCount-1);
} }
} }
if (m_runningCount == 0) if (m_runningCount == 0)