From 2d4c89ba77610b047458bb5370b411474e066b01 Mon Sep 17 00:00:00 2001
From: Ted Moore <ted@tedmooremusic.com>
Date: Wed, 19 Jan 2022 13:26:56 -0500
Subject: [PATCH] WIP towards a 'rasterBuffer' approach, waiting on interface
 decisions and scaling decisions

---
 release-packaging/Classes/FluidWaveform.sc  | 132 ++++++++++----------
 test/FluidWaveform raster scratch paper.scd |  48 +++++++
 2 files changed, 111 insertions(+), 69 deletions(-)
 create mode 100644 test/FluidWaveform raster scratch paper.scd

diff --git a/release-packaging/Classes/FluidWaveform.sc b/release-packaging/Classes/FluidWaveform.sc
index 76ae6d9..8441869 100644
--- a/release-packaging/Classes/FluidWaveform.sc
+++ b/release-packaging/Classes/FluidWaveform.sc
@@ -17,8 +17,8 @@ FluidWaveform : FluidViewer {
 	var <win;
 
 	*new {
-		arg audioBuffer, slicesBuffer, featureBuffer, parent, bounds, lineWidth = 1, waveformColor, stackFeatures = false, showSpectrogram = false, spectrogramColorScheme = 0, spectrogramAlpha = 1, showWaveform = true, normalizeFeaturesIndependently = true;
-		^super.new.init(audioBuffer,slicesBuffer, featureBuffer, parent, bounds, lineWidth, waveformColor,stackFeatures,showSpectrogram,spectrogramColorScheme,spectrogramAlpha,showWaveform,normalizeFeaturesIndependently);
+		arg audioBuffer, indicesBuffer, featureBuffer, parent, bounds, lineWidth = 1, waveformColor, stackFeatures = false, rasterBuffer, rasterColorScheme = 0, rasterAlpha = 1, showWaveform = true, normalizeFeaturesIndependently = true;
+		^super.new.init(audioBuffer,indicesBuffer, featureBuffer, parent, bounds, lineWidth, waveformColor,stackFeatures,rasterBuffer,rasterColorScheme,rasterAlpha,showWaveform,normalizeFeaturesIndependently);
 	}
 
 	close {
@@ -34,11 +34,11 @@ FluidWaveform : FluidViewer {
 	}
 
 	init {
-		arg audio_buf, slices_buf, feature_buf, parent_, bounds, lineWidth, waveformColor,stackFeatures = false, showSpectrogram = false, spectrogramColorScheme = 0, spectrogramAlpha = 1, showWaveform = true,normalizeFeaturesIndependently = true;
+		arg audio_buf, slices_buf, feature_buf, parent_, bounds, lineWidth, waveformColor,stackFeatures = false, rasterBuffer, rasterColorScheme = 0, rasterAlpha = 1, showWaveform = true,normalizeFeaturesIndependently = true;
 		Task{
 			var sfv, categoryCounter = 0, xpos, ypos;
 
-			waveformColor = waveformColor ? Color(*0.dup(3));
+			waveformColor = waveformColor ? Color(*0.6.dup(3));
 
 			this.createCatColors;
 
@@ -61,79 +61,73 @@ FluidWaveform : FluidViewer {
 				};
 			});
 
-			if(audio_buf.notNil,{
-				if(showSpectrogram,{
-					var magsbuf = Buffer(audio_buf.server);
-					var condition = Condition.new;
-					var colors;
-
-					// TODO: no need for this to be a switch statement.
-					spectrogramColorScheme.switch(
-						0,{
-							colors = this.loadColorFile("CET-L02");
-						},
-						1,{
-							colors = this.loadColorFile("CET-L16");
-						},
-						2,{
-							colors = this.loadColorFile("CET-L08");
-						},
-						3,{
-							colors = this.loadColorFile("CET-L03");
-						},
-						4,{
-							colors = this.loadColorFile("CET-L04");
-						},
-						{
-							"% spectrogramColorScheme: % is not valid.".format(thisMethod,spectrogramColorScheme).warn;
-						}
-					);
-
-					FluidBufSTFT.processBlocking(audio_buf.server,audio_buf,magnitude:magsbuf,action:{
-						magsbuf.loadToFloatArray(action:{
-							arg mags;
-							fork({
-								var img = Image(magsbuf.numFrames,magsbuf.numChannels);
-								mags = (mags / mags.maxItem).ampdb.linlin(-120.0,0.0,0,255).asInteger;
-
-								mags.do{
-									arg mag, index;
-									// colors[mag].postln;
-									img.setColor(colors[mag], index.div(magsbuf.numChannels), magsbuf.numChannels - 1 - index.mod(magsbuf.numChannels));
-								};
+			if(rasterBuffer.notNil,{
+				var condition = Condition.new;
+				var colors;
 
-								UserView(win,Rect(xpos,ypos,bounds.width,bounds.height))
-								.drawFunc_{
-									img.drawInRect(Rect(0,0,bounds.width,bounds.height),fraction:spectrogramAlpha);
-								};
+				// TODO: no need for this to be a switch statement.
+				rasterColorScheme.switch(
+					0,{
+						colors = this.loadColorFile("CET-L02");
+					},
+					1,{
+						colors = this.loadColorFile("CET-L16");
+					},
+					2,{
+						colors = this.loadColorFile("CET-L08");
+					},
+					3,{
+						colors = this.loadColorFile("CET-L03");
+					},
+					4,{
+						colors = this.loadColorFile("CET-L04");
+					},
+					{
+						"% spectrogramColorScheme: % is not valid.".format(thisMethod,rasterColorScheme).warn;
+					}
+				);
 
-								condition.unhang;
-								magsbuf.free;
-							},AppClock)
-						});
-					});
-					condition.hang;
+				rasterBuffer.loadToFloatArray(action:{
+					arg vals;
+					fork({
+						var img = Image(rasterBuffer.numFrames,rasterBuffer.numChannels);
+						vals = (vals - vals.minItem) / (vals.maxItem - vals.minItem);
+						vals = (vals * 255).asInteger;
+
+						vals.do{
+							arg val, index;
+							img.setColor(colors[val], index.div(rasterBuffer.numChannels), rasterBuffer.numChannels - 1 - index.mod(rasterBuffer.numChannels));
+						};
+
+						UserView(win,Rect(xpos,ypos,bounds.width,bounds.height))
+						.drawFunc_{
+							img.drawInRect(Rect(0,0,bounds.width,bounds.height),fraction:rasterAlpha);
+						};
+
+						condition.unhang;
+					},AppClock)
 				});
+				condition.hang;
+			});
 
-				if(showWaveform,{
-					var path = "%%_%_FluidWaveform.wav".format(PathName.tmp,Date.localtime.stamp,UniqueID.next);
+			if(showWaveform,{
+				var path = "%%_%_FluidWaveform.wav".format(PathName.tmp,Date.localtime.stamp,UniqueID.next);
 
-					audio_buf.write(path,"wav");
+				audio_buf.write(path,"wav");
 
-					audio_buf.server.sync;
+				audio_buf.server.sync;
 
-					sfv = SoundFileView(win,Rect(xpos,ypos,bounds.width,bounds.height));
-					sfv.peakColor_(waveformColor);
-					// sfv.rmsColor_(Color.black);
-					sfv.drawsBoundingLines_(false);
-					sfv.rmsColor_(Color.clear);
-					// sfv.background_(Color.white);
-					sfv.background_(Color.clear);
-					sfv.readFile(SoundFile(path));
-					sfv.gridOn_(false);
+				sfv = SoundFileView(win,Rect(xpos,ypos,bounds.width,bounds.height));
+				sfv.peakColor_(waveformColor);
+				// sfv.rmsColor_(Color.black);
+				sfv.drawsBoundingLines_(false);
+				sfv.rmsColor_(Color.clear);
+				// sfv.background_(Color.white);
+				sfv.background_(Color.clear);
+				sfv.readFile(SoundFile(path));
+				sfv.gridOn_(false);
 
-					File.delete(path);
-				});
+				File.delete(path);
 			});
 
 			if(slices_buf.notNil,{
diff --git a/test/FluidWaveform raster scratch paper.scd b/test/FluidWaveform raster scratch paper.scd
new file mode 100644
index 0000000..5c7cd30
--- /dev/null
+++ b/test/FluidWaveform raster scratch paper.scd	
@@ -0,0 +1,48 @@
+(
+~raster = {
+	arg rasterBuffer;
+	var colors;
+
+	colors = CSVFileReader.readInterpret(FluidFilesPath("../Resources/color-schemes/%.csv".format("CET-L16"))).collect{
+		arg row;
+		Color.fromArray(row);
+	};
+
+	rasterBuffer.loadToFloatArray(action:{
+		arg vals;
+		"n vals in raster buffer: %".format(vals.size).postln;
+		fork({
+			var img = Image(rasterBuffer.numFrames,rasterBuffer.numChannels);
+			var min = vals.minItem;
+			var max = vals.maxItem;
+			var range = max - min;
+
+			"min:   %".format(min).postln;
+			"max:   %".format(max).postln;
+			"range: %".format(range).postln;
+
+			vals = (vals - min) / range;
+			vals = (vals * 255).asInteger;
+
+			vals.do{
+				arg val, index;
+				img.setColor(colors[val], index.div(rasterBuffer.numChannels), rasterBuffer.numChannels - 1 - index.mod(rasterBuffer.numChannels));
+			};
+
+			img.plot;
+		},AppClock);
+	});
+};
+)
+
+// show mels
+~drums = Buffer.read(s,FluidFilesPath("Nicol-LoopE-M.wav"));
+~rasterBuffer = Buffer(s);
+
+FluidBufMelBands.processBlocking(s,~drums,features:~rasterBuffer,numBands:512,windowSize:1024,action:{"done".postln});
+FluidBufSTFT.processBlocking(s,~drums,magnitude:~rasterBuffer,windowSize:1024,action:{"done".postln});
+FluidBufMFCC.processBlocking(s,~drums,features:~rasterBuffer,windowSize:1024,action:{"done".postln});
+FluidBufChroma.processBlocking(s,~drums,features:~rasterBuffer,action:{"done".postln});
+~rasterBuffer.postln;
+
+~raster.(~rasterBuffer);
\ No newline at end of file