Mercurial > hg > vamp-test-plugin

changeset 8:8c3a61d37984

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use fractional sample rates for FixedSampleRate outputs (a better test); fix failure to deliver enough columns in grid-fsr
author Chris Cannam
date Thu, 28 Mar 2013 13:52:30 +0000
parents 1bff4a80852c
children 33a799b77949
files VampTestPlugin.cpp
diffstat 1 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/VampTestPlugin.cpp	Wed Mar 27 11:07:09 2013 +0000
+++ b/VampTestPlugin.cpp	Thu Mar 28 13:52:30 2013 +0000
@@ -169,7 +169,7 @@
     d.hasKnownExtents = false;
     d.isQuantized = false;
     d.sampleType = OutputDescriptor::FixedSampleRate;
-    d.sampleRate = 2;
+    d.sampleRate = 2.5;
     d.hasDuration = false;
     m_outputNumbers[d.identifier] = n++;
     list.push_back(d);
@@ -183,7 +183,7 @@
     d.hasKnownExtents = false;
     d.isQuantized = false;
     d.sampleType = OutputDescriptor::FixedSampleRate;
-    d.sampleRate = 2;
+    d.sampleRate = 2.5;
     d.hasDuration = false;
     m_outputNumbers[d.identifier] = n++;
     list.push_back(d);
@@ -225,7 +225,7 @@
     d.hasKnownExtents = false;
     d.isQuantized = false;
     d.sampleType = OutputDescriptor::FixedSampleRate;
-    d.sampleRate = 2;
+    d.sampleRate = 2.5;
     d.hasDuration = false;
     m_outputNumbers[d.identifier] = n++;
     list.push_back(d);
@@ -400,7 +400,7 @@
 
 	if (m_n < 5) {
 	    fs[m_outputNumbers["curve-fsr"]]
-		.push_back(untimedCurveValue(RealTime::fromSeconds(m_n / 2.0), m_n, 10));
+		.push_back(untimedCurveValue(RealTime::fromSeconds(m_n / 2.5), m_n, 10));
 
 	    float s = (m_n / 4) * 2;
 	    if ((m_n % 4) > 0) {
@@ -408,7 +408,7 @@
 	    }
 	    fs[m_outputNumbers["curve-fsr-timed"]]
 		.push_back(snappedCurveValue(RealTime::fromSeconds(s),
-					     RealTime::fromSeconds(snap(s, 0.5)),
+					     RealTime::fromSeconds(snap(s, 0.4)),
 					     m_n, 10));
 	}
 
@@ -421,7 +421,7 @@
 
 	for (int i = (m_n > 5 ? 5 : m_n); i < 10; ++i) {
 	    fs[m_outputNumbers["curve-fsr"]]
-		.push_back(untimedCurveValue(RealTime::fromSeconds(i / 2.0), i, 10));
+		.push_back(untimedCurveValue(RealTime::fromSeconds(i / 2.5), i, 10));
 
 	    float s = (i / 4) * 2;
 	    if ((i % 4) > 0) {
@@ -429,11 +429,11 @@
 	    }
 	    fs[m_outputNumbers["curve-fsr-timed"]]
 		.push_back(snappedCurveValue(RealTime::fromSeconds(s),
-					     RealTime::fromSeconds(snap(s, 0.5)),
+					     RealTime::fromSeconds(snap(s, 0.4)),
 					     i, 10));
 	}
 
-	for (int i = (m_n > 5 ? 5 : m_n); i < 10; ++i) {
+	for (int i = 0; i < 10; ++i) {
 	    fs[m_outputNumbers["grid-fsr"]]
 		.push_back(gridColumn(RealTime::fromSeconds(i / 2.0), i, 10));
 	}