Remove codec property from QAudioFormat and related

We only ever supported audio/x-raw (ie. unencoded PCM). Remove the
codec properties from QAudioBuffer and QAudioDeviceInfo. Those deal
with raw unencoded data and nothing else.

Change-Id: I772d1bf624c8515b1d2f696da3f8e5bd5f0cc2f1
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

3 files changed, 36 insertions, 49 deletions

diff --git a/examples/multimedia/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp
index 06ed21ad8..8977f85cd 100644
--- a/examples/multimedia/spectrum/app/engine.cpp
+++ b/examples/multimedia/spectrum/app/engine.cpp
@@ -582,7 +582,6 @@ bool Engine::selectFormat()
 
         QAudioFormat format;
         format.setByteOrder(QAudioFormat::LittleEndian);
-        format.setCodec("audio/x-raw");
         format.setSampleSize(16);
         format.setSampleType(QAudioFormat::SignedInt);
         for (int sampleRate : qAsConst(sampleRatesList)) {
diff --git a/examples/multimedia/spectrum/app/utils.cpp b/examples/multimedia/spectrum/app/utils.cpp
index 82ff76ab4..7e635b509 100644
--- a/examples/multimedia/spectrum/app/utils.cpp
+++ b/examples/multimedia/spectrum/app/utils.cpp
@@ -75,62 +75,51 @@ QString formatToString(const QAudioFormat &format)
     QString result;
 
     if (QAudioFormat() != format) {
-        if (format.codec() == "audio/x-raw") {
-            Q_ASSERT(format.sampleType() == QAudioFormat::SignedInt);
-
-            const QString formatEndian = (format.byteOrder() == QAudioFormat::LittleEndian)
-                ?   QString("LE") : QString("BE");
-
-            QString formatType;
-            switch (format.sampleType()) {
-            case QAudioFormat::SignedInt:
-                formatType = "signed";
-                break;
-            case QAudioFormat::UnSignedInt:
-                formatType = "unsigned";
-                break;
-            case QAudioFormat::Float:
-                formatType = "float";
-                break;
-            case QAudioFormat::Unknown:
-                formatType = "unknown";
-                break;
-            }
-
-            QString formatChannels = QString("%1 channels").arg(format.channelCount());
-            switch (format.channelCount()) {
-            case 1:
-                formatChannels = "mono";
-                break;
-            case 2:
-                formatChannels = "stereo";
-                break;
-            }
+        Q_ASSERT(format.sampleType() == QAudioFormat::SignedInt);
+
+        const QString formatEndian = (format.byteOrder() == QAudioFormat::LittleEndian)
+            ?   QString("LE") : QString("BE");
+
+        QString formatType;
+        switch (format.sampleType()) {
+        case QAudioFormat::SignedInt:
+            formatType = "signed";
+            break;
+        case QAudioFormat::UnSignedInt:
+            formatType = "unsigned";
+            break;
+        case QAudioFormat::Float:
+            formatType = "float";
+            break;
+        case QAudioFormat::Unknown:
+            formatType = "unknown";
+            break;
+        }
 
-            result = QString("%1 Hz %2 bit %3 %4 %5")
-                .arg(format.sampleRate())
-                .arg(format.sampleSize())
-                .arg(formatType)
-                .arg(formatEndian)
-                .arg(formatChannels);
-        } else {
-            result = format.codec();
+        QString formatChannels = QString("%1 channels").arg(format.channelCount());
+        switch (format.channelCount()) {
+        case 1:
+            formatChannels = "mono";
+            break;
+        case 2:
+            formatChannels = "stereo";
+            break;
         }
+
+        result = QString("%1 Hz %2 bit %3 %4 %5")
+            .arg(format.sampleRate())
+            .arg(format.sampleSize())
+            .arg(formatType)
+            .arg(formatEndian)
+            .arg(formatChannels);
     }
 
     return result;
 }
 
-bool isPCM(const QAudioFormat &format)
-{
-    return (format.codec() == "audio/x-raw");
-}
-
-
 bool isPCMS16LE(const QAudioFormat &format)
 {
-    return isPCM(format) &&
-           format.sampleType() == QAudioFormat::SignedInt &&
+    return format.sampleType() == QAudioFormat::SignedInt &&
            format.sampleSize() == 16 &&
            format.byteOrder() == QAudioFormat::LittleEndian;
 }
diff --git a/examples/multimedia/spectrum/app/wavfile.cpp b/examples/multimedia/spectrum/app/wavfile.cpp
index 42c30276c..bd545d701 100644
--- a/examples/multimedia/spectrum/app/wavfile.cpp
+++ b/examples/multimedia/spectrum/app/wavfile.cpp
@@ -145,7 +145,6 @@ bool WavFile::readHeader()
 
             int bps = qFromLittleEndian<quint16>(header.wave.bitsPerSample);
             m_fileFormat.setChannelCount(qFromLittleEndian<quint16>(header.wave.numChannels));
-            m_fileFormat.setCodec("audio/x-raw");
             m_fileFormat.setSampleRate(qFromLittleEndian<quint32>(header.wave.sampleRate));
             m_fileFormat.setSampleSize(qFromLittleEndian<quint16>(header.wave.bitsPerSample));
             m_fileFormat.setSampleType(bps == 8 ? QAudioFormat::UnSignedInt : QAudioFormat::SignedInt);