ThaiSDR/EasyMPX
1
0
Fork 0
mirror of https://github.com/damp11113/EasyMPX.git synced 2025-04-27 22:48:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

better generate stereo

Browse Source
This commit is contained in:
dharm pimsen 2024-01-08 18:01:52 +07:00
parent 91bc012286
commit 4a0ecf6113
2 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
FMPX generator/FMPX generator.cpp
View File

@ -89,7 +89,7 @@ int main() {
SignalGenerator::GenerateSineWave(piloToneBuffer, framesPerBuffer, 19000, 0.08f); SignalGenerator::GenerateSineWave(piloToneBuffer, framesPerBuffer, 19000, 0.08f);
SignalGenerator::GenerateSineWave(stereoToneBuffer, framesPerBuffer, 38000, 1); SignalGenerator::GenerateSineWave(stereoToneBuffer, framesPerBuffer, 38000, 1);
std::cout << "MPX encoder is running" << std::endl;
while (true) { while (true) {
err = Pa_ReadStream(inputStream, buffer, framesPerBuffer); err = Pa_ReadStream(inputStream, buffer, framesPerBuffer);
@ -97,32 +97,17 @@ int main() {
std::cout << "PortAudio input stream error: " << Pa_GetErrorText(err) << std::endl; std::cout << "PortAudio input stream error: " << Pa_GetErrorText(err) << std::endl;
break; break;
} }
// audio processing
//AudioBuffer audio{ buffer, framesPerBuffer * inputParameters.channelCount }; //AudioBuffer audio{ buffer, framesPerBuffer * inputParameters.channelCount };
//multibandCompressor(audio, bands); //multibandCompressor(audio, bands);
//limiterProcess(buffer, framesPerBuffer, limiter);
// Normalize the output to prevent extreme volume fluctuations
//LowPassFilter filter(192000, 15000, 64); //LowPassFilter filter(192000, 15000, 64);
//filter.apply(buffer, framesPerBuffer); //filter.apply(buffer, framesPerBuffer);
float maxSample = 1.0f;
for (int i = 0; i < framesPerBuffer * inputParameters.channelCount; ++i) {
if (fabsf(buffer[i]) > maxSample) {
maxSample = fabsf(buffer[i]);
}
}
if (maxSample > 1.0f) {
for (int i = 0; i < framesPerBuffer * inputParameters.channelCount; ++i) {
buffer[i] /= maxSample;
}
}
// Merge stereo channels into mono // MPX Processing here
float* monoBuffer = new float[framesPerBuffer]; float* monoBuffer = new float[framesPerBuffer];
float* subtractBuffer = new float[framesPerBuffer]; float* subtractBuffer = new float[framesPerBuffer];
float* stereoMultipledBuffer = new float[framesPerBuffer]; float* stereoMultipledBuffer = new float[framesPerBuffer];
@ -137,13 +122,40 @@ int main() {
for (int i = 0; i < framesPerBuffer; ++i) { for (int i = 0; i < framesPerBuffer; ++i) {
stereoMultipledBuffer[i] = stereoToneBuffer[i] * subtractBuffer[i]; stereoMultipledBuffer[i] = stereoToneBuffer[i] * subtractBuffer[i];
} }
// limit mono signal
float maxSample = 2.0f;
for (int i = 0; i < framesPerBuffer; ++i) {
if (fabsf(monoBuffer[i]) > maxSample) {
maxSample = fabsf(monoBuffer[i]);
}
}
if (maxSample > 1.0f) {
for (int i = 0; i < framesPerBuffer; ++i) {
monoBuffer[i] /= maxSample;
}
}
// limit mono signal
float maxSample2 = 2.5f;
for (int i = 0; i < framesPerBuffer; ++i) {
if (fabsf(stereoMultipledBuffer[i]) > maxSample2) {
maxSample2 = fabsf(stereoMultipledBuffer[i]);
}
}
if (maxSample2 > 1.0f) {
for (int i = 0; i < framesPerBuffer; ++i) {
stereoMultipledBuffer[i] /= maxSample2;
}
}
// mix mpx
const float* mixbuffers[3] = {monoBuffer, piloToneBuffer, stereoMultipledBuffer };
mix(mixedBuffer, mixbuffers, 3, framesPerBuffer);
const float* mixbuffers[3] = {monoBuffer, piloToneBuffer, stereoMultipledBuffer };
mix(mixedBuffer, mixbuffers, 3, framesPerBuffer);
err = Pa_WriteStream(outputStream, mixedBuffer, framesPerBuffer); err = Pa_WriteStream(outputStream, mixedBuffer, framesPerBuffer);

2
FMPX generator/PaFilterFunc.cpp
View File

@ -37,4 +37,4 @@ void LowPassFilter::apply(float* buffer, int bufferSize) {
buffer[i] = static_cast<float>(output); buffer[i] = static_cast<float>(output);
} }
} }