Get rid of QAudioInput/Output::periodSize()

The periodSize() is badly defined and one does not really
need it in the public API. Get rid of it.

Change-Id: If95f040d386ac91620c8de4f907cd206b7dad16a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

2 files changed, 33 insertions, 47 deletions

diff --git a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp
index 360f60b87..a2410520d 100644
--- a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp
+++ b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp
@@ -358,7 +358,6 @@ void tst_QAudioInput::pull()
     QVERIFY2((audioInput.state() == QAudio::ActiveState || audioInput.state() == QAudio::IdleState),
              "didn't transition to ActiveState or IdleState after start()");
     QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()");
-    QVERIFY(audioInput.periodSize() > 0);
     stateSignal.clear();
 
     // Check that 'elapsed' increases
@@ -420,7 +419,6 @@ void tst_QAudioInput::pullSuspendResume()
     QVERIFY2((audioInput.state() == QAudio::ActiveState || audioInput.state() == QAudio::IdleState),
              "didn't transition to ActiveState or IdleState after start()");
     QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()");
-    QVERIFY(audioInput.periodSize() > 0);
     stateSignal.clear();
 
     // Check that 'elapsed' increases
@@ -506,7 +504,6 @@ void tst_QAudioInput::push()
     QVERIFY2((audioInput.state() == QAudio::IdleState),
              "didn't transition to IdleState after start()");
     QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()");
-    QVERIFY(audioInput.periodSize() > 0);
     stateSignal.clear();
 
     // Check that 'elapsed' increases
@@ -515,14 +512,14 @@ void tst_QAudioInput::push()
 
     qint64 totalBytesRead = 0;
     bool firstBuffer = true;
