audio/pcm is not a valid mimetype

Use audio/x-raw instead, in line with gstreamer.

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

9 files changed, 12 insertions, 12 deletions

diff --git a/examples/multimedia/audiodecoder/audiodecoder.cpp b/examples/multimedia/audiodecoder/audiodecoder.cpp
index f812fd3b6..f38ffa838 100644
--- a/examples/multimedia/audiodecoder/audiodecoder.cpp
+++ b/examples/multimedia/audiodecoder/audiodecoder.cpp
@@ -63,7 +63,7 @@ AudioDecoder::AudioDecoder(bool isPlayback, bool isDelete)
     format.setChannelCount(2);
     format.setSampleSize(16);
     format.setSampleRate(48000);
-    format.setCodec("audio/pcm");
+    format.setCodec("audio/x-raw");
     format.setSampleType(QAudioFormat::SignedInt);
     m_decoder.setAudioFormat(format);
 
diff --git a/examples/multimedia/audiodecoder/wavefilewriter.cpp b/examples/multimedia/audiodecoder/wavefilewriter.cpp
index cb1abbc9f..657dde94c 100644
--- a/examples/multimedia/audiodecoder/wavefilewriter.cpp
+++ b/examples/multimedia/audiodecoder/wavefilewriter.cpp
@@ -105,7 +105,7 @@ bool WaveFileWriter::open(const QString& fileName, const QAudioFormat& format)
     if (file.isOpen())
         return false; // file already open
 
-    if (format.codec() != "audio/pcm" || format.sampleType() != QAudioFormat::SignedInt)
+    if (format.codec() != "audio/x-raw" || format.sampleType() != QAudioFormat::SignedInt)
         return false; // data format is not supported
 
     file.setFileName(fileName);
diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp
index 611500c41..ad3c15720 100644
--- a/examples/multimedia/audioinput/audioinput.cpp
+++ b/examples/multimedia/audioinput/audioinput.cpp
@@ -276,7 +276,7 @@ void InputTest::initializeAudio(const QAudioDeviceInfo &deviceInfo)
     format.setSampleSize(16);
     format.setSampleType(QAudioFormat::SignedInt);
     format.setByteOrder(QAudioFormat::LittleEndian);
-    format.setCodec("audio/pcm");
+    format.setCodec("audio/x-raw");
 
     if (!deviceInfo.isFormatSupported(format)) {
         qWarning() << "Default format not supported - trying to use nearest";
diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp
index b6eb41f69..b1deab124 100644
--- a/examples/multimedia/audiooutput/audiooutput.cpp
+++ b/examples/multimedia/audiooutput/audiooutput.cpp
@@ -209,7 +209,7 @@ void AudioTest::initializeAudio(const QAudioDeviceInfo &deviceInfo)
     format.setSampleRate(44100);
     format.setChannelCount(1);
     format.setSampleSize(16);
-    format.setCodec("audio/pcm");
+    format.setCodec("audio/x-raw");
     format.setByteOrder(QAudioFormat::LittleEndian);
     format.setSampleType(QAudioFormat::SignedInt);
 
diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp
index adaf4be5c..65d952e0d 100644
--- a/examples/multimedia/audiorecorder/audiorecorder.cpp
+++ b/examples/multimedia/audiorecorder/audiorecorder.cpp
@@ -256,7 +256,7 @@ qreal getPeakValue(const QAudioFormat& format)
     if (!format.isValid())
         return qreal(0);
 
-    if (format.codec() != "audio/pcm")
+    if (format.codec() != "audio/x-raw")
         return qreal(0);
 
     switch (format.sampleType()) {
@@ -295,7 +295,7 @@ QList<qreal> getBufferLevels(const QAudioBuffer &buffer)
     if (!buffer.format().isValid() || buffer.format().byteOrder() != QAudioFormat::LittleEndian)
         return values;
 
-    if (buffer.format().codec() != "audio/pcm")
+    if (buffer.format().codec() != "audio/x-raw")
         return values;
 
     int channelCount = buffer.format().channelCount();
diff --git a/examples/multimedia/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp
index b7cbe13a4..42f96ed9d 100644
--- a/examples/multimedia/spectrum/app/engine.cpp
+++ b/examples/multimedia/spectrum/app/engine.cpp
@@ -583,7 +583,7 @@ bool Engine::selectFormat()
 
         QAudioFormat format;
         format.setByteOrder(QAudioFormat::LittleEndian);
-        format.setCodec("audio/pcm");
+        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 fc8b9a448..82ff76ab4 100644
--- a/examples/multimedia/spectrum/app/utils.cpp
+++ b/examples/multimedia/spectrum/app/utils.cpp
@@ -75,7 +75,7 @@ QString formatToString(const QAudioFormat &format)
     QString result;
 
     if (QAudioFormat() != format) {
-        if (format.codec() == "audio/pcm") {
+        if (format.codec() == "audio/x-raw") {
             Q_ASSERT(format.sampleType() == QAudioFormat::SignedInt);
 
             const QString formatEndian = (format.byteOrder() == QAudioFormat::LittleEndian)
@@ -123,7 +123,7 @@ QString formatToString(const QAudioFormat &format)
 
 bool isPCM(const QAudioFormat &format)
 {
-    return (format.codec() == "audio/pcm");
+    return (format.codec() == "audio/x-raw");
 }
 
 
diff --git a/examples/multimedia/spectrum/app/wavfile.cpp b/examples/multimedia/spectrum/app/wavfile.cpp
index 475200db5..42c30276c 100644
--- a/examples/multimedia/spectrum/app/wavfile.cpp
+++ b/examples/multimedia/spectrum/app/wavfile.cpp
@@ -145,7 +145,7 @@ bool WavFile::readHeader()
 
             int bps = qFromLittleEndian<quint16>(header.wave.bitsPerSample);
             m_fileFormat.setChannelCount(qFromLittleEndian<quint16>(header.wave.numChannels));
-            m_fileFormat.setCodec("audio/pcm");
+            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);
diff --git a/examples/multimediawidgets/player/histogramwidget.cpp b/examples/multimediawidgets/player/histogramwidget.cpp
index ee9f48fb5..182b86e9f 100644
--- a/examples/multimediawidgets/player/histogramwidget.cpp
+++ b/examples/multimediawidgets/player/histogramwidget.cpp
@@ -131,7 +131,7 @@ qreal getPeakValue(const QAudioFormat& format)
     if (!format.isValid())
         return qreal(0);
 
-    if (format.codec() != "audio/pcm")
+    if (format.codec() != "audio/x-raw")
         return qreal(0);
 
     switch (format.sampleType()) {
@@ -173,7 +173,7 @@ QList<qreal> getBufferLevels(const QAudioBuffer &buffer)
     if (!buffer.format().isValid() || buffer.format().byteOrder() != QAudioFormat::LittleEndian)
         return values;
 
-    if (buffer.format().codec() != "audio/pcm")
+    if (buffer.format().codec() != "audio/x-raw")
         return values;
 
     int channelCount = buffer.format().channelCount();