summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-24 06:12:10 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-24 06:12:10 (GMT)
commit73ce2c6d3aaea50ebab95561fdccbf35ed4c00d8 (patch)
treef49642b780229a384499ca2844bef0c8785bea05 /src
parentb8014934d6c6846caab55f57fc7e32196fe6492d (diff)
parente887e0c38b5497757dfc69190c5a86cdc8104097 (diff)
downloadQt-73ce2c6d3aaea50ebab95561fdccbf35ed4c00d8.zip
Qt-73ce2c6d3aaea50ebab95561fdccbf35ed4c00d8.tar.gz
Qt-73ce2c6d3aaea50ebab95561fdccbf35ed4c00d8.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.cpp4
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