Improve audio handling on PWM.

cgreening · cgreening · commit 06b90744511a · 2024-10-19T17:21:24.000+01:00
diff --git a/player/.vscode/settings.json b/player/.vscode/settings.json
@@ -1,5 +1,13 @@
 {
   "files.associations": {
-    "functional": "cpp"
+    "functional": "cpp",
+    "*.tcc": "cpp",
+    "exception": "cpp",
+    "fstream": "cpp",
+    "iosfwd": "cpp",
+    "new": "cpp",
+    "ostream": "cpp",
+    "sstream": "cpp",
+    "streambuf": "cpp"
   }
 }
diff --git a/player/src/AudioOutput/AudioOutput.h b/player/src/AudioOutput/AudioOutput.h
@@ -18,7 +18,7 @@ class AudioOutput
   // something the output device expects - for the default case
   // this is simply a pass through
   virtual int16_t process_sample(int16_t sample) { return sample; }
-  virtual void write(int8_t *samples, int count) = 0;
+  virtual void write(uint8_t *samples, int count) = 0;
 
   void setVolume(int volume){
     if (volume > 10 || volume < 0) mVolume = 10;
diff --git a/player/src/AudioOutput/I2SBase.cpp b/player/src/AudioOutput/I2SBase.cpp
@@ -21,7 +21,7 @@ void I2SBase::stop()
   i2s_driver_uninstall(m_i2s_port);
 }
 
