diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-24 22:37:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-24 22:37:31 (GMT) |
| commit | 26824d78f78369857b13a803f8aef58fc68411e9 (patch) | |
| tree | 926ffe0ad2ff28242c0ebab2666a515a3373e577 /src | |
| parent | 126849067d3c9d126606afaacecfef5559c2e657 (diff) | |
| parent | c0fc8af2d609148fccc96736718a31ff0bdb352c (diff) | |
| download | Qt-26824d78f78369857b13a803f8aef58fc68411e9.zip Qt-26824d78f78369857b13a803f8aef58fc68411e9.tar.gz Qt-26824d78f78369857b13a803f8aef58fc68411e9.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Calculate period size correctly.
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/audio/qaudioinput_mac_p.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/audio/qaudioinput_mac_p.cpp b/src/multimedia/audio/qaudioinput_mac_p.cpp index 4b37b18..cb65f6e 100644 --- a/src/multimedia/audio/qaudioinput_mac_p.cpp +++ b/src/multimedia/audio/qaudioinput_mac_p.cpp @@ -670,8 +670,8 @@ bool QAudioInputPrivate::open() } // Allocate buffer - periodSizeBytes = (numberOfFrames * streamFormat.mSampleRate / deviceFormat.mSampleRate) * - streamFormat.mBytesPerFrame; + periodSizeBytes = numberOfFrames * streamFormat.mBytesPerFrame; + if (internalBufferSize < periodSizeBytes * 2) internalBufferSize = periodSizeBytes * 2; else |