[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/audiofileio decode/WPAudioReader.c...
From: |
Ben Levitt |
Subject: |
[Traverso-commit] traverso/src/audiofileio decode/WPAudioReader.c... |
Date: |
Fri, 24 Aug 2007 19:06:08 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Ben Levitt <benjie> 07/08/24 19:06:08
Modified files:
src/audiofileio/decode: WPAudioReader.cpp
src/audiofileio/encode: WPAudioWriter.cpp
Log message:
Further fix WPAudio[Reader|Writer] with comments from David
Fix my own bitwise operator mistakes from the last commit (oops!)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/WPAudioReader.cpp?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/encode/WPAudioWriter.cpp?cvsroot=traverso&r1=1.11&r2=1.12
Patches:
Index: decode/WPAudioReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/decode/WPAudioReader.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- decode/WPAudioReader.cpp 21 Aug 2007 01:54:59 -0000 1.6
+++ decode/WPAudioReader.cpp 24 Aug 2007 19:06:08 -0000 1.7
@@ -34,7 +34,7 @@
{
char error[80];
- m_wp = WavpackOpenFileInput(m_fileName.toUtf8().data(), error,
OPEN_2CH_MAX & OPEN_NORMALIZE, 1);
+ m_wp = WavpackOpenFileInput(m_fileName.toUtf8().data(), error,
OPEN_2CH_MAX | OPEN_NORMALIZE | OPEN_WVC, 0);
if (m_wp == 0) {
PERROR("Couldn't open soundfile (%s) %s",
filename.toUtf8().data(), error);
@@ -65,7 +65,7 @@
char error[80];
- WavpackContext *wp = WavpackOpenFileInput(filename.toUtf8().data(),
error, OPEN_2CH_MAX, 1);
+ WavpackContext *wp = WavpackOpenFileInput(filename.toUtf8().data(),
error, OPEN_2CH_MAX | OPEN_NORMALIZE | OPEN_WVC, 0);
if (wp == 0) {
return false;
@@ -147,7 +147,7 @@
default:
for (nframes_t f = 0; f < framesRead; f++) {
for (int c = 0; c < m_channels; c++) {
- buffer->destination[c][f] =
(float)((float)readbuffer[f + m_channels + c]/ divider);
+ buffer->destination[c][f] =
(float)((float)readbuffer[f * m_channels + c]/ divider);
}
}
}
Index: encode/WPAudioWriter.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/encode/WPAudioWriter.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- encode/WPAudioWriter.cpp 21 Aug 2007 01:55:00 -0000 1.11
+++ encode/WPAudioWriter.cpp 24 Aug 2007 19:06:08 -0000 1.12
@@ -73,7 +73,8 @@
}
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 &
CONFIG_HIGH_FLAG;
+ m_configFlags |= CONFIG_HIGH_FLAG;
+ m_configFlags |= CONFIG_VERY_HIGH_FLAG;
return true;
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src/audiofileio decode/WPAudioReader.c...,
Ben Levitt <=