VolumeControl allow_boost bug

Author: pschatzmann

src/AudioTools/AudioStreams.h

@@ -943,8 +943,17 @@ class VolumeStream : public AudioStreamX {
             if (info.channels>max_channels){
               max_channels = info.channels;
             }
+
+            // usually we use a exponential volume control - except if we allow values > 1.0
+            if (cfg.allow_boost){
+              setVolumeControl(linear_vc);
+            } else {
+              setVolumeControl(pot_vc);
+            }
+
             // set start volume
             setVolume(cfg.volume); 
+
             return true;
         }
 
@@ -955,7 +964,7 @@ class VolumeStream : public AudioStreamX {
 
         /// Resets the volume control to use the standard logic
         void resetVolumeControl(){
-            cached_volume.setVolumeControl(default_volume);
+            cached_volume.setVolumeControl(pot_vc);
         }
 
         /// Read raw PCM audio data, which will be the input for the volume control 
@@ -1033,8 +1042,9 @@ class VolumeStream : public AudioStreamX {
         Print *p_out=nullptr;
         Stream *p_in=nullptr;
         VolumeStreamConfig info;
-        SimulatedAudioPot default_volume;
-        CachedVolumeControl cached_volume = CachedVolumeControl(default_volume);
+        LinearVolumeControl linear_vc{true};
+        SimulatedAudioPot pot_vc;
+        CachedVolumeControl cached_volume{pot_vc};
         float *volume_values = nullptr;
         float *factor_for_channel = nullptr;
         bool is_active = false;
@@ -1102,7 +1112,7 @@ class VolumeStream : public AudioStreamX {
         void applyVolume16(int16_t* data, size_t size){
             for (size_t j=0;j<size;j++){
                 float result = factorForChannel(j%info.channels) * data[j];
-                if (info.allow_boost){
+                if (!info.allow_boost){
                     if (result>max_value) result = max_value;
                     if (result<-max_value) result = -max_value;
                 } 
@@ -1113,7 +1123,7 @@ class VolumeStream : public AudioStreamX {
         void applyVolume24(int24_t* data, size_t size) {
             for (size_t j=0;j<size;j++){
                 float result = factorForChannel(j%info.channels) * data[j];
-                if (info.allow_boost){
+                if (!info.allow_boost){
                     if (result>max_value) result = max_value;
                     if (result<-max_value) result = -max_value;
                 } 
@@ -1125,7 +1135,7 @@ class VolumeStream : public AudioStreamX {
         void applyVolume32(int32_t* data, size_t size) {
             for (size_t j=0;j<size;j++){
                 float result = factorForChannel(j%info.channels) * data[j];
-                if (info.allow_boost){
+                if (!info.allow_boost){
                     if (result>max_value) result = max_value;
                     if (result<-max_value) result = -max_value;
                 } 

src/AudioTools/AudioTypes.h

@@ -33,12 +33,17 @@ struct AudioBaseInfo {
     bool operator!=(AudioBaseInfo alt){
         return !(*this == alt);
     } 
+    
     void setAudioInfo(AudioBaseInfo info){
       sample_rate = info.sample_rate;
       channels = info.channels;
       bits_per_sample = info.bits_per_sample;
     }
 
+    void copyFrom(AudioBaseInfo info){
+      setAudioInfo(info);
+    }
+
     AudioBaseInfo& operator= (const AudioBaseInfo& info){
       setAudioInfo(info);
       return *this;      

src/AudioTools/Converter.h

@@ -37,7 +37,7 @@ class NumberConverter {
 
         /// provides the biggest number for the indicated number of bits
         static int64_t maxValue(int value_bits_per_sample){
-            switch(value_bits_per_sample/8){
+            switch(value_bits_per_sample){
                 case 8:
                     return 127;
                 case 16:

src/AudioTools/VolumeControl.h

@@ -142,10 +142,15 @@ class SimulatedAudioPot : public VolumeControl {
  */
 class LinearVolumeControl : public VolumeControl {
     public:
+        LinearVolumeControl(bool allowBoost=false){
+            is_limited = !allowBoost;
+        }
         // provides a factor in the range of 0.0 to 1.0
         virtual float getVolumeFactor(float volume) {
-            return limit(volume);
+            return is_limited ? limit(volume) : volume;
         }
+    protected:
+        bool is_limited;
 };