[EGD-8081] Bump up dr_flac version

Bumped up version of dr_flac library to recent version. Unified decoder API and made sure it is working as expected.
bitigchi · Dec 10, 2021 · 055bc5e · 055bc5e
1 parent ed783b1
commit 055bc5e
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 6,131 deletions.
diff --git a/module-audio/Audio/decoder/Decoder.hpp b/module-audio/Audio/decoder/Decoder.hpp
@@ -71,7 +71,10 @@ namespace audio
         static std::unique_ptr<Decoder> Create(const char *file);
 
       protected:
-        virtual auto getBitWidth() -> unsigned int = 0;
+        virtual auto getBitWidth() -> unsigned int
+        {
+            return bitsPerSample;
+        }
         virtual std::unique_ptr<tags::fetcher::Tags> fetchTags();
 
         void convertmono2stereo(int16_t *pcm, uint32_t samplecount);
@@ -81,10 +84,11 @@ namespace audio
 
         uint32_t sampleRate = 0;
         uint32_t chanNumber = 0;
-        float position      = 0;
-        std::FILE *fd       = nullptr;
+        uint32_t bitsPerSample;
+        float position = 0;
+        std::FILE *fd  = nullptr;
         std::unique_ptr<char[]> streamBuffer;
-        uint32_t fileSize   = 0;
+        uint32_t fileSize = 0;
         std::string filePath;
 
         // Worker buffer used for converting mono stream to stereo

diff --git a/module-audio/Audio/decoder/decoderFLAC.cpp b/module-audio/Audio/decoder/decoderFLAC.cpp
@@ -10,8 +10,7 @@
 #define DR_FLAC_NO_OGG
 #define DR_FLAC_NO_CRC
 #define DR_FLAC_NO_SIMD
-
-#include "dr_flac.h"
+#include <src/dr_flac.h>
 
 namespace audio
 {
@@ -23,11 +22,15 @@ namespace audio
             return;
         }
 
-        flac = drflac_open(drflac_read, drflac_seek, this);
+        flac = drflac_open(drflac_read, drflac_seek, this, NULL);
         if (flac == NULL) {
             return;
         }
 
+        chanNumber = flac->channels;
+        sampleRate = flac->sampleRate;
+        // NOTE: Always convert to S16LE as internal format
+        bitsPerSample = 16;
         isInitialized = true;
     }
 
@@ -41,24 +44,25 @@ namespace audio
 
         uint32_t samples_read = 0;
 
-        samples_read = drflac_read_s16(flac, samplesToRead, (drflac_int16 *)pcmData);
-
+        samples_read = drflac_read_pcm_frames_s16(flac, samplesToRead / chanNumber, (drflac_int16 *)pcmData);
         if (samples_read) {
             /* Calculate frame duration in seconds */
-            position +=
-                (float)((float)(chanNumber == 2 ? samplesToRead / chanNumber : samplesToRead) / (float)sampleRate);
+            position += float(samples_read) / float(sampleRate);
         }
 
-        return samples_read;
+        return samples_read * chanNumber;
     }
 
     void decoderFLAC::setPosition(float pos)
     {
-
-        drflac_seek_to_sample(flac, totalSamplesCount * pos);
+        if (!isInitialized) {
+            LOG_ERROR("Wav decoder not initialized");
+            return;
+        }
+        drflac_seek_to_pcm_frame(flac, flac->totalPCMFrameCount * pos);
 
         // Calculate new position
-        position = (float)((float)(totalSamplesCount * pos) / chanNumber / (float)(sampleRate));
+        position = float(flac->totalPCMFrameCount) * pos / float(sampleRate);
     }
 
     /* Data encoded in UTF-8 */
@@ -82,11 +86,4 @@ namespace audio
         return !std::fseek(userdata->fd, offset, origin == drflac_seek_origin_start ? SEEK_SET : SEEK_CUR);
     }
 
-    auto decoderFLAC::getBitWidth() -> unsigned int
-    {
-        TagLib::FLAC::File flacFile(filePath.c_str());
-        auto properties = flacFile.audioProperties();
-        return properties->bitsPerSample();
-    }
-
 } // namespace audio
diff --git a/module-audio/Audio/decoder/decoderFLAC.hpp b/module-audio/Audio/decoder/decoderFLAC.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "Decoder.hpp"
-#include "dr_flac.h"
+#include <src/dr_flac.h>
 
 namespace audio
 {
@@ -22,8 +22,6 @@ namespace audio
         void setPosition(float pos) override;
 
       private:
-        auto getBitWidth() -> unsigned int override;
-
         drflac *flac = nullptr;
 
         uint32_t totalSamplesCount = 0;

diff --git a/module-audio/Audio/decoder/decoderMP3.cpp b/module-audio/Audio/decoder/decoderMP3.cpp
@@ -28,6 +28,8 @@ namespace audio
             return;
         }
 
+        // NOTE: Always convert to S16LE as internal format
+        bitsPerSample = 16;
         isInitialized = true;
     }
 
@@ -255,10 +257,4 @@ namespace audio
         return samplesToRead;
     }
 
-    auto decoderMP3::getBitWidth() -> unsigned int
-    {
-        static constexpr auto mp3bitWidth = 16U;
-        return mp3bitWidth;
-    }
-
 } // namespace audio
diff --git a/module-audio/Audio/decoder/decoderMP3.hpp b/module-audio/Audio/decoder/decoderMP3.hpp
@@ -26,8 +26,6 @@ namespace audio
         void setPosition(float pos) override;
 
       private:
-        auto getBitWidth() -> unsigned int override;
-
         bool find_first_valid_frame();
 
         uint32_t get_frames_count();

diff --git a/module-audio/Audio/decoder/decoderWAV.cpp b/module-audio/Audio/decoder/decoderWAV.cpp
@@ -66,11 +66,8 @@ namespace audio
         }
         auto dwav = &decoderContext->wav;
         drwav_seek_to_pcm_frame(dwav, dwav->totalPCMFrameCount * pos);
-    }
 
-    auto decoderWAV::getBitWidth() -> unsigned int
-    {
-        return bitsPerSample;
+        // Calculate new position
+        position = float(dwav->totalPCMFrameCount) * pos / float(sampleRate);
     }
-
 } // namespace audio
diff --git a/module-audio/Audio/decoder/decoderWAV.hpp b/module-audio/Audio/decoder/decoderWAV.hpp
@@ -14,7 +14,6 @@ namespace audio
     }
     class decoderWAV : public Decoder
     {
-
       public:
         explicit decoderWAV(const char *fileName);
         virtual ~decoderWAV();
@@ -24,12 +23,8 @@ namespace audio
         void setPosition(float pos) override;
 
       private:
-        auto getBitWidth() -> unsigned int override;
-
-
         std::vector<int32_t> pcmsamplesbuffer;
         std::unique_ptr<internal::wavContext> decoderContext;
-        uint32_t bitsPerSample;
     };
 
 } // namespace audio