Add AudioEffectMultiply

Audio.h

@@ -56,6 +56,7 @@
 #include "effect_fade.h"
 #include "effect_flange.h"
 #include "effect_envelope.h"
+#include "effect_multiply.h"
 #include "filter_biquad.h"
 #include "filter_fir.h"
 #include "input_adc.h"

effect_multiply.cpp

@@ -0,0 +1,79 @@
+/* Audio Library for Teensy 3.X
+ * Copyright (c) 2014, Paul Stoffregen, paul@pjrc.com
+ *
+ * Development of this audio library was funded by PJRC.COM, LLC by sales of
+ * Teensy and Audio Adaptor boards.  Please support PJRC's efforts to develop
+ * open source software by purchasing Teensy or other PJRC products.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice, development funding notice, and this permission
+ * notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "effect_multiply.h"
+
+void AudioEffectMultiply::update(void)
+{
+	audio_block_t *blocka, *blockb;
+	uint32_t *pa, *pb, *end;
+	uint32_t a12, a34; //, a56, a78;
+	uint32_t b12, b34; //, b56, b78;
+
+	blocka = receiveWritable(0);
+	blockb = receiveReadOnly(1);
+	if (!blocka) {
+		if (blockb) release(blockb);
+		return;
+	}
+	if (!blockb) {
+		release(blocka);
+		return;
+	}
+	pa = (uint32_t *)(blocka->data);
+	pb = (uint32_t *)(blockb->data);
+	end = pa + AUDIO_BLOCK_SAMPLES/2;
+	while (pa < end) {
+		a12 = *pa;
+		a34 = *(pa+1);
+		//a56 = *(pa+2); // 8 samples/loop should work, but crashes.
+		//a78 = *(pa+3); // why?!  maybe a compiler bug??
+		b12 = *pb++;
+		b34 = *pb++;
+		//b56 = *pb++;
+		//b78 = *pb++;
+		a12 = pack_16b_16b(
+			signed_saturate_rshift(multiply_16tx16t(a12, b12), 16, 15), 
+			signed_saturate_rshift(multiply_16bx16b(a12, b12), 16, 15));
+		a34 = pack_16b_16b(
+			signed_saturate_rshift(multiply_16tx16t(a34, b34), 16, 15), 
+			signed_saturate_rshift(multiply_16bx16b(a34, b34), 16, 15));
+		//a56 = pack_16b_16b(
+		//	signed_saturate_rshift(multiply_16tx16t(a56, b56), 16, 15), 
+		//	signed_saturate_rshift(multiply_16bx16b(a56, b56), 16, 15));
+		//a78 = pack_16b_16b(
+		//	signed_saturate_rshift(multiply_16tx16t(a78, b78), 16, 15), 
+		//	signed_saturate_rshift(multiply_16bx16b(a78, b78), 16, 15));
+		*pa++ = a12;
+		*pa++ = a34;
+		//*pa++ = a56;
+		//*pa++ = a78;
+	}
+	transmit(blocka);
+	release(blocka);
+	release(blockb);
+}
+

effect_multiply.h

@@ -0,0 +1,41 @@
+/* Audio Library for Teensy 3.X
+ * Copyright (c) 2014, Paul Stoffregen, paul@pjrc.com
+ *
+ * Development of this audio library was funded by PJRC.COM, LLC by sales of
+ * Teensy and Audio Adaptor boards.  Please support PJRC's efforts to develop
+ * open source software by purchasing Teensy or other PJRC products.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice, development funding notice, and this permission
+ * notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef effect_multiply_h_
+#define effect_multiply_h_
+#include "AudioStream.h"
+#include "utility/dspinst.h"
+
+class AudioEffectMultiply : public AudioStream
+{
+public:
+	AudioEffectMultiply() : AudioStream(2, inputQueueArray) { }
+	virtual void update(void);
+private:
+	audio_block_t *inputQueueArray[2];
+};
+
+#endif

gui/list.html

@@ -1026,6 +1026,49 @@
 
 
 
+<script type="text/javascript">
+	RED.nodes.registerType('AudioEffectMultiply',{
+	shortName: "multiply",
+		inputs:2,
+		outputs:1,
+		category: 'effect-function',
+		color:"#E6E0F8",
+		icon: "arrow-in.png"
+	});
+</script>
+<script type="text/x-red" data-help-name="AudioEffectMultiply">
+	<h3>Summary</h3>
+	<div>
+	<p>Multiply two signals together, useful for amplitude modulation
+		or "voltage controlled amplification".
+	</p>
+	<p align=center><img src="multiply.png"><br><small>56 Hz and 1 kHz sine waves multiplied.</small></p>
+	</div>
+	<h3>Audio Connections</h3>
+	<table class=doc align=center cellpadding=3>
+		<tr class=top><th>Port</th><th>Purpose</th></tr>
+		<tr class=odd><td align=center>In 0</td><td>Signal Input</td></tr>
+		<tr class=odd><td align=center>In 1</td><td>Signal Input</td></tr>
+		<tr class=odd><td align=center>Out 0</td><td>Signal with Envelope Applied</td></tr>
+	</table>
+	<h3>Functions</h3>
+	<p>There are no functions to call from the Arduino sketch.
+		This object simply multiplies the 2 signals to create
+		a continuous output
+	</p>
+	<h3>Notes</h3>
+	<p>
+    </p>
+</script>
+<script type="text/x-red" data-template-name="AudioEffectMultiply">
+	<div class="form-row">
+		<label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+		<input type="text" id="node-input-name" placeholder="Name">
+	</div>
+</script>
+
+
+
 <script type="text/javascript">
 	RED.nodes.registerType('AudioFilterBiquad',{
 	shortName: "biquad",

keywords.txt

@@ -15,6 +15,7 @@ AudioEffectChorus	KEYWORD2
 AudioEffectFade	KEYWORD2
 AudioEffectFlange	KEYWORD2
 AudioEffectEnvelope	KEYWORD2
+AudioEffectMultiply	KEYWORD2
 AudioFilterBiquad	KEYWORD2
 AudioFilterFIR	KEYWORD2
 AudioInputAnalog	KEYWORD2

utility/dspinst.h

@@ -182,4 +182,41 @@ static inline int32_t multiply_16tx16b_add_16bx16t(uint32_t a, uint32_t b)
 	return out;
 }
 
+// computes ((a[15:0] * b[15:0])
+static inline int32_t multiply_16bx16b(uint32_t a, uint32_t b) __attribute__((always_inline, unused));
+static inline int32_t multiply_16bx16b(uint32_t a, uint32_t b)
+{
+	int32_t out;
+	asm volatile("smulbb %0, %1, %2" : "=r" (out) : "r" (a), "r" (b));
+	return out;
+}
+
+// computes ((a[15:0] * b[31:16])
+static inline int32_t multiply_16bx16t(uint32_t a, uint32_t b) __attribute__((always_inline, unused));
+static inline int32_t multiply_16bx16t(uint32_t a, uint32_t b)
+{
+	int32_t out;
+	asm volatile("smulbt %0, %1, %2" : "=r" (out) : "r" (a), "r" (b));
+	return out;
+}
+
+// computes ((a[31:16] * b[15:0])
+static inline int32_t multiply_16tx16b(uint32_t a, uint32_t b) __attribute__((always_inline, unused));
+static inline int32_t multiply_16tx16b(uint32_t a, uint32_t b)
+{
+	int32_t out;
+	asm volatile("smultb %0, %1, %2" : "=r" (out) : "r" (a), "r" (b));
+	return out;
+}
+
+// computes ((a[31:16] * b[31:16])
+static inline int32_t multiply_16tx16t(uint32_t a, uint32_t b) __attribute__((always_inline, unused));
+static inline int32_t multiply_16tx16t(uint32_t a, uint32_t b)
+{
+	int32_t out;
+	asm volatile("smultt %0, %1, %2" : "=r" (out) : "r" (a), "r" (b));
+	return out;
+}
+
+
 #endif