Bump version to 0.1.3

Optimize audio level loop code

.gitmodules

@@ -8,3 +8,6 @@
 	path = deps/NeuralAmpModelerCore
 	url = https://github.com/mikeoliphant/NeuralAmpModelerCore
 	branch = devel
+[submodule "deps/AudioDSPTools"]
+	path = deps/AudioDSPTools
+	url = https://github.com/sdatkinson/AudioDSPTools

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-project(NeuralAmpModelerLv2 VERSION 0.1.0)
+project(NeuralAmpModelerLv2 VERSION 0.1.3)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
@@ -22,11 +22,13 @@ set(NAM_LV2_ID http://github.com/mikeoliphant/neural-amp-modeler-lv2)
 
 include_directories(SYSTEM deps/eigen)
 include_directories(SYSTEM deps/lv2/include)
-include_directories(SYSTEM deps/NeuralAmpModelerCore/NAM)
+include_directories(SYSTEM deps/NeuralAmpModelerCore)
+include_directories(SYSTEM deps/AudioDSPTools)
 include_directories(SYSTEM deps/json)
 include_directories(SYSTEM deps/denormal)
 
 add_definitions(-DNAM_SAMPLE_FLOAT)
+add_definitions(-DDSP_SAMPLE_FLOAT)
 
 add_subdirectory(src)
 

README.md

@@ -2,7 +2,7 @@
 
 Bare-bones implementation of [Neural Amp Modeler](https://github.com/sdatkinson/neural-amp-modeler) (NAM) models in an LV2 plugin.
 
-**There is no user interface**. Setting the model to use requires that your LV2 host supports atom:Path parameters. Reaper does not. Carla and Ardour do. If your favorite LV2 host does not support atom:Path, let them know you want it. **A Reaper feature request for this is [here](https://forum.cockos.com/showthread.php?p=2505988)**.
+**There is no user interface**. Setting the model to use requires that your LV2 host supports atom:Path parameters. Reaper does as of v6.82. Carla and Ardour do. If your favorite LV2 host does not support atom:Path, let them know you want it.
 
 To get the intended behavior, **you must run your audio host at the same sample rate the model was trained at** (usually 48kHz) - no resampling is done by the plugin.
 

src/CMakeLists.txt

@@ -17,10 +17,16 @@ set(NAM_SOURCES	../deps/NeuralAmpModelerCore/NAM/activations.h
 	../deps/NeuralAmpModelerCore/NAM/convnet.cpp
 	../deps/NeuralAmpModelerCore/NAM/convnet.h)
 
-add_library(neural_amp_modeler MODULE ${SOURCES} ${NAM_SOURCES})
+set(DSP_SOURCES	../deps/AudioDSPTools/dsp/dsp.h
+	../deps/AudioDSPTools/dsp/dsp.cpp
+	../deps/AudioDSPTools/dsp/RecursiveLinearFilter.h
+	../deps/AudioDSPTools/dsp/RecursiveLinearFilter.cpp)
+
+add_library(neural_amp_modeler MODULE ${SOURCES} ${NAM_SOURCES} ${DSP_SOURCES})
 
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES})
 source_group(NAM ${CMAKE_CURRENT_SOURCE_DIR} FILES ${NAM_SOURCES})
+source_group(dsp ${CMAKE_CURRENT_SOURCE_DIR} FILES ${DSP_SOURCES})
 
 option(DISABLE_DENORMALS "Disable floating point denormals" ON)
 

src/nam_lv2.cpp

@@ -27,7 +27,7 @@ static LV2_Handle instantiate(const LV2_Descriptor*, double rate, const char*, c
 
 		return nullptr;
 	}
-	catch(const std::exception& e)
+	catch(const std::exception&)
 	{
 		return nullptr;
 	}
@@ -36,6 +36,7 @@ static LV2_Handle instantiate(const LV2_Descriptor*, double rate, const char*, c
 static void connect_port(LV2_Handle instance, uint32_t port, void* data)
 {
 	auto nam = static_cast<NAM::Plugin*>(instance);
+
 	*(reinterpret_cast<void**>(&nam->ports)+port) = data;
 }
 

src/nam_plugin.cpp

@@ -1,10 +1,10 @@
 #include <algorithm>
 #include <cmath>
 #include <utility>
+#include <cassert>
 
 #include "nam_plugin.h"
-#include "activations.h"
+#include <NAM/activations.h>
-#include <cassert>
 
 #define SMOOTH_EPSILON .0001f
 
@@ -20,12 +20,19 @@ namespace NAM {
 		delete currentModel;
 	}
 
-	bool Plugin::initialize(double rate, const LV2_Feature* const* features) noexcept
+	bool Plugin::initialize(double sampleRate, const LV2_Feature* const* features) noexcept
 	{
+		this->sampleRate = sampleRate;
+
+		const double highPassCutoffFreq = 5.0;
+		const recursive_linear_filter::HighPassParams highPassParams(sampleRate, highPassCutoffFreq);
+		mHighPass.SetParams(highPassParams);
+
 		// for fetching initial options, can be null
 		LV2_Options_Option* options = nullptr;
 
-		for (size_t i = 0; features[i]; ++i) {
+		for (size_t i = 0; features[i]; ++i)
+		{
 			if (std::string(features[i]->URI) == std::string(LV2_URID__map))
 				map = static_cast<LV2_URID_Map*>(features[i]->data);
 			else if (std::string(features[i]->URI) == std::string(LV2_WORKER__schedule))
@@ -85,11 +92,14 @@ namespace NAM {
 				auto msg = static_cast<const LV2LoadModelMsg*>(data);
 				auto nam = static_cast<NAM::Plugin*>(instance);
 
+				::DSP* model = nullptr;
+				LV2SwitchModelMsg response = { kWorkTypeSwitch, {}, {} };
+				LV2_Worker_Status result = LV2_WORKER_SUCCESS;
+
 				try
 				{
 					// load model from path
 					const size_t pathlen = strlen(msg->path);
-					::DSP* model;
 
 					if (pathlen == 0 || pathlen >= MAX_FILE_NAME)
 					{
@@ -103,40 +113,42 @@ namespace NAM {
 
 						model = get_dsp(msg->path).release();
 
-						// Enable model loudness normalization
-						model->SetNormalize(true);
-
 						// Pre-run model to ensure all needed buffers are allocated in advance
 						if (const int32_t numSamples = nam->maxBufferSize)
 						{
 							float* buffer = new float[numSamples];
+							memset(buffer, 0, numSamples * sizeof(float));
 
-							std::unordered_map<std::string, double> params = {};
+							model->process(buffer, buffer, numSamples);
-							model->process(&buffer, &buffer, 1, numSamples, 1.0, 1.0, params);
 							model->finalize_(numSamples);
 
 							delete[] buffer;
 						}
 					}
 
-					LV2SwitchModelMsg response = { kWorkTypeSwitch, {}, model };
+					response.model = model;
+
 					memcpy(response.path, msg->path, pathlen);
+				}
+				catch (const std::exception&)
+				{
+					response.path[0] = '\0';
+
+					lv2_log_error(&nam->logger, "Unable to load model from: '%s'\n", msg->path);
+					
+					//result = LV2_WORKER_ERR_UNKNOWN;
+				}
+
 				respond(handle, sizeof(response), &response);
 
-					return LV2_WORKER_SUCCESS;
+				return result;
-				}
-				catch (std::exception& e)
-				{
-					lv2_log_error(&nam->logger, "Unable to load model from: '%s'\n", msg->path);
-				}
-
-				break;
 			}
 
 			case kWorkTypeFree:
 			{
 				auto msg = static_cast<const LV2FreeModelMsg*>(data);
 				delete msg->model;
+
 				return LV2_WORKER_SUCCESS;
 			}
 
@@ -211,55 +223,77 @@ namespace NAM {
 			}
 		}
 
+		float level;
+
 		// convert input level from db
 		float desiredInputLevel = powf(10, *(ports.input_level) * 0.05f);
 
 		if (fabs(desiredInputLevel - inputLevel) > SMOOTH_EPSILON)
 		{
+			level = inputLevel;
 			for (unsigned int i = 0; i < n_samples; i++)
 			{
 				// do very basic smoothing
-				inputLevel = (.99f * inputLevel) + (.01f * desiredInputLevel);
+				level = (.99f * level) + (.01f * desiredInputLevel);
 
-				ports.audio_out[i] = ports.audio_in[i] * inputLevel;
+				ports.audio_out[i] = ports.audio_in[i] * level;
 			}
+
+			inputLevel = level;
 		}
 		else
 		{
-			inputLevel = desiredInputLevel;
+			level = inputLevel = desiredInputLevel;
 
 			for (unsigned int i = 0; i < n_samples; i++)
 			{
-				ports.audio_out[i] = ports.audio_in[i] * inputLevel;
+				ports.audio_out[i] = ports.audio_in[i] * level;
 			}
 		}
 
+		float** outputPtrs = &ports.audio_out;
+
+		float modelLoudnessAdjustmentDB = 0;
+
 		if (currentModel != nullptr)
 		{
-			currentModel->process(&ports.audio_out, &ports.audio_out, 1, n_samples, 1.0, 1.0, mNAMParams);
+			currentModel->process(ports.audio_out, ports.audio_out, n_samples);
 			currentModel->finalize_(n_samples);
+
+			// Apply a high pass filter at 5Hz to eliminate any DC offset
+			outputPtrs = mHighPass.Process(outputPtrs, 1, n_samples);
+
+			if (currentModel->HasLoudness())
+			{
+				// Normalize model to -18dB
+				modelLoudnessAdjustmentDB = -18 - currentModel->GetLoudness();
+			}
 		}
 
-		// convert output level from db
+		// Convert output level from db
-		float desiredOutputLevel = powf(10, *(ports.output_level) * 0.05f);
+		float desiredOutputLevel = powf(10, (*(ports.output_level) + modelLoudnessAdjustmentDB) * 0.05f);
 
 		if (fabs(desiredOutputLevel - outputLevel) > SMOOTH_EPSILON)
 		{
+			level = outputLevel;
+
 			for (unsigned int i = 0; i < n_samples; i++)
 			{
 				// do very basic smoothing
-				outputLevel = (.99f * outputLevel) + (.01f * desiredOutputLevel);
+				level = (.99f * level) + (.01f * desiredOutputLevel);
 
-				ports.audio_out[i] *= outputLevel;
+				ports.audio_out[i] = outputPtrs[0][i] * outputLevel;
 			}
+
+			outputLevel = level;
 		}
 		else
 		{
-			outputLevel = desiredOutputLevel;
+			level = outputLevel = desiredOutputLevel;
 
 			for (unsigned int i = 0; i < n_samples; i++)
 			{
-				ports.audio_out[i] *= outputLevel;
+				ports.audio_out[i] = outputPtrs[0][i] * level;
 			}
 		}
 	}
@@ -293,7 +327,8 @@ namespace NAM {
 
 		lv2_log_trace(&nam->logger, "Saving state\n");
 
-		if (!nam->currentModel) {
+		if (!nam->currentModel)
+		{
 			return LV2_STATE_SUCCESS;
 		}
 
@@ -331,8 +366,6 @@ namespace NAM {
 	LV2_State_Status Plugin::restore(LV2_Handle instance, LV2_State_Retrieve_Function retrieve, LV2_State_Handle handle, 
 		uint32_t flags, const LV2_Feature* const* features)
 	{
-		//if (!haveLog) return LV2_STATE_SUCCESS;
-
 		auto nam = static_cast<NAM::Plugin*>(instance);
 
 		// Get model_Path from state
@@ -343,16 +376,17 @@ namespace NAM {
 
 		lv2_log_trace(&nam->logger, "Restoring model '%s'\n", (const char*)value);
 
-		if (!value) {
+		NAM::LV2LoadModelMsg msg = { NAM::kWorkTypeLoad, {} };
-			lv2_log_error(&nam->logger, "Missing model_Path\n");
-			return LV2_STATE_ERR_NO_PROPERTY;
-		}
 
-		if (type != nam->uris.atom_Path) {
+		LV2_State_Status result = LV2_STATE_SUCCESS;
-			lv2_log_error(&nam->logger, "Non-path model_Path\n");
-			return LV2_STATE_ERR_BAD_TYPE;
-		}
 
+		// Check if a path is set
+		if (!value || (type != nam->uris.atom_Path))
+		{
+			msg.path[0] = '\0';
+		}
+		else
+		{
 			LV2_State_Map_Path* map_path = (LV2_State_Map_Path*)lv2_features_data(features, LV2_STATE__mapPath);
 
 			if (map_path == nullptr)
@@ -367,22 +401,16 @@ namespace NAM {
 
 			size_t pathLen = strlen(path);
 
-		LV2_State_Status result = LV2_STATE_SUCCESS;
+			if (pathLen >= MAX_FILE_NAME)
-
-		if (pathLen < MAX_FILE_NAME)
-		{
-			// Schedule model to be loaded by the provided worker
-			NAM::LV2LoadModelMsg msg = { NAM::kWorkTypeLoad, {} };
-
-			memcpy(msg.path, path, pathLen);
-			nam->schedule->schedule_work(nam->schedule->handle, sizeof(msg), &msg);
-		}
-		else
 			{
 				lv2_log_error(&nam->logger, "Model path is too long (max %u chars)\n", MAX_FILE_NAME);
 
 				result = LV2_STATE_ERR_UNKNOWN;
 			}
+			else
+			{
+				memcpy(msg.path, path, pathLen);
+			}
 
 			LV2_State_Free_Path* free_path = (LV2_State_Free_Path*)lv2_features_data(features, LV2_STATE__freePath);
 
@@ -396,6 +424,15 @@ namespace NAM {
 				free(path);
 #endif
 			}
+		}
+
+		if (result == LV2_STATE_SUCCESS)
+		{
+			// Schedule model to be loaded by the provided worker
+			nam->schedule->schedule_work(nam->schedule->handle, sizeof(msg), &msg);
+
+			nam->currentModelPath = msg.path;
+		}
 
 		return result;
 	}
@@ -410,7 +447,7 @@ namespace NAM {
 		lv2_atom_forge_key(&atom_forge, uris.patch_property);
 		lv2_atom_forge_urid(&atom_forge, uris.model_Path);
 		lv2_atom_forge_key(&atom_forge, uris.patch_value);
-		lv2_atom_forge_path(&atom_forge, currentModelPath.c_str(), currentModelPath.length() + 1);
+		lv2_atom_forge_path(&atom_forge, currentModelPath.c_str(), (uint32_t)currentModelPath.length() + 1);
 
 		lv2_atom_forge_pop(&atom_forge, &frame);
 	}

src/nam_plugin.h

@@ -21,7 +21,8 @@
 #include <lv2/state/state.h>
 #include <lv2/units/units.h>
 
-#include "dsp.h"
+#include <NAM/dsp.h>
+#include <dsp/RecursiveLinearFilter.h>
 
 #define PlUGIN_URI "http://github.com/mikeoliphant/neural-amp-modeler-lv2"
 #define MODEL_URI PlUGIN_URI "#model"
@@ -64,14 +65,15 @@ namespace NAM {
 
 		Ports ports = {};
 
+		double sampleRate;
+
 		LV2_URID_Map* map = nullptr;
 		LV2_Log_Logger logger = {};
 		LV2_Worker_Schedule* schedule = nullptr;
 
 		::DSP* currentModel = nullptr;
 		std::string currentModelPath;
-
+		recursive_linear_filter::HighPass mHighPass;
-		std::unordered_map<std::string, double> mNAMParams = {};
 
 		Plugin();
 		~Plugin();
@@ -114,7 +116,6 @@ namespace NAM {
 		LV2_Atom_Forge atom_forge = {};
 		LV2_Atom_Forge_Frame sequence_frame;
 
-		float m_rate;
 		float inputLevel = 0;
 		float outputLevel = 0;
 		int32_t maxBufferSize = 0;