diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-11 03:40:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-11 03:40:52 (GMT) |
| commit | 5eeb8abdf5eb81abf4700190b846bf8236cdcd93 (patch) | |
| tree | 318ffd0bbdcc982934fe5f9c42b2104a47e52401 | |
| parent | bf521a9a5d7670944658e93fe462c72f800a04f1 (diff) | |
| parent | ab3f818d2b2b597e8d45939a559a0ea7e1bfb481 (diff) | |
| download | Qt-5eeb8abdf5eb81abf4700190b846bf8236cdcd93.zip Qt-5eeb8abdf5eb81abf4700190b846bf8236cdcd93.tar.gz Qt-5eeb8abdf5eb81abf4700190b846bf8236cdcd93.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:
QAudioInput::processedUSecs() incorrect
| -rw-r--r-- | src/multimedia/audio/qaudioinput_alsa_p.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/audio/qaudioinput_alsa_p.cpp index 6010f3c..5eb23d0 100644 --- a/src/multimedia/audio/qaudioinput_alsa_p.cpp +++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp @@ -588,7 +588,11 @@ int QAudioInputPrivate::notifyInterval() const qint64 QAudioInputPrivate::processedUSecs() const { - return qint64(1000000) * totalTimeValue / settings.frequency(); + qint64 result = qint64(1000000) * totalTimeValue / + (settings.channels()*(settings.sampleSize()/8)) / + settings.frequency(); + + return result; } void QAudioInputPrivate::suspend() |