Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I3204cdf695f4b47730a88a7c41fc7a6de967b161

1 files changed, 4 insertions, 3 deletions

diff --git a/src/plugins/audiocapture/audiocapturesession.cpp b/src/plugins/audiocapture/audiocapturesession.cpp
index 19347dca9..e4a9688e8 100644
--- a/src/plugins/audiocapture/audiocapturesession.cpp
+++ b/src/plugins/audiocapture/audiocapturesession.cpp
@@ -349,11 +349,12 @@ void AudioCaptureSession::stop()
         file.stopProbes();
         file.close();
         if (m_wavFile) {
-            qint32 fileSize = file.size()-8;
+            qint32 fileSize = file.size();
             file.open(QIODevice::ReadWrite | QIODevice::Unbuffered);
             file.read((char*)&header,sizeof(CombinedHeader));
-            header.riff.descriptor.size = fileSize; // filesize-8
-            header.data.descriptor.size = fileSize-44; // samples*channels*sampleSize/8
+            header.riff.descriptor.size = fileSize - 8; // The RIFF chunk size is the file size minus
+                                                        // the first two RIFF fields (8 bytes)
+            header.data.descriptor.size = fileSize - 44; // dataSize = fileSize - headerSize (44 bytes)
             file.seek(0);
             file.write((char*)&header,sizeof(CombinedHeader));
             file.close();