traverso-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Traverso-commit] traverso CMakeLists.txt src/core/Peak.cpp src/c...


From: Remon Sijrier
Subject: [Traverso-commit] traverso CMakeLists.txt src/core/Peak.cpp src/c...
Date: Fri, 09 Nov 2007 14:08:48 +0000

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/11/09 14:08:48

Modified files:
        .              : CMakeLists.txt 
        src/core       : Peak.cpp Peak.h 
        src/traverso/songcanvas: AudioClipView.cpp 

Log message:
        * do not use the full range of the peak_data_t format to map normalized 
audio data, but only half of the range to have headroom for 'over' samples 
(which abs. value > 1.0 )
        * do not paint the waveform mirrored.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/CMakeLists.txt?cvsroot=traverso&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Peak.cpp?cvsroot=traverso&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Peak.h?cvsroot=traverso&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.114&r2=1.115

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/CMakeLists.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- CMakeLists.txt      8 Nov 2007 11:32:50 -0000       1.11
+++ CMakeLists.txt      9 Nov 2007 14:08:47 -0000       1.12
@@ -459,7 +459,7 @@
                LINK_LIBRARIES(
                ${QT_QTMAIN_LIBRARY}
                )
-               ADD_DEFINITIONS(-DQT_DLL)
+               ADD_DEFINITIONS(-DQT_DLL -DWIN_BUILD -DPORTAUDIO_SUPPORT)
        ENDIF(WIN32)
 
 

Index: src/core/Peak.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Peak.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- src/core/Peak.cpp   5 Nov 2007 15:49:30 -0000       1.75
+++ src/core/Peak.cpp   9 Nov 2007 14:08:48 -0000       1.76
@@ -42,7 +42,7 @@
 
 #define NORMALIZE_CHUNK_SIZE   10000
 #define PEAKFILE_MAJOR_VERSION 1
-#define PEAKFILE_MINOR_VERSION 2
+#define PEAKFILE_MINOR_VERSION 3
 
 int Peak::zoomStep[] = {
        // non-cached zoomlevels.
@@ -562,7 +562,7 @@
                        peak_data_t peakbuffer[2];
 
                        peakbuffer[0] = (peak_data_t) (pd->peakUpperValue * 
MAX_DB_VALUE );
-                       peakbuffer[1] = (peak_data_t) ((-1) * 
(pd->peakLowerValue * MAX_DB_VALUE ));
+                       peakbuffer[1] = (peak_data_t) (-1 * (pd->peakLowerValue 
* MAX_DB_VALUE ));
                        
                        int written = data->file.write((char*)peakbuffer, 
sizeof(peak_data_t) * 2) / sizeof(peak_data_t);
                        
@@ -570,8 +570,8 @@
                                PWARN("couldnt write peak data, only (%d)", 
written);
                        }
 
-                       pd->peakUpperValue = -1.0;
-                       pd->peakLowerValue = 1.0;
+                       pd->peakUpperValue = -10.0;
+                       pd->peakLowerValue = 10.0;
                        
                        pd->processBufferSize+=2;
                        pd->nextDataPointLocation += pd->processRange;

Index: src/core/Peak.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Peak.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- src/core/Peak.h     23 Oct 2007 17:38:29 -0000      1.26
+++ src/core/Peak.h     9 Nov 2007 14:08:48 -0000       1.27
@@ -98,7 +98,9 @@
        static const int ZOOM_LEVELS = 20;
        static const int SAVING_ZOOM_FACTOR = 6;
        static const int MAX_ZOOM_USING_SOURCEFILE = SAVING_ZOOM_FACTOR - 1;
-       static const int MAX_DB_VALUE = 32767;
+       // Use ~ 1/2 the range of peak_data_t (== short) so we have headroom
+       // for samples that lay beyond the range [-1, 1]
+       static const int MAX_DB_VALUE = 16000;
        static int zoomStep[ZOOM_LEVELS + 1];
 
        Peak(AudioSource* source);

Index: src/traverso/songcanvas/AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- src/traverso/songcanvas/AudioClipView.cpp   5 Nov 2007 15:49:31 -0000       
1.114
+++ src/traverso/songcanvas/AudioClipView.cpp   9 Nov 2007 14:08:48 -0000       
1.115
@@ -485,8 +485,8 @@
                                m_polygonbottom.reserve(pixelcount + 3);
                                
                                for (int x = 0; x < pixelcount; x+=2) {
-                                       m_polygontop.append( QPointF(x, 
scaleFactor * pixeldata[chan][bufferpos++]) );
-                                       m_polygonbottom.append( QPointF(x, 
-scaleFactor * pixeldata[chan][bufferpos++]) );
+                                       m_polygontop.append( QPointF(x, 
-scaleFactor * pixeldata[chan][bufferpos++]) );
+                                       m_polygonbottom.append( QPointF(x, 
scaleFactor * pixeldata[chan][bufferpos++]) );
                                }
                                
                                pathtop.addPolygon(m_polygontop);




reply via email to

[Prev in Thread] Current Thread [Next in Thread]