-    QByteArray buffer(AUDIO_BUFFER, 0);
+    (AUDIO_BUFFER, 0);
     qint64 len = audioFormat.sampleRate()*audioFormat.bytesPerFrame()/2; // .5 seconds
     while (totalBytesRead < len) {
-        QTRY_VERIFY_WITH_TIMEOUT(audioInput.bytesAvailable() >= audioInput.periodSize(), 1000);
-        qint64 bytesRead = feed->read(buffer.data(), audioInput.periodSize());
-        audioFile->write(buffer.constData(),bytesRead);
-        totalBytesRead+=bytesRead;
-        if (firstBuffer && bytesRead) {
+        QTRY_VERIFY_WITH_TIMEOUT(audioInput.bytesAvailable() > 0, 1000);
+        QByteArray buffer = feed->readAll();
+        audioFile->write(buffer);
+        totalBytesRead += buffer.size();
+        if (firstBuffer && buffer.size()) {
             // Check for transition to ActiveState when data is provided
             QTRY_VERIFY2((stateSignal.count() == 1),"didn't emit ActiveState signal on data");
             QVERIFY2((audioInput.state() == QAudio::ActiveState),
@@ -584,7 +581,6 @@ void tst_QAudioInput::pushSuspendResume()
     QVERIFY2((audioInput.state() == QAudio::IdleState),
              "didn't transition to IdleState after start()");
     QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()");
-    QVERIFY(audioInput.periodSize() > 0);
     stateSignal.clear();
 
     // Check that 'elapsed' increases
@@ -592,14 +588,13 @@ void tst_QAudioInput::pushSuspendResume()
 
     qint64 totalBytesRead = 0;
     bool firstBuffer = true;
-    QByteArray buffer(AUDIO_BUFFER, 0);
     qint64 len = audioFormat.sampleRate() * audioFormat.bytesPerFrame() / 10; // 100 msecond
     while (totalBytesRead < len) {
-        QTRY_VERIFY_WITH_TIMEOUT(audioInput.bytesAvailable() >= audioInput.periodSize(), 1000);
-        qint64 bytesRead = feed->read(buffer.data(), audioInput.periodSize());
-        audioFile->write(buffer.constData(),bytesRead);
-        totalBytesRead+=bytesRead;
-        if (firstBuffer && bytesRead) {
+        QTRY_VERIFY_WITH_TIMEOUT(audioInput.bytesAvailable() > 0, 1000);
+        auto buffer = feed->readAll();
+        audioFile->write(buffer);
+        totalBytesRead += buffer.size();
+        if (firstBuffer && buffer.size()) {
             // Check for transition to ActiveState when data is provided
             QTRY_VERIFY2((stateSignal.count() == 1),"didn't emit ActiveState signal on data");
             QVERIFY2((audioInput.state() == QAudio::ActiveState),
@@ -625,7 +620,7 @@ void tst_QAudioInput::pushSuspendResume()
     QVERIFY(audioInput.processedUSecs() == processedUs);
 
     // Drain any data, in case we run out of space when resuming
-    while (feed->read(buffer.data(), audioInput.periodSize()) > 0)
+    while (feed->readAll().size() > 0)
         ;
     QCOMPARE(audioInput.bytesAvailable(), 0);
 
@@ -636,7 +631,6 @@ void tst_QAudioInput::pushSuspendResume()
     QVERIFY2((audioInput.state() == QAudio::ActiveState),
              "didn't transition to ActiveState after resume()");
     QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after resume()");
-    QVERIFY(audioInput.periodSize() > 0);
 
     stateSignal.clear();
 
@@ -644,10 +638,10 @@ void tst_QAudioInput::pushSuspendResume()
     totalBytesRead = 0;
     firstBuffer = true;
     while (totalBytesRead < len && audioInput.state() != QAudio::StoppedState) {
-        QTRY_VERIFY_WITH_TIMEOUT(audioInput.bytesAvailable() >= audioInput.periodSize(), 1000);
-        qint64 bytesRead = feed->read(buffer.data(), audioInput.periodSize());
-        audioFile->write(buffer.constData(),bytesRead);
-        totalBytesRead+=bytesRead;
+        QTRY_VERIFY_WITH_TIMEOUT(audioInput.bytesAvailable() > 0, 1000);
+        auto buffer = feed->readAll();
+        audioFile->write(buffer);
+        totalBytesRead += buffer.size();
     }
     stateSignal.clear();
 
@@ -688,11 +682,10 @@ void tst_QAudioInput::reset()
         QTRY_VERIFY2((stateSignal.count() == 1),"didn't emit IdleState signal on start()");
         QVERIFY2((audioInput.state() == QAudio::IdleState), "didn't transition to IdleState after start()");
         QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()");
-        QVERIFY(audioInput.periodSize() > 0);
-        QTRY_VERIFY2_WITH_TIMEOUT((audioInput.bytesAvailable() > audioInput.periodSize()), "no bytes available after starting", 10000);
+        QTRY_VERIFY2_WITH_TIMEOUT((audioInput.bytesAvailable() > 0), "no bytes available after starting", 10000);
 
         // Trigger a read
-        QByteArray data = device->read(audioInput.periodSize());
+        QByteArray data = device->readAll();
         QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()");
         stateSignal.clear();
 
@@ -719,7 +712,6 @@ void tst_QAudioInput::reset()
         QTRY_VERIFY2((stateSignal.count() >= 1),"didn't emit state changed signal on start()");
         QTRY_VERIFY2((audioInput.state() == QAudio::ActiveState), "didn't transition to ActiveState after start()");
         QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()");
-        QVERIFY(audioInput.periodSize() > 0);
         stateSignal.clear();
 
         audioInput.reset();
diff --git a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
index 87937b454..2cd59f472 100644
--- a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
+++ b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
@@ -402,7 +402,6 @@ void tst_QAudioOutput::pull()
                  QString("didn't emit signal on start(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData());
     QVERIFY2((audioOutput.state() == QAudio::ActiveState), "didn't transition to ActiveState after start()");
     QVERIFY2((audioOutput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()");
-    QVERIFY(audioOutput.periodSize() > 0);
     stateSignal.clear();
 
     // Check that 'elapsed' increases
@@ -456,7 +455,6 @@ void tst_QAudioOutput::pullSuspendResume()
                  QString("didn't emit signal on start(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData());
     QVERIFY2((audioOutput.state() == QAudio::ActiveState), "didn't transition to ActiveState after start()");
     QVERIFY2((audioOutput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()");
-    QVERIFY(audioOutput.periodSize() > 0);
     stateSignal.clear();
 
     // Wait for half of clip to play
@@ -538,7 +536,6 @@ void tst_QAudioOutput::push()
                  QString("didn't emit signal on start(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData());
     QVERIFY2((audioOutput.state() == QAudio::IdleState), "didn't transition to IdleState after start()");
     QVERIFY2((audioOutput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()");
-    QVERIFY(audioOutput.periodSize() > 0);
     stateSignal.clear();
 
     // Check that 'elapsed' increases
@@ -548,13 +545,12 @@ void tst_QAudioOutput::push()
 
     qint64 written = 0;
     bool firstBuffer = true;
-    QByteArray buffer(AUDIO_BUFFER, 0);
 
     while (written < audioFile->size() - QWaveDecoder::headerLength()) {
 
-        if (audioOutput.bytesFree() >= audioOutput.periodSize()) {
-            qint64 len = audioFile->read(buffer.data(),audioOutput.periodSize());
-            written += feed->write(buffer.constData(), len);
+        if (audioOutput.bytesFree() > 0) {
+            auto buffer = audioFile->read(audioOutput.bytesFree());
+            written += feed->write(buffer);
 
             if (firstBuffer) {
                 // Check for transition to ActiveState when data is provided
@@ -621,7 +617,6 @@ void tst_QAudioOutput::pushSuspendResume()
                  QString("didn't emit signal on start(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData());
     QVERIFY2((audioOutput.state() == QAudio::IdleState), "didn't transition to IdleState after start()");
     QVERIFY2((audioOutput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()");
-    QVERIFY(audioOutput.periodSize() > 0);
     stateSignal.clear();
 
     // Check that 'elapsed' increases
@@ -636,9 +631,9 @@ void tst_QAudioOutput::pushSuspendResume()
     // Play half of the clip
     while (written < (audioFile->size() - QWaveDecoder::headerLength()) / 2) {
 
-        if (audioOutput.bytesFree() >= audioOutput.periodSize()) {
-            qint64 len = audioFile->read(buffer.data(),audioOutput.periodSize());
-            written += feed->write(buffer.constData(), len);
+        if (audioOutput.bytesFree() > 0) {
+            auto buffer = audioFile->read(audioOutput.bytesFree());
+            written += feed->write(buffer);
 
             if (firstBuffer) {
                 // Check for transition to ActiveState when data is provided
@@ -685,9 +680,9 @@ void tst_QAudioOutput::pushSuspendResume()
 
     // Play rest of the clip
     while (!audioFile->atEnd()) {
-        if (audioOutput.bytesFree() >= audioOutput.periodSize()) {
-            qint64 len = audioFile->read(buffer.data(),audioOutput.periodSize());
-            written += feed->write(buffer.constData(), len);
+        if (audioOutput.bytesFree() > 0) {
+            auto buffer = audioFile->read(audioOutput.bytesFree());
+            written += feed->write(buffer);
             QVERIFY2((audioOutput.state() == QAudio::ActiveState), "didn't transition to ActiveState after writing audio data");
         } else
             QTest::qWait(20);
@@ -744,7 +739,6 @@ void tst_QAudioOutput::pushUnderrun()
                  QString("didn't emit signal on start(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData());
     QVERIFY2((audioOutput.state() == QAudio::IdleState), "didn't transition to IdleState after start()");
     QVERIFY2((audioOutput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()");
-    QVERIFY(audioOutput.periodSize() > 0);
     stateSignal.clear();
 
     // Check that 'elapsed' increases
@@ -759,9 +753,9 @@ void tst_QAudioOutput::pushUnderrun()
     // Play half of the clip
     while (written < (audioFile->size() - QWaveDecoder::headerLength()) / 2) {
 
-        if (audioOutput.bytesFree() >= audioOutput.periodSize()) {
-            qint64 len = audioFile->read(buffer.data(),audioOutput.periodSize());
-            written += feed->write(buffer.constData(), len);
+        if (audioOutput.bytesFree() > 0) {
+            auto buffer = audioFile->read(audioOutput.bytesFree());
+            written += feed->write(buffer);
 
             if (firstBuffer) {
                 // Check for transition to ActiveState when data is provided
@@ -790,9 +784,9 @@ void tst_QAudioOutput::pushUnderrun()
     firstBuffer = true;
     // Play rest of the clip
     while (!audioFile->atEnd()) {
-        if (audioOutput.bytesFree() >= audioOutput.periodSize()) {
-            qint64 len = audioFile->read(buffer.data(),audioOutput.periodSize());
-            written += feed->write(buffer.constData(), len);
+        if (audioOutput.bytesFree() > 0) {
+            auto buffer = audioFile->read(audioOutput.bytesFree());
+            written += feed->write(buffer);
             if (firstBuffer) {
                 // Check for transition to ActiveState when data is provided
                 QVERIFY2((stateSignal.count() == 1),