mirror
/
slowrx
kopia lustrzana https://github.com/windytan/slowrx
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

wave vs. double vector

dev
Oona Räisänen 2016-01-15 20:04:03 +02:00
rodzic de1304ecfe
commit 1bfcbbc8d3
2 zmienionych plików z 7 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
src/dsp.cc
Wyświetl plik

@ -129,7 +129,7 @@ double DSP::calcPeakFreq (double minf, double maxf, WindowType wintype) {
}
Wave DSP::calcBandPowerPerHz(const std::vector<std::vector<double>>& bands, WindowType wintype) {
std::vector<double> DSP::calcBandPowerPerHz(const std::vector<std::vector<double>>& bands, WindowType wintype) {
int fft_len = FFT_LEN;
@ -433,7 +433,7 @@ std::vector<double> peaks (const Wave& wave, int n) {
return fabs(b.second) < fabs(a.second);
});
Wave result;
std::vector<double> result;
for (int i=0;i<n && i<(int)peaks.size(); i++)
result.push_back(peaks[i].first);
@ -498,9 +498,9 @@ std::tuple<bool,double,double> findMelody (const Wave& wave, const Melody& melod
/* refine start_at */
Wave subwave(wave.begin()+start_at, wave.end());
Wave edges_rx = derivPeaks(subwave, melody.size()-1);
Wave edges_ref;
double t = 0.0;
std::vector<double> edges_rx = derivPeaks(subwave, melody.size()-1);
std::vector<double> edges_ref;
t = 0.0;
for (int i=0; i<(int)melody.size()-1; i++) {
t += melody[i].dur;
edges_ref.push_back(t);

4
src/dsp.h
Wyświetl plik

@ -75,8 +75,8 @@ class DSP {
Wave convolve (const Wave&, const Kernel&, int border_treatment=BORDER_ZERO);
double convolveSingle (const Wave&, const Kernel&, double, int border_treatment=BORDER_ZERO);
Wave deriv (const Wave&);
Wave peaks (const Wave&, int);
Wave derivPeaks (const Wave&, int);
std::vector<double> peaks (const Wave&, int);
std::vector<double> derivPeaks (const Wave&, int);
Wave rms (const Wave&, int);
Wave upsample (const Wave& orig, double factor, int kern_type, int border_treatment=BORDER_ZERO);
double gaussianPeak (const Wave& signal, int idx_peak, bool wrap_around=false);