Revision 39:822cf7b8e070

View differences:

CepstralPitchTracker.cpp
59 59
string
60 60
CepstralPitchTracker::getIdentifier() const
61 61
{
62
    return "cepstrum-pitch";
62
    return "cepstral-pitchtracker";
63 63
}
64 64

  
65 65
string
66 66
CepstralPitchTracker::getName() const
67 67
{
68
    return "Cepstrum Pitch Tracker";
68
    return "Cepstral Pitch Tracker";
69 69
}
70 70

  
71 71
string
......
415 415
    if (nextPeakVal != 0.0) {
416 416
        confidence = (maxval - nextPeakVal) * 10.0;
417 417
        if (magmean < threshold) confidence = 0.0;
418
        std::cerr << "magmean = " << magmean << ", confidence = " << confidence << std::endl;
418
//        std::cerr << "magmean = " << magmean << ", confidence = " << confidence << std::endl;
419 419
    }
420 420

  
421 421
    NoteHypothesis::Estimate e;
Makefile.inc
6 6

  
7 7
CFLAGS		:= $(CFLAGS) 
8 8
CXXFLAGS	:= $(CXXFLAGS) 
9
LDFLAGS		:= $(LDFLAGS)
9
LDFLAGS		:= $(LDFLAGS) -lvamp-sdk
10 10

  
11 11
HEADERS := CepstralPitchTracker.h \
12
	   NoteHypothesis.h
12
	   NoteHypothesis.h \
13
	   PeakInterpolator.h
13 14

  
14 15
SOURCES := CepstralPitchTracker.cpp \
15 16
	   NoteHypothesis.cpp \
17
	   PeakInterpolator.cpp \
16 18
           libmain.cpp
17 19

  
18 20
OBJECTS := $(SOURCES:.cpp=.o)
......
22 24

  
23 25
$(PLUGIN):	$(OBJECTS)
24 26
		$(CXX) -o $@ $^ $(LDFLAGS)
27
		$(MAKE) -C test
25 28

  
26 29
clean:		
27
		rm $(OBJECTS)
30
		rm -f $(OBJECTS)
31
		$(MAKE) -C test clean
28 32

  
29 33
distclean:	clean
30
		rm $(PLUGIN)
34
		rm -f $(PLUGIN)
35
		$(MAKE) -C test distclean
31 36

  
32 37
libmain.o:	$(HEADERS) $(SOURCES)
33
SimpleCepstrum.o:	$(HEADERS) $(SOURCES)
38
CepstralPitchTracker.o:	$(HEADERS) $(SOURCES)
39
NoteHypothesis.o:	$(HEADERS) $(SOURCES)
40
PeakInterpolator.o:	$(HEADERS) $(SOURCES)
PeakInterpolator.cpp
1
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
2
/*
3
    This file is Copyright (c) 2012 Chris Cannam
4
  
5
    Permission is hereby granted, free of charge, to any person
6
    obtaining a copy of this software and associated documentation
7
    files (the "Software"), to deal in the Software without
8
    restriction, including without limitation the rights to use, copy,
9
    modify, merge, publish, distribute, sublicense, and/or sell copies
10
    of the Software, and to permit persons to whom the Software is
11
    furnished to do so, subject to the following conditions:
12

  
13
    The above copyright notice and this permission notice shall be
14
    included in all copies or substantial portions of the Software.
15

  
16
    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19
    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
20
    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
21
    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
22
    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23
*/
24

  
25
#include "PeakInterpolator.h"
26

  
27
static double cubicInterpolate(const double y[4], double x)
28
{
29
    double a0 = y[3] - y[2] - y[0] + y[1];
30
    double a1 = y[0] - y[1] - a0;
31
    double a2 = y[2] - y[0];
32
    double a3 = y[1];
33
    return
34
        a0 * x * x * x +
35
        a1 * x * x +
36
        a2 * x +
37
        a3;
38
}
39

  
40
double
41
PeakInterpolator::findPeakLocation(const double *data, int size, int peakIndex)
42
{
43
    if (peakIndex < 2 || peakIndex > size - 3) {
44
        return peakIndex;
45
    }
46

  
47
    double maxval = 0.0;
48
    double location = peakIndex;
49

  
50
    const int divisions = 10;
51
    double y[4];
52

  
53
    y[0] = data[peakIndex-1];
54
    y[1] = data[peakIndex];
55
    y[2] = data[peakIndex+1];
56
    y[3] = data[peakIndex+2];
57
    for (int i = 0; i < divisions; ++i) {
58
        double probe = double(i) / double(divisions);
59
        double value = cubicInterpolate(y, probe);
60
        if (value > maxval) {
61
            maxval = value; 
62
            location = peakIndex + probe;
63
        }
64
    }
65

  
66
    y[3] = y[2];
67
    y[2] = y[1];
68
    y[1] = y[0];
69
    y[0] = data[peakIndex-2];
70
    for (int i = 0; i < divisions; ++i) {
71
        double probe = double(i) / double(divisions);
72
        double value = cubicInterpolate(y, probe);
73
        if (value > maxval) {
74
            maxval = value; 
75
            location = peakIndex - 1 + probe;
76
        }
77
    }
78

  
79
    return location;
80
}
81

  
PeakInterpolator.h
1
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
2
/*
3
    This file is Copyright (c) 2012 Chris Cannam
4
  
5
    Permission is hereby granted, free of charge, to any person
6
    obtaining a copy of this software and associated documentation
7
    files (the "Software"), to deal in the Software without
8
    restriction, including without limitation the rights to use, copy,
9
    modify, merge, publish, distribute, sublicense, and/or sell copies
10
    of the Software, and to permit persons to whom the Software is
11
    furnished to do so, subject to the following conditions:
12

  
13
    The above copyright notice and this permission notice shall be
14
    included in all copies or substantial portions of the Software.
15

  
16
    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19
    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
20
    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
21
    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
22
    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23
*/
24

  
25
#ifndef _PEAK_INTERPOLATOR_H_
26
#define _PEAK_INTERPOLATOR_H_
27

  
28
class PeakInterpolator
29
{
30
public:
31
    PeakInterpolator() { } 
32
    ~PeakInterpolator() { }
33

  
34
    /**
35
     * Return the interpolated location (i.e. between sample point
36
     * indices) of the peak whose sample is found at peakIndex in a
37
     * series of size samples.
38
     */
39
    double findPeakLocation(const double *data, int size, int peakIndex);
40
};
41

  
42
#endif
libmain.cpp
35 35
    if (version < 1) return 0;
