[Traverso-commit] traverso/src/audiofileio/decode WPAudioReader.c...

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/08/24 20:40:34

Modified files:
        src/audiofileio/decode: WPAudioReader.cpp WPAudioReader.h 

Log message:
        Make the last of David's suggested fixes to WPAudioReader.
        (Don't assume that a sample's bits are right-aligned in the used 
        bytes, since they're actually left-aligned.  :)  )

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/WPAudioReader.cpp?cvsroot=traverso&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/WPAudioReader.h?cvsroot=traverso&r1=1.4&r2=1.5

Patches:
Index: WPAudioReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/decode/WPAudioReader.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- WPAudioReader.cpp   24 Aug 2007 19:06:08 -0000      1.7
+++ WPAudioReader.cpp   24 Aug 2007 20:40:34 -0000      1.8
@@ -43,6 +43,7 @@
        
        m_isFloat = ((WavpackGetMode(m_wp) & MODE_FLOAT) != 0);
        m_bitsPerSample = WavpackGetBitsPerSample(m_wp);
+       m_bytesPerSample = WavpackGetBytesPerSample(m_wp);
        m_channels = WavpackGetReducedChannels(m_wp);
        m_length = WavpackGetNumSamples(m_wp);
        m_rate = WavpackGetSampleRate(m_wp);
@@ -107,7 +108,7 @@
        
        nframes_t framesRead = WavpackUnpackSamples(m_wp, readbuffer, 
frameCount);
        
-       const uint divider = ((uint)1<<(m_bitsPerSample-1));
+       const uint divider = ((uint)1<<(m_bytesPerSample * 8 - 1));
        
        // De-interlace
        if (m_isFloat) {

Index: WPAudioReader.h
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/decode/WPAudioReader.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- WPAudioReader.h     16 Aug 2007 14:26:50 -0000      1.4
+++ WPAudioReader.h     24 Aug 2007 20:40:34 -0000      1.5
@@ -43,6 +43,7 @@
        WavpackContext* m_wp;
        bool            m_isFloat;
        int             m_bitsPerSample;
+       int             m_bytesPerSample;
 };
 
 #endif