NumberFormatConverter wrong clipping

Author: pschatzmann

examples/tests/conversion/numberformat-converter/numberformat-converter.ino

@@ -0,0 +1,34 @@
+#include "AudioTools.h"
+#include "AudioTools/AudioLibs/AudioBoardStream.h"
+
+AudioInfo info(48000, 2, 16);
+AudioInfo info_to(48000, 2, 32);
+SineWaveGenerator<int16_t> sineWave(32000);                // subclass of SoundGenerator with max amplitude of 32000
+GeneratedSoundStream<int16_t> sound(sineWave);             // Stream generated from sine wave
+AudioBoardStream out(AudioKitEs8388V1);
+NumberFormatConverterStream nfc(out);
+StreamCopy copier(nfc, sound);                             // copies sound into i2s
+
+// Arduino Setup
+void setup(void) {  
+  // Open Serial 
+  Serial.begin(115200);
+  AudioToolsLogger.begin(Serial, AudioToolsLogLevel::Info);
+
+  nfc.begin(info.bits_per_sample, info_to.bits_per_sample);
+
+  // start I2S
+  Serial.println("starting I2S...");
+  auto config = out.defaultConfig(TX_MODE);
+  config.copyFrom(info_to); 
+  out.begin(config);
+
+  // Setup sine wave
+  sineWave.begin(info, N_B4);
+  Serial.println("started...");
+}
+
+// Arduino loop - copy sound to out 
+void loop() {
+  copier.copy();
+}

src/AudioTools/AudioCodecs/CodecL8.h

@@ -93,7 +93,7 @@ class DecoderL8 : public AudioDecoder {
     if (!is_signed) {
       tmp -= 129;
     }
-    return NumberConverter::clipT<int32_t, int16_t>(tmp * 258);
+    return NumberConverter::clipT<int16_t>(tmp * 258);
   }
 
   virtual operator bool() override { return p_print!=nullptr; }
@@ -168,7 +168,7 @@ class EncoderL8 : public AudioEncoder {
   operator bool() override { return is_open; }
 
   int16_t convertSample(int16_t sample) {
-    int16_t tmp = NumberConverter::clipT<int16_t, int8_t>(sample / 258);
+    int16_t tmp = NumberConverter::clipT<int8_t>(sample / 258);
     if (!is_signed) {
       tmp += 129;
       // clip to range

src/AudioTools/CoreAudio/AudioEffects/Synthesizer.h

@@ -224,7 +224,7 @@ class Synthesizer : public SoundGenerator<int16_t> {
             // prevent divide by zero
             int result = 0;
             if (count>0){
-                result = NumberConverter::clipT<int, int16_t>(total / count);
+                result = NumberConverter::clipT<int16_t>(total / count);
             }
             return result;
         }

src/AudioTools/CoreAudio/AudioTypes.h

@@ -348,9 +348,9 @@ class NumberConverter {
         }
 
         /// Clips the value to avoid any over or underflows
-        template <typename From, typename T> 
-        static T clipT(From value){
-            From mv = maxValue(sizeof(T)*8);
+        template <typename T> 
+        static T clipT(float value){
+            float mv = maxValueT<T>();
             if (value > mv){
                 return mv;
             } else if (value < -mv){
@@ -396,7 +396,7 @@ class NumberConverter {
         template <typename FromT, typename ToT> 
         static ToT convert(FromT value){
             int64_t value1 = value;
-            return clipT<FromT,ToT>(value1 * maxValueT<ToT>() / maxValueT<FromT>());
+            return clipT<ToT>(value1 * maxValueT<ToT>() / maxValueT<FromT>());
         }
 
         /// Convert an array of int types
@@ -405,7 +405,7 @@ class NumberConverter {
             float  factor = static_cast<float>(maxValueT<ToT>()) / maxValueT<FromT>();
             float vol_factor = factor * vol;
             for (int j=0;j<samples;j++){
-              to[j] = clipT<FromT, ToT>(vol_factor * from[j]);
+              to[j] = clipT<ToT>(vol_factor * from[j]);
             }
         }