Revision 187:9c8ca37028b9
| .hgtags | ||
|---|---|---|
| 1 | 1 |
361b4f8b7b2dbce9aebec3ff577f5c68f6fbb3ae v1.0 |
| 2 | 2 |
361b4f8b7b2dbce9aebec3ff577f5c68f6fbb3ae v1.0 |
| 3 | 3 |
5a4ece568299eba6ca7e54b283de5e98b6a3526b v1.0 |
| 4 |
50a61e18af29ab383f210c1f2099b4dc49f1495f v1.1 |
|
| Makefile.osx | ||
|---|---|---|
| 1 | 1 |
|
| 2 |
ARCHFLAGS ?= -mmacosx-version-min=10.6 -arch x86_64 -arch i386
|
|
| 2 |
ARCHFLAGS ?= -mmacosx-version-min=10.7 -arch x86_64 -arch i386 -stdlib=libc++
|
|
| 3 | 3 |
|
| 4 | 4 |
CFLAGS := $(ARCHFLAGS) -Wall -O3 -ftree-vectorize |
| 5 |
CXXFLAGS := $(CFLAGS) |
|
| 5 |
CXXFLAGS := $(CFLAGS)
|
|
| 6 | 6 |
|
| 7 | 7 |
LDFLAGS := $(ARCHFLAGS) |
| 8 | 8 |
PLUGIN_LDFLAGS := -dynamiclib -exported_symbols_list vamp/vamp-plugin.list |
| README | ||
|---|---|---|
| 40 | 40 |
using multiple kernel atoms per time block. The inverse transform is |
| 41 | 41 |
approximate rather than exact (see the paper for details). |
| 42 | 42 |
|
| 43 |
The C++ implementation is by Chris Cannam, Copyright 2014 Queen Mary,
|
|
| 44 |
University of London. |
|
| 43 |
The C++ implementation is by Chris Cannam, Copyright 2014-2015 Queen
|
|
| 44 |
Mary, University of London.
|
|
| 45 | 45 |
|
| 46 | 46 |
The library is provided under a liberal BSD/MIT-style open source |
| 47 | 47 |
licence. See the file COPYING for more information. |
| src/Chromagram.cpp | ||
|---|---|---|
| 52 | 52 |
// floor(bins per semitone / 2) |
| 53 | 53 |
int bps = m_params.binsPerOctave / 12; |
| 54 | 54 |
m_maxFrequency = midiPitchLimitFreq / |
| 55 |
pow(2, (1.0 + floor(bps/2)) / m_params.binsPerOctave); |
|
| 55 |
pow(2.0, (1.0 + floor(bps/2)) / m_params.binsPerOctave);
|
|
| 56 | 56 |
|
| 57 | 57 |
// Min frequency is frequency of midiPitchLimit lowered by the |
| 58 | 58 |
// appropriate number of octaveCount. |
| 59 | 59 |
m_minFrequency = midiPitchLimitFreq / |
| 60 |
pow(2, m_params.octaveCount + 1); |
|
| 60 |
pow(2.0, m_params.octaveCount + 1);
|
|
| 61 | 61 |
|
| 62 | 62 |
CQParameters p |
| 63 | 63 |
(params.sampleRate, m_minFrequency, m_maxFrequency, params.binsPerOctave); |
| src/dsp/KaiserWindow.h | ||
|---|---|---|
| 35 | 35 |
#include <vector> |
| 36 | 36 |
#include <cmath> |
| 37 | 37 |
|
| 38 |
#include "pi.h" |
|
| 39 |
|
|
| 38 | 40 |
/** |
| 39 | 41 |
* Kaiser window: A windower whose bandwidth and sidelobe height |
| 40 | 42 |
* (signal-noise ratio) can be specified. These parameters are traded |
| src/dsp/MathUtilities.h | ||
|---|---|---|
| 35 | 35 |
#include <vector> |
| 36 | 36 |
|
| 37 | 37 |
#include "nan-inf.h" |
| 38 |
#include "pi.h" |
|
| 38 | 39 |
|
| 39 | 40 |
/** |
| 40 | 41 |
* Static helper functions for simple mathematical calculations. |
| src/dsp/Resampler.cpp | ||
|---|---|---|
| 39 | 39 |
#include <vector> |
| 40 | 40 |
#include <map> |
| 41 | 41 |
#include <cassert> |
| 42 |
#include <algorithm> |
|
| 42 | 43 |
|
| 43 | 44 |
using std::vector; |
| 44 | 45 |
using std::map; |
| src/dsp/SincWindow.h | ||
|---|---|---|
| 34 | 34 |
|
| 35 | 35 |
#include <vector> |
| 36 | 36 |
|
| 37 |
#include "pi.h" |
|
| 38 |
|
|
| 37 | 39 |
/** |
| 38 | 40 |
* A window containing values of the sinc function, i.e. sin(x)/x with |
| 39 | 41 |
* sinc(0) == 1, with x == 0 at the centre. |
| src/dsp/Window.h | ||
|---|---|---|
| 29 | 29 |
authorization. |
| 30 | 30 |
*/ |
| 31 | 31 |
|
| 32 |
#ifndef _WINDOW_H_
|
|
| 33 |
#define _WINDOW_H_
|
|
| 32 |
#ifndef WINDOW_H
|
|
| 33 |
#define WINDOW_H
|
|
| 34 | 34 |
|
| 35 | 35 |
#include <cmath> |
| 36 | 36 |
#include <iostream> |
| 37 | 37 |
#include <map> |
| 38 | 38 |
#include <vector> |
| 39 | 39 |
|
| 40 |
#include "pi.h" |
|
| 41 |
|
|
| 40 | 42 |
enum WindowType {
|
| 41 | 43 |
RectangularWindow, |
| 42 | 44 |
BartlettWindow, |
| src/dsp/pi.h | ||
|---|---|---|
| 1 |
|
|
| 2 |
#ifndef PI_H |
|
| 3 |
#define PI_H |
|
| 4 |
|
|
| 5 |
#include <cmath> |
|
| 6 |
|
|
| 7 |
#ifndef M_PI |
|
| 8 |
#define M_PI 3.14159265358979323846 |
|
| 9 |
#endif |
|
| 10 |
|
|
| 11 |
#endif |
|
| vamp/CQChromaVamp.cpp | ||
|---|---|---|
| 89 | 89 |
int |
| 90 | 90 |
CQChromaVamp::getPluginVersion() const |
| 91 | 91 |
{
|
| 92 |
return 1;
|
|
| 92 |
return 2;
|
|
| 93 | 93 |
} |
| 94 | 94 |
|
| 95 | 95 |
string |
| 96 | 96 |
CQChromaVamp::getCopyright() const |
| 97 | 97 |
{
|
| 98 |
return "Plugin by Chris Cannam. Method by Christian Schörkhuber and Anssi Klapuri. Copyright (c) 2014 QMUL. BSD/MIT licence.";
|
|
| 98 |
return "Plugin by Chris Cannam. Method by Christian Schörkhuber and Anssi Klapuri. Copyright (c) 2015 QMUL. BSD/MIT licence.";
|
|
| 99 | 99 |
} |
| 100 | 100 |
|
| 101 | 101 |
CQChromaVamp::ParameterList |
| vamp/CQVamp.cpp | ||
|---|---|---|
| 114 | 114 |
int |
| 115 | 115 |
CQVamp::getPluginVersion() const |
| 116 | 116 |
{
|
| 117 |
return 1;
|
|
| 117 |
return 2;
|
|
| 118 | 118 |
} |
| 119 | 119 |
|
| 120 | 120 |
string |
| 121 | 121 |
CQVamp::getCopyright() const |
| 122 | 122 |
{
|
| 123 |
return "Plugin by Chris Cannam. Method by Christian Schörkhuber and Anssi Klapuri. Copyright (c) 2014 QMUL. BSD/MIT licence.";
|
|
| 123 |
return "Plugin by Chris Cannam. Method by Christian Schörkhuber and Anssi Klapuri. Copyright (c) 2015 QMUL. BSD/MIT licence.";
|
|
| 124 | 124 |
} |
| 125 | 125 |
|
| 126 | 126 |
CQVamp::ParameterList |
Also available in: Unified diff