36 36

  
37 37
    switch (index) {
38
    case  1: return cepitchPluginAdapter.getDescriptor();
38
    case  0: return cepitchPluginAdapter.getDescriptor();
39 39
    default: return 0;
40 40
    }
41 41
}
test/Makefile
5 5
CXXFLAGS	:= $(CXXFLAGS) -I..
6 6
LDFLAGS		:= $(LDFLAGS) -lvamp-sdk -lboost_unit_test_framework
7 7

  
8
SUPER_OBJECTS	:= ../NoteHypothesis.o
8
SUPER_OBJECTS	:= ../NoteHypothesis.o ../PeakInterpolator.o
9 9

  
10
tests:	TestNoteHypothesis.o
10
OBJECTS		:= TestNoteHypothesis.o TestPeakInterpolator.o
11

  
12
TESTS		:= test-notehypothesis test-peakinterpolator
13

  
14
all:	run-tests
15

  
16
test-notehypothesis:	TestNoteHypothesis.o
11 17
	$(CXX) -o $@ $^ $(SUPER_OBJECTS) $(LDFLAGS)
18

  
19
test-peakinterpolator:	TestPeakInterpolator.o
20
	$(CXX) -o $@ $^ $(SUPER_OBJECTS) $(LDFLAGS)
21

  
22
run-tests:	$(TESTS)
23
		for t in $(TESTS); do ./"$$t" || exit 1; done
24

  
25
clean:	
26
	rm -f $(OBJECTS)
27

  
28
distclean:	clean
29
	rm -f $(TESTS)
30

  
test/TestPeakInterpolator.cpp
1
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
2
/*
3
    This file is Copyright (c) 2012 Chris Cannam
4
  
5
    Permission is hereby granted, free of charge, to any person
6
    obtaining a copy of this software and associated documentation
7
    files (the "Software"), to deal in the Software without
8
    restriction, including without limitation the rights to use, copy,
9
    modify, merge, publish, distribute, sublicense, and/or sell copies
10
    of the Software, and to permit persons to whom the Software is
11
    furnished to do so, subject to the following conditions:
12

  
13
    The above copyright notice and this permission notice shall be
14
    included in all copies or substantial portions of the Software.
15

  
16
    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19
    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
20
    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
21
    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
22
    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23
*/
24

  
25
#include "PeakInterpolator.h"
26

  
27
#define BOOST_TEST_DYN_LINK
28
#define BOOST_TEST_MAIN
29

  
30
#include <boost/test/unit_test.hpp>
31

  
32
BOOST_AUTO_TEST_SUITE(TestPeakInterpolator)
33

  
34
BOOST_AUTO_TEST_CASE(peakAtSample_N3)
35
{
36
    double data[] = { 0.0, 1.0, 0.0 };
37
    PeakInterpolator p;
38
    double result = p.findPeakLocation(data, 3, 1);
39
    BOOST_CHECK_EQUAL(result, 1.0);
40
}
41

  
42
BOOST_AUTO_TEST_CASE(peakAtSample_N4)
43
{
44
    double data[] = { 0.0, 1.0, 2.0, 0.0 };
45
    PeakInterpolator p;
46
    double result = p.findPeakLocation(data, 4, 2);
47
    //!!! Actually, this isn't certain at all I think? It could quite
48
    //!!! reasonably be smaller than 2.0
49
    BOOST_CHECK_EQUAL(result, 2.0);
50
}
51

  
52
BOOST_AUTO_TEST_CASE(peakAtSample_N5)
53
{
54
    double data[] = { 0.0, 1.0, 2.0, 1.0, 0.0 };
55
    PeakInterpolator p;
56
    double result = p.findPeakLocation(data, 5, 2);
57
    BOOST_CHECK_EQUAL(result, 2.0);
58
}
59

  
60
BOOST_AUTO_TEST_CASE(flat)
61
{
62
    double data[] = { 1.0, 1.0, 1.0, 1.0, 1.0 };
63
    PeakInterpolator p;
64
    double result = p.findPeakLocation(data, 5, 2);
65
    BOOST_CHECK_EQUAL(result, 2.0);
66
}
67

  
68
BOOST_AUTO_TEST_CASE(multiPeak)
69
{
70
    double data[] = { 1.0, 2.0, 1.0, 2.0, 1.0 };
71
    PeakInterpolator p;
72
    double result = p.findPeakLocation(data, 5, 3);
73
    BOOST_CHECK_EQUAL(result, 3.0);
74
}
75

  
76
BOOST_AUTO_TEST_SUITE_END()
77

  

Also available in: Unified diff