Merge branch 'release/1.1.3'

Author: adamstark

AudioFile.h

@@ -109,7 +109,11 @@ class AudioFile
     //=============================================================
     /** Loads an audio file from data in memory */
     bool loadFromMemory (const std::vector<uint8_t>& fileData);
-    
+
+    //=============================================================
+    /** Saves an audio file to data in memory */
+    bool saveToMemory (std::vector<uint8_t>& fileData, AudioFileFormat format = AudioFileFormat::Wave);
+
     //=============================================================
     /** @Returns the sample rate */
     uint32_t getSampleRate() const;
@@ -190,10 +194,10 @@ class AudioFile
     //=============================================================
     bool decodeWaveFile (const std::vector<uint8_t>& fileData);
     bool decodeAiffFile (const std::vector<uint8_t>& fileData);
-    
+
     //=============================================================
-    bool saveToWaveFile (const std::string& filePath);
-    bool saveToAiffFile (const std::string& filePath);
+    bool encodeWaveFile (std::vector<uint8_t>& fileData);
+    bool encodeAiffFile (std::vector<uint8_t>& fileData);
 
     //=============================================================
     void clearAudioBuffer();
@@ -889,25 +893,31 @@ void AudioFile<T>::addSampleRateToAiffData (std::vector<uint8_t>& fileData, uint
 //=============================================================
 template <class T>
 bool AudioFile<T>::save (const std::string& filePath, AudioFileFormat format)
+{
+        std::vector<uint8_t> fileData;
+        return saveToMemory (fileData, format) && writeDataToFile (fileData, filePath);
+}
+
+//=============================================================
+template <class T>
+bool AudioFile<T>::saveToMemory (std::vector<uint8_t>& fileData, AudioFileFormat format)
 {
     if (format == AudioFileFormat::Wave)
     {
-        return saveToWaveFile (filePath);
+        return encodeWaveFile (fileData);
     }
     else if (format == AudioFileFormat::Aiff)
     {
-        return saveToAiffFile (filePath);
+        return encodeAiffFile (fileData);
     }
 
     return false;
 }
 
 //=============================================================
 template <class T>
-bool AudioFile<T>::saveToWaveFile (const std::string& filePath)
-{
-    std::vector<uint8_t> fileData;
-    
+bool AudioFile<T>::encodeWaveFile (std::vector<uint8_t>& fileData)
+{    
     int32_t dataChunkSize = getNumSamplesPerChannel() * (getNumChannels() * bitDepth / 8);
     int16_t audioFormat = bitDepth == 32 && std::is_floating_point_v<T> ? WavAudioFormat::IEEEFloat : WavAudioFormat::PCM;
     int32_t formatChunkSize = audioFormat == WavAudioFormat::PCM ? 16 : 18;
@@ -985,9 +995,22 @@ bool AudioFile<T>::saveToWaveFile (const std::string& filePath)
                 int32_t sampleAsInt;
 
                 if (audioFormat == WavAudioFormat::IEEEFloat)
-                    sampleAsInt = (int32_t) reinterpret_cast<int32_t&> (samples[channel][i]);
+                {
+                    if constexpr (std::is_same_v<T, float>)
+                    {
+                        sampleAsInt = (int32_t) reinterpret_cast<int32_t&> (samples[channel][i]);
+                    }
+                    else if constexpr (std::is_same_v<T, double>)
+                    {
+                        auto sampleAsFloat = (float) samples[channel][i];
+                        float& referenceToSample = sampleAsFloat;
+                        sampleAsInt = (int32_t) reinterpret_cast<int32_t&> (referenceToSample);
+                    }
+                }
                 else // assume PCM
+                {
                     sampleAsInt = AudioSampleConverter<T>::sampleToThirtyTwoBitInt (samples[channel][i]);
+                }
 
                 addInt32ToFileData (fileData, sampleAsInt, Endianness::LittleEndian);
             }
@@ -1011,20 +1034,17 @@ bool AudioFile<T>::saveToWaveFile (const std::string& filePath)
     // check that the various sizes we put in the metadata are correct
     if (fileSizeInBytes != static_cast<int32_t> (fileData.size() - 8) || dataChunkSize != (getNumSamplesPerChannel() * getNumChannels() * (bitDepth / 8)))
     {
-        reportError ("ERROR: couldn't save file to " + filePath);
+        reportError ("ERROR: Incorrect file or data chunk size.");
         return false;
     }
 
-    // try to write the file
-    return writeDataToFile (fileData, filePath);
+    return true;
 }
 
 //=============================================================
 template <class T>
-bool AudioFile<T>::saveToAiffFile (const std::string& filePath)
-{
-    std::vector<uint8_t> fileData;
-    
+bool AudioFile<T>::encodeAiffFile (std::vector<uint8_t>& fileData)
+{    
     int32_t numBytesPerSample = bitDepth / 8;
     int32_t numBytesPerFrame = numBytesPerSample * getNumChannels();
     int32_t totalNumAudioSampleBytes = getNumSamplesPerChannel() * numBytesPerFrame;
@@ -1116,12 +1136,11 @@ bool AudioFile<T>::saveToAiffFile (const std::string& filePath)
     // check that the various sizes we put in the metadata are correct
     if (fileSizeInBytes != static_cast<int32_t> (fileData.size() - 8) || soundDataChunkSize != getNumSamplesPerChannel() *  numBytesPerFrame + 8)
     {
-        reportError ("ERROR: couldn't save file to " + filePath);
+        reportError ("ERROR: Incorrect file or data chunk size.");
         return false;
     }
 
-    // try to write the file
-    return writeDataToFile (fileData, filePath);
+    return true;
 }
 
 //=============================================================

CMakeLists.txt

@@ -1,7 +1,7 @@
 #===============================================================================
 cmake_minimum_required (VERSION 3.12)
 
-project ("AudioFile" VERSION 1.1.2
+project ("AudioFile" VERSION 1.1.3
                      DESCRIPTION "A simple C++ library for reading and writing audio files."
                      HOMEPAGE_URL "https://github.com/adamstark/AudioFile")
 

README.md

@@ -2,7 +2,7 @@
 
 <!-- Version and License Badges -->
 
-![Version](https://img.shields.io/badge/version-1.1.2-green.svg?style=flat-square)
+![Version](https://img.shields.io/badge/version-1.1.3-green.svg?style=flat-square)
 ![License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)
 ![Language](https://img.shields.io/badge/language-C++-yellow.svg?style=flat-square)
 
@@ -53,7 +53,7 @@ AudioFile is written and maintained by Adam Stark.
 
     for (int i = 0; i < numSamples; i++)
     {
-    	double currentSample = audioFile.samples[channel][i];
+        double currentSample = audioFile.samples[channel][i];
     }
 
 ### Replace the AudioFile audio buffer with another
@@ -119,6 +119,17 @@ AudioFile is written and maintained by Adam Stark.
     // Aiff file
     audioFile.save ("path/to/desired/audioFile.aif", AudioFileFormat::Aiff);
 
+### Save the audio file to memory
+
+Write the audio file data directly to a vector of bytes (without writing to a file on disk):
+
+    std::vector<uint8_t> fileData;
+    audioFile.saveToMemory (fileData, AudioFileFormat::Wave);
+
+    or
+
+    audioFile.saveToMemory (fileData, AudioFileFormat::Aiff);
+
 ## Examples
 
 Please see the `examples` folder for some examples on library usage.
@@ -178,6 +189,11 @@ If you prefer not to see these messages, you can disable this error logging beha
 
 ## Versions
 
+##### 1.1.3 - 31st May 2025
+
+- Added saveToMemory() function to save audio data to bytes
+- Bug fixes and extra testing
+
 ##### 1.1.2 - 18th November 2024
 
 - Improved AIFF sample rate calculations
@@ -249,13 +265,15 @@ Many thanks to the following people for their contributions to this library:
 - [cgraf78](https://github.com/cgraf78)
 - [emiro85](https://github.com/emiro85)
 - [encoded](https://github.com/encoded)
+- [gitelope](https://github.com/gitelope)
 - [heartofrain](https://github.com/heartofrain)
 - [helloimmatt](https://github.com/helloimmatt/)
 - [leocstone](https://github.com/leocstone)
 - [MatthieuHernandez](https://github.com/MatthieuHernandez)
 - [Metalsofa](https://github.com/Metalsofa)
 - [mrpossoms](https://github.com/mrpossoms)
 - [mynameisjohn](https://github.com/mynameisjohn)
+- [nicmell](https://github.com/nicmell)
 - [Sidelobe](https://github.com/Sidelobe)
 - [sschaetz](https://github.com/sschaetz)
 - [Yhcrown](https://github.com/Yhcrown)

tests/FileWritingTests.cpp

@@ -85,10 +85,9 @@ void writeTestAudioFile (int numChannels, int sampleRate, int bitDepth, AudioFil
     REQUIRE (OK);
 
     //-----------------------------------------------------------------
-    // for some key bit depths and mono/stereo files, read in the audio file
-    // we just wrote and do a sample-by-sample comparison to confirm we are
-    // writing good files
-    if ((bitDepth == 8 || bitDepth == 16 || bitDepth == 24) &&  numChannels <= 2)
+    // read in the audio file we just wrote and do a sample-by-sample
+    // comparison to confirm we are writing good files
+    if (numChannels <= 2)
     {
         AudioFile<T> audioFileReader;
         audioFileReader.load (filePath);
@@ -136,13 +135,38 @@ TEST_SUITE ("Writing Tests")
                     for (auto& format : audioFormats)
                     {
                         auto fmt_str = format == AudioFileFormat::Wave ? "wav" : "aiff";
-                        std::cerr << sampleRate << "Hz " << bitDepth << "-bit " << channels << " " << fmt_str << " (floating point)" << std::endl;
+                        std::cerr << sampleRate << "Hz " << bitDepth << "-bit " << channels << " " << fmt_str << " (float)" << std::endl;
                         writeTestAudioFile<float> (channels, sampleRate, bitDepth, format);
                     }
                 }
             }
         }
     }
+    
+    //=============================================================
+    TEST_CASE ("WritingTest::WriteSineToneToManyFormats::DoublePrecision")
+    {
+        std::vector<int> sampleRates = {22050, 44100, 48000, 96000};
+        std::vector<int> bitDepths = {8, 16, 24, 32};
+        std::vector<int> numChannels = {1, 2, 8};
+        std::vector<AudioFileFormat> audioFormats = {AudioFileFormat::Wave, AudioFileFormat::Aiff};
+        
+        for (auto& sampleRate : sampleRates)
+        {
+            for (auto& bitDepth : bitDepths)
+            {
+                for (auto& channels : numChannels)
+                {
+                    for (auto& format : audioFormats)
+                    {
+                        auto fmt_str = format == AudioFileFormat::Wave ? "wav" : "aiff";
+                        std::cerr << sampleRate << "Hz " << bitDepth << "-bit " << channels << " " << fmt_str << " (double)" << std::endl;
+                        writeTestAudioFile<double> (channels, sampleRate, bitDepth, format);
+                    }
+                }
+            }
+        }
+    }
 
     //=============================================================
     TEST_CASE ("WritingTest::WriteSineToneToManyFormats::Integer")