Fast ogg scale

Marisa-Chan · Jan 22, 2013 · a92b913 · a92b913 · MarioLiebisch · Jan 23, 2013
1 parent 9fac5d7
commit a92b913
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 8 deletions.
diff --git a/src/SFML/Audio/SoundFile.cpp b/src/SFML/Audio/SoundFile.cpp
@@ -53,7 +53,9 @@ SoundFile::SoundFile() :
 m_file        (NULL),
 m_sampleCount (0),
 m_channelCount(0),
-m_sampleRate  (0)
+m_sampleRate  (0),
+m_oggmax      (1.0),
+m_floatformat (false)
 {
 
 }
@@ -218,13 +220,35 @@ bool SoundFile::openWrite(const std::string& filename, unsigned int channelCount
 ////////////////////////////////////////////////////////////
 std::size_t SoundFile::read(Int16* data, std::size_t sampleCount)
 {
-    if (m_file && data && sampleCount)
-        return static_cast<std::size_t>(sf_read_short(m_file, data, sampleCount));
+    if (m_file && data && sampleCount)
+    {
+        if (m_floatformat)
+        {
+            Int16* d = data;
+
+            for(std::size_t i=0; i<sampleCount; i+=m_channelCount)
+            {
+                float raw[16];
+                if (sf_read_float(m_file, raw, m_channelCount) != m_channelCount)
+                    return i;
+
+                for (Int8 j=0; j< m_channelCount; j++)
+                {
+                    if (raw[j] > m_oggmax)
+                        m_oggmax = raw[j];
+
+                    *d  = (float)(raw[j] / m_oggmax) * 32767.0f;
+                    d++;
+                }
+            }
+        }
+        else
+            return static_cast<std::size_t>(sf_read_short(m_file, data, sampleCount));
+    }
     else
         return 0;
 }
-
-
+
 ////////////////////////////////////////////////////////////
 void SoundFile::write(const Int16* data, std::size_t sampleCount)
 {
@@ -264,8 +288,8 @@ void SoundFile::initialize(SF_INFO fileInfo)
 
     // Enable scaling for Vorbis files (float samples)
     // @todo enable when it's faster (it currently has to iterate over the *whole* music)
-    //if (fileInfo.format & SF_FORMAT_VORBIS)
-    //    sf_command(m_file, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE);
+    if (fileInfo.format & SF_FORMAT_VORBIS)
+        m_floatformat = true;
 }
 
 

diff --git a/src/SFML/Audio/SoundFile.hpp b/src/SFML/Audio/SoundFile.hpp
@@ -213,7 +213,9 @@ private :
     Memory       m_memory;       ///< Memory reading info
     std::size_t  m_sampleCount;  ///< Total number of samples in the file
     unsigned int m_channelCount; ///< Number of channels used by the sound
-    unsigned int m_sampleRate;   ///< Number of samples per second
+    unsigned int m_sampleRate;   ///< Number of samples per second
+    bool         m_floatformat;  ///< Float point sound format
+    float        m_oggmax;       ///< Dynamic ogg max level
 };
 
 } // namespace priv