-void I2SBase::write(int8_t *samples, int count)
+void I2SBase::write(uint8_t *samples, int count)
 {
   int sample_index = 0;
   while (sample_index < count)
@@ -30,7 +30,7 @@ void I2SBase::write(int8_t *samples, int count)
     for (int i = 0; i < NUM_FRAMES_TO_SEND && sample_index < count; i++)
     {
       // shift up to 16 bit samples
-      int sample = process_sample((samples[sample_index] * mVolume / 10) << 8);
+      int sample = process_sample(((samples[sample_index] - 128) * mVolume / 10) << 8);
       m_tmp_frames[i * 2] = sample;
       m_tmp_frames[i * 2 + 1] = sample;
       samples_to_send++;
diff --git a/player/src/AudioOutput/I2SBase.h b/player/src/AudioOutput/I2SBase.h
@@ -16,7 +16,7 @@ class I2SBase : public AudioOutput
 public:
   I2SBase(i2s_port_t i2s_port);
   void stop();
-  void write(int8_t *samples, int count);
+  void write(uint8_t *samples, int count);
   // override this in derived classes to turn the sample into
   // something the output device expects - for the default case
   // this is simply a pass through
diff --git a/player/src/AudioOutput/PDMTimerOuput.cpp b/player/src/AudioOutput/PDMTimerOuput.cpp
@@ -83,7 +83,7 @@ void PDMTimerOutput::start(uint32_t sample_rate)
   Serial.println("PDM Started");
 }
 
-void PDMTimerOutput::write(int8_t *samples, int count)
+void PDMTimerOutput::write(uint8_t *samples, int count)
 {
   // Serial.printf("Count %d\n", mCount);
   while (true)
@@ -97,7 +97,7 @@ void PDMTimerOutput::write(int8_t *samples, int count)
         mSecondBuffer = (int8_t *)realloc(mSecondBuffer, count);
         // copy them into the second buffer
         for(int i = 0; i < count; i++) {
-          mSecondBuffer[i] = samples[i] * mVolume / 10;
+          mSecondBuffer[i] = (samples[i] - 128) * mVolume / 10;
         }
         // second buffer is now full of samples
         mSecondBufferLength = count;
diff --git a/player/src/AudioOutput/PDMTimerOutput.h b/player/src/AudioOutput/PDMTimerOutput.h
@@ -31,7 +31,7 @@ class PDMTimerOutput : public AudioOutput
     mBufferSemaphore = xSemaphoreCreateBinary();
     xSemaphoreGive(mBufferSemaphore);
   }
-  void write(int8_t *samples, int count);
+  void write(uint8_t *samples, int count);
   void start(uint32_t sample_rate);
   void stop() {}
 
diff --git a/player/src/AudioOutput/PWMTimerOuput.cpp b/player/src/AudioOutput/PWMTimerOuput.cpp
@@ -19,8 +19,8 @@ void PWMTimerOutput::start(uint32_t sample_rate)
 {
   mSampleRate = sample_rate;
 
-  ledcSetup(0, 50000, 8);
-  ledcAttachPin(mPDMPin, 0);
+  ledcSetup(2, 32000, 11);
+  ledcAttachPin(mPDMPin, 2);
 
   // create a timer that will fire at the sample rate
   timer_config_t timer_config = {
@@ -67,7 +67,7 @@ void PWMTimerOutput::start(uint32_t sample_rate)
   Serial.println("PDM Started");
 }
 
-void PWMTimerOutput::write(int8_t *samples, int count)
+void PWMTimerOutput::write(uint8_t *samples, int count)
 {
   // Serial.printf("Count %d\n", mCount);
   while (true)
@@ -78,10 +78,10 @@ void PWMTimerOutput::write(int8_t *samples, int count)
       {
         //Serial.println("Filling second buffer");
         // make sure there's enough room for the samples
-        mSecondBuffer = (int8_t *)realloc(mSecondBuffer, count);
+        mSecondBuffer = (uint8_t *)realloc(mSecondBuffer, count);
         // copy them into the second buffer
         for(int i = 0; i < count; i++) {
-          mSecondBuffer[i] = samples[i] * mVolume / 10;
+          mSecondBuffer[i] = samples[i];
         }
         // second buffer is now full of samples
         mSecondBufferLength = count;
@@ -103,9 +103,9 @@ void PWMTimerOutput::onTimer()
   {
     mCount++;
     // get the first sample from the buffer
-    int16_t sample = mBuffer[mCurrentIndex];
+    uint32_t sample = (uint32_t(mBuffer[mCurrentIndex]) << 3);
     mCurrentIndex++;
-    ledcWrite(0, sample+128);
+    ledcWrite(2, sample * mVolume / 10);
   }
   if(mCurrentIndex >= mBufferLength)
   {
@@ -115,7 +115,7 @@ void PWMTimerOutput::onTimer()
     {
       if (mSecondBufferLength > 0) {
         // swap the buffers
-        int8_t *tmp = mBuffer;
+        uint8_t *tmp = mBuffer;
         mBuffer = mSecondBuffer;
         mBufferLength = mSecondBufferLength;
         mSecondBuffer = tmp;
diff --git a/player/src/AudioOutput/PWMTimerOutput.h b/player/src/AudioOutput/PWMTimerOutput.h
@@ -17,10 +17,10 @@ class PWMTimerOutput : public AudioOutput
   gpio_num_t mPDMPin;
   uint32_t mSampleRate;
   SemaphoreHandle_t mBufferSemaphore;
-  int8_t *mBuffer=NULL;;
+  uint8_t *mBuffer=NULL;;
   int mCurrentIndex=0;
   int mBufferLength=0;
-  int8_t *mSecondBuffer=NULL;;
+  uint8_t *mSecondBuffer=NULL;;
   int mSecondBufferLength=0;
   int mCount = 0;
   void onTimer();
@@ -31,7 +31,7 @@ class PWMTimerOutput : public AudioOutput
     mBufferSemaphore = xSemaphoreCreateBinary();
     xSemaphoreGive(mBufferSemaphore);
   }
-  void write(int8_t *samples, int count);
+  void write(uint8_t *samples, int count);
   void start(uint32_t sample_rate);
   void stop() {}
 
diff --git a/player/src/AudioSource/AudioSource.h b/player/src/AudioSource/AudioSource.h
@@ -10,5 +10,5 @@ class AudioSource {
   public:
     virtual void start() {};
     // get up to maxSamples of audio data and return the number of samples retrieved
-    virtual int getAudioSamples(int8_t **buffer, size_t &bufferSize, int currentAudioSample) = 0;
+    virtual int getAudioSamples(uint8_t **buffer, size_t &bufferSize, int currentAudioSample) = 0;
 };
diff --git a/player/src/AudioSource/NetworkAudioSource.cpp b/player/src/AudioSource/NetworkAudioSource.cpp
@@ -11,14 +11,14 @@ NetworkAudioSource::NetworkAudioSource(NetworkChannelData *channelData): mChanne
 {
 }
 
-int NetworkAudioSource::getAudioSamples(int8_t **buffer, size_t &bufferSize, int currentAudioSample)
+int NetworkAudioSource::getAudioSamples(uint8_t **buffer, size_t &bufferSize, int currentAudioSample)
 {
   if (WiFi.status() == WL_CONNECTED)
   {
     // resize the buffer if needed
     if (bufferSize < SAMPLES_PER_CHUNK)
     {
-      *buffer = (int8_t *)realloc(*buffer, SAMPLES_PER_CHUNK);
+      *buffer = (uint8_t *)realloc(*buffer, SAMPLES_PER_CHUNK);
       bufferSize = SAMPLES_PER_CHUNK;
     }
     std::string url = mChannelData->getAudioURL() + "/" + std::to_string(currentAudioSample) + "/" + std::to_string(bufferSize);
diff --git a/player/src/AudioSource/NetworkAudioSource.h b/player/src/AudioSource/NetworkAudioSource.h
@@ -15,5 +15,5 @@ class NetworkAudioSource : public AudioSource
 
 public:
   NetworkAudioSource(NetworkChannelData *channelData);
-  int getAudioSamples(int8_t **buffer, size_t &bufferSize, int currentAudioSample);
+  int getAudioSamples(uint8_t **buffer, size_t &bufferSize, int currentAudioSample);
 };
diff --git a/player/src/AudioSource/SDCardAudioSource.cpp b/player/src/AudioSource/SDCardAudioSource.cpp
@@ -9,16 +9,12 @@ SDCardAudioSource::SDCardAudioSource(SDCardChannelData *channelData): mChannelDa
 {
 }
 
-int SDCardAudioSource::getAudioSamples(int8_t **buffer, size_t &bufferSize, int currentAudioSample)
+int SDCardAudioSource::getAudioSamples(uint8_t **buffer, size_t &bufferSize, int currentAudioSample)
 {
   // read the audio data into the buffer
   AVIParser *parser = mChannelData->getAudioParser();
   if (parser) {
     int audioLength = parser->getNextChunk((uint8_t **) buffer, bufferSize);
-    // conver the audio from unsigned to signed
-    for (int i = 0; i < audioLength; i++) {
-      (*buffer)[i] = ((uint8_t)(*buffer)[i]) - 128;
-    }
     return audioLength;
   }
   return 0;
diff --git a/player/src/AudioSource/SDCardAudioSource.h b/player/src/AudioSource/SDCardAudioSource.h
@@ -14,5 +14,5 @@ class SDCardAudioSource : public AudioSource
 
 public:
   SDCardAudioSource(SDCardChannelData *channelData);
-  int getAudioSamples(int8_t **buffer, size_t &bufferSize, int currentAudioSample);
+  int getAudioSamples(uint8_t **buffer, size_t &bufferSize, int currentAudioSample);
 };
diff --git a/player/src/VideoPlayer.cpp b/player/src/VideoPlayer.cpp
@@ -196,7 +196,7 @@ void VideoPlayer::framePlayerTask()
 void VideoPlayer::audioPlayerTask()
 {
   size_t bufferLength = 16000;
-  int8_t *audioData = (int8_t *)malloc(16000);
+  uint8_t *audioData = (uint8_t *)malloc(16000);
   while (true)
   {
     if (mState != VideoPlayerState::PLAYING)

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,13 @@`
`1`	`1`	`{`
`2`	`2`	`"files.associations": {`
`3`		`- "functional": "cpp"`
	`3`	`+ "functional": "cpp",`
	`4`	`+ "*.tcc": "cpp",`
	`5`	`+ "exception": "cpp",`
	`6`	`+ "fstream": "cpp",`
	`7`	`+ "iosfwd": "cpp",`
	`8`	`+ "new": "cpp",`
	`9`	`+ "ostream": "cpp",`
	`10`	`+ "sstream": "cpp",`
	`11`	`+ "streambuf": "cpp"`
`4`	`12`	`}`
`5`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ void I2SBase::stop()`
`21`	`21`	`i2s_driver_uninstall(m_i2s_port);`
`22`	`22`	`}`
`23`	`23`
`24`		`-void I2SBase::write(int8_t *samples, int count)`
	`24`	`+void I2SBase::write(uint8_t *samples, int count)`
`25`	`25`	`{`
`26`	`26`	`int sample_index = 0;`
`27`	`27`	`while (sample_index < count)`
`@@ -30,7 +30,7 @@ void I2SBase::write(int8_t *samples, int count)`
`30`	`30`	`for (int i = 0; i < NUM_FRAMES_TO_SEND && sample_index < count; i++)`
`31`	`31`	`{`
`32`	`32`	`// shift up to 16 bit samples`
`33`		`- int sample = process_sample((samples[sample_index] * mVolume / 10) << 8);`
	`33`	`+ int sample = process_sample(((samples[sample_index] - 128) * mVolume / 10) << 8);`
`34`	`34`	`m_tmp_frames[i * 2] = sample;`
`35`	`35`	`m_tmp_frames[i * 2 + 1] = sample;`
`36`	`36`	`samples_to_send++;`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ void PDMTimerOutput::start(uint32_t sample_rate)`
`83`	`83`	`Serial.println("PDM Started");`
`84`	`84`	`}`
`85`	`85`
`86`		`-void PDMTimerOutput::write(int8_t *samples, int count)`
	`86`	`+void PDMTimerOutput::write(uint8_t *samples, int count)`
`87`	`87`	`{`
`88`	`88`	`// Serial.printf("Count %d\n", mCount);`
`89`	`89`	`while (true)`
`@@ -97,7 +97,7 @@ void PDMTimerOutput::write(int8_t *samples, int count)`
`97`	`97`	`mSecondBuffer = (int8_t *)realloc(mSecondBuffer, count);`
`98`	`98`	`// copy them into the second buffer`
`99`	`99`	`for(int i = 0; i < count; i++) {`
`100`		`- mSecondBuffer[i] = samples[i] * mVolume / 10;`
	`100`	`+ mSecondBuffer[i] = (samples[i] - 128) * mVolume / 10;`
`101`	`101`	`}`
`102`	`102`	`// second buffer is now full of samples`
`103`	`103`	`mSecondBufferLength = count;`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class PDMTimerOutput : public AudioOutput`
`31`	`31`	`mBufferSemaphore = xSemaphoreCreateBinary();`
`32`	`32`	`xSemaphoreGive(mBufferSemaphore);`
`33`	`33`	`}`
`34`		`- void write(int8_t *samples, int count);`
	`34`	`+ void write(uint8_t *samples, int count);`
`35`	`35`	`void start(uint32_t sample_rate);`
`36`	`36`	`void stop() {}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ void PWMTimerOutput::start(uint32_t sample_rate)`
`19`	`19`	`{`
`20`	`20`	`mSampleRate = sample_rate;`
`21`	`21`
`22`		`- ledcSetup(0, 50000, 8);`
`23`		`- ledcAttachPin(mPDMPin, 0);`
	`22`	`+ ledcSetup(2, 32000, 11);`
	`23`	`+ ledcAttachPin(mPDMPin, 2);`
`24`	`24`
`25`	`25`	`// create a timer that will fire at the sample rate`
`26`	`26`	`timer_config_t timer_config = {`
`@@ -67,7 +67,7 @@ void PWMTimerOutput::start(uint32_t sample_rate)`
`67`	`67`	`Serial.println("PDM Started");`
`68`	`68`	`}`
`69`	`69`
`70`		`-void PWMTimerOutput::write(int8_t *samples, int count)`
	`70`	`+void PWMTimerOutput::write(uint8_t *samples, int count)`
`71`	`71`	`{`
`72`	`72`	`// Serial.printf("Count %d\n", mCount);`
`73`	`73`	`while (true)`
`@@ -78,10 +78,10 @@ void PWMTimerOutput::write(int8_t *samples, int count)`
`78`	`78`	`{`
`79`	`79`	`//Serial.println("Filling second buffer");`
`80`	`80`	`// make sure there's enough room for the samples`
`81`		`- mSecondBuffer = (int8_t *)realloc(mSecondBuffer, count);`
	`81`	`+ mSecondBuffer = (uint8_t *)realloc(mSecondBuffer, count);`
`82`	`82`	`// copy them into the second buffer`
`83`	`83`	`for(int i = 0; i < count; i++) {`
`84`		`- mSecondBuffer[i] = samples[i] * mVolume / 10;`
	`84`	`+ mSecondBuffer[i] = samples[i];`
`85`	`85`	`}`
`86`	`86`	`// second buffer is now full of samples`
`87`	`87`	`mSecondBufferLength = count;`
`@@ -103,9 +103,9 @@ void PWMTimerOutput::onTimer()`
`103`	`103`	`{`
`104`	`104`	`mCount++;`
`105`	`105`	`// get the first sample from the buffer`
`106`		`- int16_t sample = mBuffer[mCurrentIndex];`
	`106`	`+ uint32_t sample = (uint32_t(mBuffer[mCurrentIndex]) << 3);`
`107`	`107`	`mCurrentIndex++;`
`108`		`- ledcWrite(0, sample+128);`
	`108`	`+ ledcWrite(2, sample * mVolume / 10);`
`109`	`109`	`}`
`110`	`110`	`if(mCurrentIndex >= mBufferLength)`
`111`	`111`	`{`
`@@ -115,7 +115,7 @@ void PWMTimerOutput::onTimer()`
`115`	`115`	`{`
`116`	`116`	`if (mSecondBufferLength > 0) {`
`117`	`117`	`// swap the buffers`
`118`		`- int8_t *tmp = mBuffer;`
	`118`	`+ uint8_t *tmp = mBuffer;`
`119`	`119`	`mBuffer = mSecondBuffer;`
`120`	`120`	`mBufferLength = mSecondBufferLength;`
`121`	`121`	`mSecondBuffer = tmp;`
Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,14 @@ NetworkAudioSource::NetworkAudioSource(NetworkChannelData *channelData): mChanne`
`11`	`11`	`{`
`12`	`12`	`}`
`13`	`13`
`14`		`-int NetworkAudioSource::getAudioSamples(int8_t **buffer, size_t &bufferSize, int currentAudioSample)`
	`14`	`+int NetworkAudioSource::getAudioSamples(uint8_t **buffer, size_t &bufferSize, int currentAudioSample)`
`15`	`15`	`{`
`16`	`16`	`if (WiFi.status() == WL_CONNECTED)`
`17`	`17`	`{`
`18`	`18`	`// resize the buffer if needed`
`19`	`19`	`if (bufferSize < SAMPLES_PER_CHUNK)`
`20`	`20`	`{`
`21`		`- buffer = (int8_t )realloc(*buffer, SAMPLES_PER_CHUNK);`
	`21`	`+ buffer = (uint8_t )realloc(*buffer, SAMPLES_PER_CHUNK);`
`22`	`22`	`bufferSize = SAMPLES_PER_CHUNK;`
`23`	`23`	`}`
`24`	`24`	`std::string url = mChannelData->getAudioURL() + "/" + std::to_string(currentAudioSample) + "/" + std::to_string(bufferSize);`