VS1053 AudioPlayer

Author: pschatzmann

examples/examples-vs1053/player-sd-vs1053/player-sd-vs1053.ino

@@ -39,7 +39,6 @@ void setup() {
   vs1053.setVolume(1.0); // full volume 
 
   // setup player
-  player.setVolume(0.7); // we use volume control of the player
   player.begin();
 
   // select file with setPath() or setIndex()

src/AudioCodecs/AudioEncoded.h

@@ -31,6 +31,8 @@ class AudioDecoder : public AudioWriter, public AudioBaseInfoSource {
     setNotifyAudioChange(out_stream);
   }
   virtual void setOutputStream(Print &out_stream) = 0;
+  // Th decoding result is PCM data
+  virtual bool isResultPCM() { return true;} 
 };
 
 /**

src/AudioCodecs/CodecCopy.h

@@ -34,6 +34,9 @@ class CopyDecoder : public AudioDecoder {
 
   void setNotifyAudioChange(AudioBaseInfoDependent &bi) {}
 
+  // The result is encoded data
+  virtual bool isResultPCM() { return false;} 
+
 protected:
   Print *pt_print=nullptr;
 };

src/AudioTools/AudioPlayer.h

@@ -83,8 +83,12 @@ namespace audio_tools {
             LOGD(LOG_METHOD);
             this->p_source = &source;
             this->p_decoder = &decoder;
-            this->volume_out.setTarget(output);
-            this->p_out_decoding = new EncodedAudioStream(volume_out, decoder);
+            if (decoder.isResultPCM()){
+                this->volume_out.setTarget(output);
+                this->p_out_decoding = new EncodedAudioStream(volume_out, decoder);
+            } else {
+                this->p_out_decoding = new EncodedAudioStream(output, decoder);
+            }
             this->p_final_print = &output;
 
             // notification for audio configuration
@@ -104,8 +108,12 @@ namespace audio_tools {
             LOGD(LOG_METHOD);
             this->p_source = &source;
             this->p_decoder = &decoder;
-            this->volume_out.setTarget(output);
-            this->p_out_decoding = new EncodedAudioStream(volume_out, decoder);
+            if (decoder.isResultPCM()){
+                this->volume_out.setTarget(output);
+                this->p_out_decoding = new EncodedAudioStream(volume_out, decoder);
+            } else {
+                this->p_out_decoding = new EncodedAudioStream(output, decoder);
+            }
             setNotify(notify);
         }
 
@@ -120,8 +128,12 @@ namespace audio_tools {
         AudioPlayer(AudioSource& source, AudioStream& output, AudioDecoder& decoder) {
             LOGD(LOG_METHOD);
             this->p_source = &source;
-            this->volume_out.setTarget(output);
-            this->p_out_decoding = new EncodedAudioStream(volume_out, decoder);
+            if (decoder.isResultPCM()){
+                this->volume_out.setTarget(output);
+                this->p_out_decoding = new EncodedAudioStream(volume_out, decoder);
+            } else {
+                this->p_out_decoding = new EncodedAudioStream(output, decoder);
+            }
             this->p_final_stream = &output;
 
             // notification for audio configuration