diff options
| author | Christian Strømme <christian.stromme@theqtcompany.com> | 2016-01-15 17:27:32 +0100 |
|---|---|---|
| committer | Christian Strømme <christian.stromme@theqtcompany.com> | 2016-01-15 17:28:17 +0100 |
| commit | 84e426c3af2a3bb1b7f916e54263aea758db38d0 (patch) | |
| tree | 4fe09a8da5b15ba466e5771239d06f29a6c123da /src/multimedia/audio | |
| parent | 84aaa48fdfc1f35c9870518a3d4b6f08a1f99449 (diff) | |
| parent | 924dc7f48c7003b46079623738ae531f34aed903 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
src/plugins/wmf/mftvideo.cpp
Change-Id: I78868b416ea4baec89ca3e2dc9eb4712db16d5fc
Diffstat (limited to 'src/multimedia/audio')
| -rw-r--r-- | src/multimedia/audio/qaudio.cpp | 1 | ||||
| -rw-r--r-- | src/multimedia/audio/qsoundeffect_qaudio_p.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/multimedia/audio/qaudio.cpp b/src/multimedia/audio/qaudio.cpp index 72c24ad9f..45540a2b9 100644 --- a/src/multimedia/audio/qaudio.cpp +++ b/src/multimedia/audio/qaudio.cpp @@ -49,6 +49,7 @@ Q_CONSTRUCTOR_FUNCTION(qRegisterAudioMetaTypes) /*! \namespace QAudio + \ingroup multimedia-namespaces \brief The QAudio namespace contains enums used by the audio classes. \inmodule QtMultimedia \ingroup multimedia diff --git a/src/multimedia/audio/qsoundeffect_qaudio_p.cpp b/src/multimedia/audio/qsoundeffect_qaudio_p.cpp index e95e4e521..77ed48b4a 100644 --- a/src/multimedia/audio/qsoundeffect_qaudio_p.cpp +++ b/src/multimedia/audio/qsoundeffect_qaudio_p.cpp @@ -395,6 +395,8 @@ qint64 PrivateSoundSource::readData( char* data, qint64 len) memcpy(data + dataOffset, sampleData + m_offset, sampleSize - m_offset); bytesWritten += sampleSize - m_offset; int wrapLen = periodSize - (sampleSize - m_offset); + if (wrapLen > sampleSize) + wrapLen = sampleSize; #ifdef QT_QAUDIO_DEBUG qDebug() << "END OF SOUND: bytesWritten=" << bytesWritten << ", offset=" << m_offset << ", part1=" << (sampleSize-m_offset); |