diff options
| author | Bill King <bill.king@nokia.com> | 2010-03-25 06:51:15 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2010-03-25 06:51:15 (GMT) |
| commit | c84d5afab9b61ae3f955de48a75c8dfd26528a36 (patch) | |
| tree | 381b415508a1ace0b82ac438976ef0da078e9ab0 | |
| parent | 92607e19c79fcdfb82e42fa45353004f85d1adf9 (diff) | |
| parent | da0050ab2f6f98a839548bda85c30c75c6fd6bfc (diff) | |
| download | Qt-c84d5afab9b61ae3f955de48a75c8dfd26528a36.zip Qt-c84d5afab9b61ae3f955de48a75c8dfd26528a36.tar.gz Qt-c84d5afab9b61ae3f955de48a75c8dfd26528a36.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
| -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 |