[Traverso-commit] traverso/src core/Peak.cpp audiofileio/decode/A...

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/08/21 01:55:00

Modified files:
        src/core       : Peak.cpp 
        src/audiofileio/decode: AbstractAudioReader.h WPAudioReader.cpp 
        src/audiofileio/encode: WPAudioWriter.cpp 

Log message:
        Fix 2 minor issues with wavpack encoding/decoding.  Thanks to David 
Bryant, author of wavpack, for the pointers.
        Fix DecodeBuffer's constructor to take channelCount

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Peak.cpp?cvsroot=traverso&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/AbstractAudioReader.h?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/WPAudioReader.cpp?cvsroot=traverso&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/encode/WPAudioWriter.cpp?cvsroot=traverso&r1=1.10&r2=1.11

Patches:
Index: core/Peak.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Peak.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- core/Peak.cpp       16 Aug 2007 06:43:50 -0000      1.42
+++ core/Peak.cpp       21 Aug 2007 01:54:59 -0000      1.43
@@ -312,8 +312,7 @@
                }
                audio_sample_t readbuffer[toRead*2];
                
-               DecodeBuffer decodebuffer(audiobuf, readbuffer, toRead, 
toRead*2);
-               decodebuffer.destinationChannelCount = 2;
+               DecodeBuffer decodebuffer(audiobuf, readbuffer, toRead, 
toRead*2, 2);
                
                nframes_t readFrames = m_source->file_read(&decodebuffer, 
startPos, toRead);
 
@@ -619,7 +618,7 @@
        }
        audio_sample_t* readbuffer = new audio_sample_t[bufferSize * 2];
        
-       DecodeBuffer decodebuffer(buffer, readbuffer, bufferSize, bufferSize*2);
+       DecodeBuffer decodebuffer(buffer, readbuffer, bufferSize, bufferSize*2, 
m_source->get_channel_count());
        
        do {
                if (interuptPeakBuild) {
@@ -689,7 +688,7 @@
                }
                audio_sample_t readbuffer[toRead * 2];
        
-               DecodeBuffer decodebuffer(buffer, readbuffer, toRead, toRead*2);
+               DecodeBuffer decodebuffer(buffer, readbuffer, toRead, toRead*2, 
m_source->get_channel_count());
                
                int read = m_source->file_read(&decodebuffer, startframe, 
toRead);
                
@@ -711,7 +710,7 @@
        for (uint chan=0; chan<m_source->get_channel_count(); ++chan) {
                buffer[chan] = new audio_sample_t[toRead];
        }
-       DecodeBuffer decodebuffer(buffer, readbuffer, toRead, toRead*2);
+       DecodeBuffer decodebuffer(buffer, readbuffer, toRead, toRead*2, 
m_source->get_channel_count());
        
        int read = m_source->file_read(&decodebuffer, endframe - toRead, 
toRead);
        

Index: audiofileio/decode/AbstractAudioReader.h
===================================================================
RCS file: 
/sources/traverso/traverso/src/audiofileio/decode/AbstractAudioReader.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- audiofileio/decode/AbstractAudioReader.h    17 Aug 2007 00:13:26 -0000      
1.6
+++ audiofileio/decode/AbstractAudioReader.h    21 Aug 2007 01:54:59 -0000      
1.7
@@ -34,11 +34,12 @@
                destinationChannelCount = destinationBufferSize = 
resampleBufferSize = readBufferSize = 0;
        }
        
-       DecodeBuffer(audio_sample_t** dest, audio_sample_t* readbuf, uint 
destbufsize, uint readbufsize) {
+       DecodeBuffer(audio_sample_t** dest, audio_sample_t* readbuf, uint 
destbufsize, uint readbufsize, uint channels) {
                destination = dest;
                readBuffer = readbuf;
                destinationBufferSize = destbufsize;
                readBufferSize = readbufsize;
+               destinationChannelCount = channels;
        }
        
        void check_readbuffer_capacity(uint size) {

Index: audiofileio/decode/WPAudioReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/decode/WPAudioReader.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- audiofileio/decode/WPAudioReader.cpp        16 Aug 2007 14:26:50 -0000      
1.5
+++ audiofileio/decode/WPAudioReader.cpp        21 Aug 2007 01:54:59 -0000      
1.6
@@ -34,7 +34,7 @@
 {
        char error[80];
        
-       m_wp = WavpackOpenFileInput(m_fileName.toUtf8().data(), error, 
OPEN_2CH_MAX, 1);
+       m_wp = WavpackOpenFileInput(m_fileName.toUtf8().data(), error, 
OPEN_2CH_MAX & OPEN_NORMALIZE, 1);
        
        if (m_wp == 0) {
                PERROR("Couldn't open soundfile (%s) %s", 
filename.toUtf8().data(), error);

Index: audiofileio/encode/WPAudioWriter.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/encode/WPAudioWriter.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- audiofileio/encode/WPAudioWriter.cpp        15 Aug 2007 20:07:41 -0000      
1.10
+++ audiofileio/encode/WPAudioWriter.cpp        21 Aug 2007 01:55:00 -0000      
1.11
@@ -73,7 +73,7 @@
                }
                else if (value == "very_high") {
                        // CONFIG_VERY_HIGH_FLAG ~ 2 times slower then FAST, ~ 
25 % extra compression then FAST
-                       m_configFlags |= CONFIG_VERY_HIGH_FLAG;
+                       m_configFlags |= CONFIG_VERY_HIGH_FLAG & 
CONFIG_HIGH_FLAG;
                        return true;
                }
        }