piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use saturated sample addition

Browse Source
This commit is contained in:
raphaelcoeffic
2025-01-17 13:30:49 +01:00
committed by Raphael Coeffic
parent d4ac6e2c07
commit 0c5b15121f
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/audio.cpp
+9 -2
View File
@@ -382,9 +382,16 @@ void audioTask(void * pdata)
}
#endif
inline void mixSample(audio_data_t * result, int sample, unsigned int fade)
#if !defined(__SSAT)
#define _sat_s16(x) ((int16_t)limit<int32_t>(INT16_MIN, (x), INT16_MAX))
#else
#define _sat_s16(x) __SSAT((x), 16)
#endif
inline void mixSample(audio_data_t * result, int16_t sample, unsigned int fade)
{
*result += (sample >> fade);
int32_t tmp = (int32_t)*result + ((int32_t)sample >> fade);
*result = (audio_data_t)_sat_s16(tmp);
}
#define RIFF_CHUNK_SIZE 12
radio/src/targets/simu/simpgmspace.cpp
+5 -3
View File
@@ -285,10 +285,12 @@ void audioSetVolume(uint8_t volume)
#if defined(SIMU_AUDIO)
void copyBuffer(void* dest, const int16_t* buff, unsigned samples)
{
int16_t* i16_dst = (int16_t*)dest;
for (unsigned i = 0; i < samples; i++) {
int16_t sample = buff[i];
*((int16_t*)dest) = (int16_t)((sample * simuAudio.currentVolume) / 127);
dest = (int16_t*)dest + 1;
int32_t sample = (((int32_t)buff[i] * (int32_t)simuAudio.currentVolume) / 127);
if (sample > INT16_MAX) sample = INT16_MAX;
else if (sample < INT16_MIN) sample = INT16_MIN;
*(i16_dst++) = (int16_t)sample;
}
}