From b79a14e33ade7285d7309ef544d89c60f3d5b3ec Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 14 May 2014 16:52:21 +0200 Subject: Make lower limit to 'width' (ie. stddev) of normal distribution function. --- src/powerlist.cc | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/powerlist.cc b/src/powerlist.cc index 1888733..96f2c9b 100644 --- a/src/powerlist.cc +++ b/src/powerlist.cc @@ -32,6 +32,14 @@ #include +/** + * Minimum sample set size. + * Smaller means wider 'velocity groups'. + * Limited by sample set size, ie. only kicks in if sample set size is smaller + * than this number. + */ +#define MIN_SAMPLE_SET_SIZE 10 + // Enable to calculate power on old samples without power attribute //#define AUTO_CALCULATE_POWER @@ -213,8 +221,12 @@ Sample *PowerList::get(level_t level) float power_span = power_max - power_min; + // Width is limited to at least 10. Fioxes problem with instrument with a + // sample set smaller than MIN_SAMPLE_SET_SIZE. + float width = fmax(samples.size(), MIN_SAMPLE_SET_SIZE); + // Spread out at most 1.5 samples away from center - float stddev = power_span / samples.size() * 1.5; + float stddev = power_span / width * 1.5; // Cut off mean value with stddev/2 in both ends in order to make room for // downwards expansion on velocity 0 and upwards expansion on velocity 1. -- cgit v1.2.3 From f35591647d0c67fafda439f961d9c47f7a62a346 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sat, 17 May 2014 12:05:44 +0200 Subject: Adjust MIN_SAMPLE_SET_SIZE to match empirical value found by muldjord. --- src/powerlist.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/powerlist.cc b/src/powerlist.cc index 96f2c9b..6fc77ad 100644 --- a/src/powerlist.cc +++ b/src/powerlist.cc @@ -38,7 +38,7 @@ * Limited by sample set size, ie. only kicks in if sample set size is smaller * than this number. */ -#define MIN_SAMPLE_SET_SIZE 10 +#define MIN_SAMPLE_SET_SIZE 26 // Enable to calculate power on old samples without power attribute //#define AUTO_CALCULATE_POWER @@ -225,8 +225,9 @@ Sample *PowerList::get(level_t level) // sample set smaller than MIN_SAMPLE_SET_SIZE. float width = fmax(samples.size(), MIN_SAMPLE_SET_SIZE); - // Spread out at most 1.5 samples away from center - float stddev = power_span / width * 1.5; + // Spread out at most ~2 samples away from center if all samples have a + // uniform distribution over the power spectrum (which they probably don't). + float stddev = power_span / width; // Cut off mean value with stddev/2 in both ends in order to make room for // downwards expansion on velocity 0 and upwards expansion on velocity 1. -- cgit v1.2.3 From 488070f321b1fb24bb0a7022c321c574fd4b06ac Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sat, 17 May 2014 12:19:35 +0200 Subject: Use new lodepng code instead of libpng in win32 plugingui test application. --- plugingui/Makefile.mingw32 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugingui/Makefile.mingw32 b/plugingui/Makefile.mingw32 index d1cd3bc..3a9542a 100644 --- a/plugingui/Makefile.mingw32 +++ b/plugingui/Makefile.mingw32 @@ -3,7 +3,7 @@ include Makefile.am.plugingui CFLAGS=-DSTANDALONE -DWIN32 -DUSE_THREAD ${PLUGIN_GUI_CFLAGS} \ -I$(top_srcdir)/src -I/local/include -LDFLAGS=-mconsole -lgdi32 -lsetupapi -lws2_32 -L/local/lib -lpng -lz -pthread +LDFLAGS=-mconsole -lgdi32 -lsetupapi -lws2_32 -L/local/lib -lz -pthread C_SOURCES = \ $(top_srcdir)/hugin/hugin.c \ @@ -39,6 +39,7 @@ CXX_SOURCES = \ $(top_srcdir)/plugingui/progressbar.cc \ $(top_srcdir)/plugingui/resource.cc \ $(top_srcdir)/plugingui/resource_data.cc \ + $(top_srcdir)/plugingui/lodepng/lodepng.cpp \ $(top_srcdir)/src/thread.cc \ $(top_srcdir)/src/semaphore.cc \ $(top_srcdir)/src/mutex.cc \ -- cgit v1.2.3