From 787e9d163dea6b9423c21fbcbe4a7b82f06cb4b3 Mon Sep 17 00:00:00 2001
From: Kurt Korbatits <kurt.korbatits@nokia.com>
Date: Wed, 19 May 2010 11:10:39 +1000
Subject: The documentation for processedUSecs() is ambiguous

Task-number:QTBUG-10759
Reviewed-by:Justin McPherson
---
 src/multimedia/audio/qaudiooutput.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/multimedia/audio/qaudiooutput.cpp b/src/multimedia/audio/qaudiooutput.cpp
index 371773c..cf3b79c 100644
--- a/src/multimedia/audio/qaudiooutput.cpp
+++ b/src/multimedia/audio/qaudiooutput.cpp
@@ -369,8 +369,17 @@ int QAudioOutput::notifyInterval() const
 }
 
 /*!
-    Returns the amount of audio data processed since start()
+    Returns the amount of audio data processed by the class since start()
     was called in microseconds.
+
+    Note: The amount of audio data played can be determined by subtracting
+    the microseconds of audio data still in the systems audio buffer.
+
+    \code
+    qint64 bytesInBuffer = bufferSize() - bytesFree();
+    qint64 usInBuffer = (qint64)(1000000) * bytesInBuffer / ( channels() * sampleSize() / 8 ) / frequency();
+    qint64 usPlayed = processedUSecs() - usInBuffer;
+    \endcode
 */
 
 qint64 QAudioOutput::processedUSecs() const
-- 
cgit v0.12


From 3464049590db1c8198fcee7d369690a7c18756cc Mon Sep 17 00:00:00 2001
From: Kurt Korbatits <kurt.korbatits@nokia.com>
Date: Wed, 19 May 2010 13:36:07 +1000
Subject: QAudioDeviceInfo::nearestFormat() consistent across all platforms

Task-number:QTBUG-10760
Reviewed-by:Justin McPherson
---
 src/multimedia/audio/qaudiodeviceinfo.cpp | 62 ++++++++++++++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp
index 092efc5..ae65b02 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo.cpp
@@ -43,6 +43,7 @@
 #include <QtMultimedia/qaudioengine.h>
 #include <QtMultimedia/qaudiodeviceinfo.h>
 
+#include <QtCore/qmap.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -238,7 +239,66 @@ QAudioFormat QAudioDeviceInfo::preferredFormat() const
 
 QAudioFormat QAudioDeviceInfo::nearestFormat(const QAudioFormat &settings) const
 {
-    return isNull() ? QAudioFormat() : d->info->nearestFormat(settings);
+    if (isFormatSupported(settings))
+        return settings;
+
+    QAudioFormat nearest = settings;
+
+    nearest.setCodec(QLatin1String("audio/pcm"));
+
+    if (nearest.sampleType() == QAudioFormat::Unknown) {
+        QAudioFormat preferred = preferredFormat();
+        nearest.setSampleType(preferred.sampleType());
+    }
+
+    QMap<int,int> testFrequencies;
+    QList<int> frequenciesAvailable = supportedFrequencies();
+    QMap<int,int> testSampleSizes;
+    QList<int> sampleSizesAvailable = supportedSampleSizes();
+
+    // Get sorted sampleSizes (equal to and ascending values only)
+    if (sampleSizesAvailable.contains(settings.sampleSize()))
+        testSampleSizes.insert(0,settings.sampleSize());
+    sampleSizesAvailable.removeAll(settings.sampleSize());
+    foreach (int size, sampleSizesAvailable) {
+        int larger  = (size > settings.sampleSize()) ? size : settings.sampleSize();
+        int smaller = (size > settings.sampleSize()) ? settings.sampleSize() : size;
+        if (size >= settings.sampleSize()) {
+            int diff = larger - smaller;
+            testSampleSizes.insert(diff, size);
+        }
+    }
+
+    // Get sorted frequencies (equal to and ascending values only)
+    if (frequenciesAvailable.contains(settings.frequency()))
+        testFrequencies.insert(0,settings.frequency());
+    frequenciesAvailable.removeAll(settings.frequency());
+    foreach (int frequency, frequenciesAvailable) {
+        int larger  = (frequency > settings.frequency()) ? frequency : settings.frequency();
+        int smaller = (frequency > settings.frequency()) ? settings.frequency() : frequency;
+        if (frequency >= settings.frequency()) {
+            int diff = larger - smaller;
+            testFrequencies.insert(diff, frequency);
+        }
+    }
+
+    // Try to find nearest
+    // Check ascending frequencies, ascending sampleSizes
+    QMapIterator<int, int> sz(testSampleSizes);
+    while (sz.hasNext()) {
+        sz.next();
+        nearest.setSampleSize(sz.value());
+        QMapIterator<int, int> i(testFrequencies);
+        while (i.hasNext()) {
+            i.next();
+            nearest.setFrequency(i.value());
+            if (isFormatSupported(nearest))
+                return nearest;
+        }
+    }
+
+    //Fallback
+    return preferredFormat();
 }
 
 /*!
-- 
cgit v0.12


From c5f58f9a2ea2051289636a3491034136611d9922 Mon Sep 17 00:00:00 2001
From: Kurt Korbatits <kurt.korbatits@nokia.com>
Date: Thu, 20 May 2010 14:54:22 +1000
Subject: Removed nearest test from  qaudiodeviceinfo unit test.

Reviewed-by:Justin McPherson
---
 tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp b/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
index d3d81e6..7e16ed9 100644
--- a/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
+++ b/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
@@ -67,7 +67,6 @@ private slots:
     void frequencies();
     void isformat();
     void preferred();
-    void nearest();
 
 private:
     bool              available;
@@ -190,16 +189,6 @@ void tst_QAudioDeviceInfo::preferred()
     }
 }
 
-void tst_QAudioDeviceInfo::nearest()
-{
-    if(available) {
-        QAudioFormat format1, format2;
-        format1.setFrequency(8000);
-        format2 = device->nearestFormat(format1);
-        QVERIFY(format2.frequency() == 44100);
-    }
-}
-
 QTEST_MAIN(tst_QAudioDeviceInfo)
 
 #include "tst_qaudiodeviceinfo.moc"
-- 
cgit v0.12