comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-29 23:28:39 -05:00
Code Issues Projects Releases Wiki Activity

Cleanup, stereo audio thread memory leak fix

Browse Source
This commit is contained in:
Charles J. Cliffe 2014-12-27 12:45:21 -05:00
parent 376ddfad98
commit 5e9414702d
4 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio/AudioThread.cpp
View File

@ -191,6 +191,10 @@ static int audioCallback(void *outputBuffer, void *inputBuffer, unsigned int nBu
} else { } else {
for (int i = 0, iMax = src->currentInput->channels * nBufferFrames; i < iMax; i++) { for (int i = 0, iMax = src->currentInput->channels * nBufferFrames; i < iMax; i++) {
if (src->audio_queue_ptr >= src->currentInput->data.size()) { if (src->audio_queue_ptr >= src->currentInput->data.size()) {
if (src->currentInput) {
src->currentInput->decRefCount();
src->currentInput = NULL;
}
if (src->terminated) { if (src->terminated) {
return 1; return 1;
} }

51
src/demod/DemodulatorThread.cpp
View File

@ -34,12 +34,12 @@ void DemodulatorThread::threadMain() {
msresamp_rrrf stereo_resampler = NULL; msresamp_rrrf stereo_resampler = NULL;
msresamp_crcf resampler = NULL; msresamp_crcf resampler = NULL;
unsigned int m=5; // filter semi-length unsigned int m = 5; // filter semi-length
float slsl=60.0f; // filter sidelobe suppression level float slsl = 60.0f; // filter sidelobe suppression level
liquid_float_complex x, y; liquid_float_complex x, y;
firhilbf firR2C = firhilbf_create(m,slsl); firhilbf firR2C = firhilbf_create(m, slsl);
firhilbf firC2R = firhilbf_create(m,slsl); firhilbf firC2R = firhilbf_create(m, slsl);
nco_crcf nco_shift = nco_crcf_create(LIQUID_NCO); nco_crcf nco_shift = nco_crcf_create(LIQUID_NCO);
float shift_freq = 0; float shift_freq = 0;
@ -107,15 +107,31 @@ void DemodulatorThread::threadMain() {
if (demod_output.size() != num_written) { if (demod_output.size() != num_written) {
if (demod_output.capacity() < num_written) { if (demod_output.capacity() < num_written) {
demod_output.reserve(num_written); demod_output.reserve(num_written);
demod_output_stereo.reserve(num_written);
} }
demod_output.resize(num_written); demod_output.resize(num_written);
demod_output_stereo.resize(num_written);
} }
int audio_out_size = ceil((float) (num_written) * audio_resample_ratio);
freqdem_demodulate_block(fdem, &agc_data[0], num_written, &demod_output[0]); freqdem_demodulate_block(fdem, &agc_data[0], num_written, &demod_output[0]);
if (audio_out_size != resampled_audio_output.size()) {
if (resampled_audio_output.capacity() < audio_out_size) {
resampled_audio_output.reserve(audio_out_size);
}
resampled_audio_output.resize(audio_out_size);
}
unsigned int num_audio_written;
msresamp_rrrf_execute(audio_resampler, &demod_output[0], num_written, &resampled_audio_output[0], &num_audio_written);
if (stereo) { if (stereo) {
if (demod_output_stereo.size() != num_written) {
if (demod_output_stereo.capacity() < num_written) {
demod_output_stereo.reserve(num_written);
}
demod_output_stereo.resize(num_written);
}
double freq = (2.0 * M_PI) * (((float) abs(38000)) / ((float) inp->bandwidth)); double freq = (2.0 * M_PI) * (((float) abs(38000)) / ((float) inp->bandwidth));
@ -124,30 +140,20 @@ void DemodulatorThread::threadMain() {
shift_freq = freq; shift_freq = freq;
} }
for (int i = 0; i < num_written; i++) { for (int i = 0; i < num_written; i++) {
firhilbf_r2c_execute(firR2C,demod_output[i],&x); firhilbf_r2c_execute(firR2C, demod_output[i], &x);
nco_crcf_mix_down(nco_shift, x, &y); nco_crcf_mix_down(nco_shift, x, &y);
nco_crcf_step(nco_shift); nco_crcf_step(nco_shift);
firhilbf_c2r_execute(firR2C,y,&demod_output_stereo[i]); firhilbf_c2r_execute(firR2C, y, &demod_output_stereo[i]);
}
} }
int audio_out_size = ceil((float) (num_written) * audio_resample_ratio); if (audio_out_size != resampled_audio_output_stereo.size()) {
if (resampled_audio_output_stereo.capacity() < audio_out_size) {
if (audio_out_size != resampled_audio_output.size()) {
if (resampled_audio_output.capacity() < audio_out_size) {
resampled_audio_output.reserve(audio_out_size);
resampled_audio_output_stereo.reserve(audio_out_size); resampled_audio_output_stereo.reserve(audio_out_size);
} }
resampled_audio_output.resize(audio_out_size);
resampled_audio_output_stereo.resize(audio_out_size); resampled_audio_output_stereo.resize(audio_out_size);
} }
unsigned int num_audio_written;
msresamp_rrrf_execute(audio_resampler, &demod_output[0], num_written, &resampled_audio_output[0], &num_audio_written);
if (stereo) {
msresamp_rrrf_execute(stereo_resampler, &demod_output_stereo[0], num_written, &resampled_audio_output_stereo[0], &num_audio_written); msresamp_rrrf_execute(stereo_resampler, &demod_output_stereo[0], num_written, &resampled_audio_output_stereo[0], &num_audio_written);
} }
@ -171,6 +177,9 @@ void DemodulatorThread::threadMain() {
if (stereo) { if (stereo) {
ati->channels = 2; ati->channels = 2;
if (ati->data.capacity() < (num_audio_written * 2)) {
ati->data.reserve(num_audio_written * 2);
}
ati->data.resize(num_audio_written * 2); ati->data.resize(num_audio_written * 2);
for (int i = 0; i < num_audio_written; i++) { for (int i = 0; i < num_audio_written; i++) {
ati->data[i * 2] = (resampled_audio_output[i] - (resampled_audio_output_stereo[i])); ati->data[i * 2] = (resampled_audio_output[i] - (resampled_audio_output_stereo[i]));
@ -197,7 +206,7 @@ void DemodulatorThread::threadMain() {
stereoSize = DEMOD_VIS_SIZE; stereoSize = DEMOD_VIS_SIZE;
} }
ati_vis->data.resize(stereoSize); ati_vis->data.resize(stereoSize);
ati_vis->channels = stereo?2:1; ati_vis->channels = stereo ? 2 : 1;
for (int i = 0; i < stereoSize / 2; i++) { for (int i = 0; i < stereoSize / 2; i++) {
ati_vis->data[i] = (resampled_audio_output[i] - (resampled_audio_output_stereo[i])); ati_vis->data[i] = (resampled_audio_output[i] - (resampled_audio_output_stereo[i]));

2
src/visual/SpectrumCanvas.cpp
View File

@ -102,7 +102,7 @@ void SpectrumCanvas::setData(std::vector<liquid_float_complex> *data) {
double b = out[n][1]; double b = out[n][1];
double c = sqrt(a * a + b * b); double c = sqrt(a * a + b * b);
n = (i == FFT_SIZE / 2) ? (FFT_SIZE / 2 + 1) : i; // n = (i == FFT_SIZE / 2) ? (FFT_SIZE / 2 + 1) : i;
double x = out[FFT_SIZE / 2 + n][0]; double x = out[FFT_SIZE / 2 + n][0];
double y = out[FFT_SIZE / 2 + n][1]; double y = out[FFT_SIZE / 2 + n][1];
double z = sqrt(x * x + y * y); double z = sqrt(x * x + y * y);

2
src/visual/WaterfallCanvas.cpp
View File

@ -245,7 +245,7 @@ void WaterfallCanvas::setData(std::vector<liquid_float_complex> *data) {
double b = out[n][1]; double b = out[n][1];
double c = sqrt(a * a + b * b); double c = sqrt(a * a + b * b);
n = (i == FFT_SIZE / 2) ? (FFT_SIZE / 2 + 1) : i; // n = (i == FFT_SIZE / 2) ? (FFT_SIZE / 2 + 1) : i;
double x = out[FFT_SIZE / 2 + n][0]; double x = out[FFT_SIZE / 2 + n][0];
double y = out[FFT_SIZE / 2 + n][1]; double y = out[FFT_SIZE / 2 + n][1];
double z = sqrt(x * x + y * y); double z = sqrt(x * x + y * y);