comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-26 13:48:38 -05:00
Code Issues Projects Releases Wiki Activity

Add stereo re-sampler

Browse Source
This commit is contained in:
Charles J. Cliffe 2014-12-26 21:55:13 -05:00
parent 0fc47bc916
commit 44602303a7
7 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/audio/AudioThread.cpp
View File

@ -112,7 +112,7 @@ static int audioCallback(void *outputBuffer, void *inputBuffer, unsigned int nBu
srcmix->audio_queue_ptr++; srcmix->audio_queue_ptr++;
} }
} else { } else {
for (int i = 0, iMax = src->currentInput->channels * nBufferFrames; i < iMax; i++) { for (int i = 0, iMax = srcmix->currentInput->channels * nBufferFrames; i < iMax; i++) {
if (srcmix->audio_queue_ptr >= srcmix->currentInput->data.size()) { if (srcmix->audio_queue_ptr >= srcmix->currentInput->data.size()) {
if (srcmix->currentInput) { if (srcmix->currentInput) {
srcmix->currentInput->decRefCount(); srcmix->currentInput->decRefCount();

3
src/demod/DemodDefs.h
View File

@ -73,11 +73,12 @@ public:
int bandwidth; int bandwidth;
float audio_resample_ratio; float audio_resample_ratio;
msresamp_rrrf audio_resampler; msresamp_rrrf audio_resampler;
msresamp_rrrf stereo_resampler;
float resample_ratio; float resample_ratio;
msresamp_crcf resampler; msresamp_crcf resampler;
DemodulatorThreadPostIQData() : DemodulatorThreadPostIQData() :
bandwidth(0), audio_resample_ratio(0), audio_resampler(NULL), resample_ratio(0), resampler(NULL) { bandwidth(0), audio_resample_ratio(0), audio_resampler(NULL), stereo_resampler(NULL), resample_ratio(0), resampler(NULL) {
} }

10
src/demod/DemodulatorPreThread.cpp
View File

@ -9,7 +9,7 @@
DemodulatorPreThread::DemodulatorPreThread(DemodulatorThreadInputQueue* pQueueIn, DemodulatorThreadPostInputQueue* pQueueOut, DemodulatorPreThread::DemodulatorPreThread(DemodulatorThreadInputQueue* pQueueIn, DemodulatorThreadPostInputQueue* pQueueOut,
DemodulatorThreadControlCommandQueue *threadQueueControl, DemodulatorThreadCommandQueue* threadQueueNotify) : DemodulatorThreadControlCommandQueue *threadQueueControl, DemodulatorThreadCommandQueue* threadQueueNotify) :
inputQueue(pQueueIn), postInputQueue(pQueueOut), terminated(false), initialized(false), audio_resampler(NULL), resample_ratio(1), audio_resample_ratio( inputQueue(pQueueIn), postInputQueue(pQueueOut), terminated(false), initialized(false), audio_resampler(NULL), stereo_resampler(NULL), resample_ratio(1), audio_resample_ratio(
1), resampler(NULL), commandQueue(NULL), fir_filter(NULL), audioInputQueue(NULL), threadQueueNotify(threadQueueNotify), threadQueueControl( 1), resampler(NULL), commandQueue(NULL), fir_filter(NULL), audioInputQueue(NULL), threadQueueNotify(threadQueueNotify), threadQueueControl(
threadQueueControl) { threadQueueControl) {
@ -71,6 +71,12 @@ void DemodulatorPreThread::initialize() {
audio_resampler = msresamp_rrrf_create(audio_resample_ratio, As); audio_resampler = msresamp_rrrf_create(audio_resample_ratio, As);
// msresamp_crcf_print(audio_resampler); // msresamp_crcf_print(audio_resampler);
if (stereo_resampler) {
msresamp_rrrf_destroy(stereo_resampler);
}
stereo_resampler = msresamp_rrrf_create(audio_resample_ratio, As);
initialized = true; initialized = true;
// std::cout << "inputResampleRate " << params.bandwidth << std::endl; // std::cout << "inputResampleRate " << params.bandwidth << std::endl;
@ -217,6 +223,7 @@ void DemodulatorPreThread::threadMain() {
resamp->audio_resample_ratio = audio_resample_ratio; resamp->audio_resample_ratio = audio_resample_ratio;
resamp->audio_resampler = audio_resampler; resamp->audio_resampler = audio_resampler;
resamp->stereo_resampler = stereo_resampler;
resamp->resample_ratio = resample_ratio; resamp->resample_ratio = resample_ratio;
resamp->resampler = resampler; resamp->resampler = resampler;
resamp->bandwidth = params.bandwidth; resamp->bandwidth = params.bandwidth;
@ -240,6 +247,7 @@ void DemodulatorPreThread::threadMain() {
fir_filter = result.fir_filter; fir_filter = result.fir_filter;
resampler = result.resampler; resampler = result.resampler;
audio_resampler = result.audio_resampler; audio_resampler = result.audio_resampler;
stereo_resampler = result.stereo_resampler;
resample_ratio = result.resample_ratio; resample_ratio = result.resample_ratio;
audio_resample_ratio = result.audio_resample_ratio; audio_resample_ratio = result.audio_resample_ratio;

1
src/demod/DemodulatorPreThread.h
View File

@ -57,6 +57,7 @@ protected:
float resample_ratio; float resample_ratio;
msresamp_rrrf audio_resampler; msresamp_rrrf audio_resampler;
msresamp_rrrf stereo_resampler;
float audio_resample_ratio; float audio_resample_ratio;
DemodulatorThreadParameters params; DemodulatorThreadParameters params;

11
src/demod/DemodulatorThread.cpp
View File

@ -31,6 +31,7 @@ void DemodulatorThread::threadMain() {
#endif #endif
msresamp_rrrf audio_resampler = NULL; msresamp_rrrf audio_resampler = NULL;
msresamp_rrrf stereo_resampler = NULL;
msresamp_crcf resampler = NULL; msresamp_crcf resampler = NULL;
agc = agc_crcf_create(); agc = agc_crcf_create();
@ -65,11 +66,14 @@ void DemodulatorThread::threadMain() {
if (resampler == NULL) { if (resampler == NULL) {
resampler = inp->resampler; resampler = inp->resampler;
audio_resampler = inp->audio_resampler; audio_resampler = inp->audio_resampler;
stereo_resampler = inp->stereo_resampler;
} else if (resampler != inp->resampler) { } else if (resampler != inp->resampler) {
msresamp_crcf_destroy(resampler); msresamp_crcf_destroy(resampler);
msresamp_rrrf_destroy(audio_resampler); msresamp_rrrf_destroy(audio_resampler);
msresamp_rrrf_destroy(stereo_resampler);
resampler = inp->resampler; resampler = inp->resampler;
audio_resampler = inp->audio_resampler; audio_resampler = inp->audio_resampler;
stereo_resampler = inp->stereo_resampler;
} }
int out_size = ceil((float) (bufSize) * inp->resample_ratio); int out_size = ceil((float) (bufSize) * inp->resample_ratio);
@ -108,7 +112,7 @@ void DemodulatorThread::threadMain() {
for (int i = 0; i < num_written; i++) { for (int i = 0; i < num_written; i++) {
freq_index+=freq; freq_index+=freq;
demod_output_stereo[i] = demod_output[i] * sin(freq_index) + demod_output[i] * cos(freq_index); demod_output_stereo[i] = demod_output[i] * sin(freq_index);// + demod_output[i] * cos(freq_index);
while (freq_index > (M_PI*2.0)) { while (freq_index > (M_PI*2.0)) {
freq_index -= (M_PI*2.0); freq_index -= (M_PI*2.0);
} }
@ -133,7 +137,7 @@ void DemodulatorThread::threadMain() {
msresamp_rrrf_execute(audio_resampler, &demod_output[0], num_written, &resampled_audio_output[0], &num_audio_written); msresamp_rrrf_execute(audio_resampler, &demod_output[0], num_written, &resampled_audio_output[0], &num_audio_written);
if (stereo) { if (stereo) {
msresamp_rrrf_execute(audio_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);
} }
if (audioInputQueue != NULL) { if (audioInputQueue != NULL) {
@ -222,6 +226,9 @@ void DemodulatorThread::threadMain() {
if (audio_resampler != NULL) { if (audio_resampler != NULL) {
msresamp_rrrf_destroy(audio_resampler); msresamp_rrrf_destroy(audio_resampler);
} }
if (stereo_resampler != NULL) {
msresamp_rrrf_destroy(stereo_resampler);
}
agc_crcf_destroy(agc); agc_crcf_destroy(agc);

1
src/demod/DemodulatorWorkerThread.cpp
View File

@ -59,6 +59,7 @@ void DemodulatorWorkerThread::threadMain() {
result.fir_filter = firfilt_crcf_create(h, h_len); result.fir_filter = firfilt_crcf_create(h, h_len);
result.resampler = msresamp_crcf_create(result.resample_ratio, As); result.resampler = msresamp_crcf_create(result.resample_ratio, As);
result.audio_resampler = msresamp_rrrf_create(result.audio_resample_ratio, As); result.audio_resampler = msresamp_rrrf_create(result.audio_resample_ratio, As);
result.stereo_resampler = msresamp_rrrf_create(result.audio_resample_ratio, As);
result.audioSampleRate = filterCommand.audioSampleRate; result.audioSampleRate = filterCommand.audioSampleRate;
result.bandwidth = filterCommand.bandwidth; result.bandwidth = filterCommand.bandwidth;

5
src/demod/DemodulatorWorkerThread.h
View File

@ -22,13 +22,13 @@ public:
}; };
DemodulatorWorkerThreadResult() : DemodulatorWorkerThreadResult() :
cmd(DEMOD_WORKER_THREAD_RESULT_NULL), fir_filter(NULL), resampler(NULL), resample_ratio(0), audio_resampler(NULL), audio_resample_ratio( cmd(DEMOD_WORKER_THREAD_RESULT_NULL), fir_filter(NULL), resampler(NULL), resample_ratio(0), audio_resampler(NULL), stereo_resampler(NULL), audio_resample_ratio(
0), inputRate(0), bandwidth(0), audioSampleRate(0) { 0), inputRate(0), bandwidth(0), audioSampleRate(0) {
} }
DemodulatorWorkerThreadResult(DemodulatorThreadResultEnum cmd) : DemodulatorWorkerThreadResult(DemodulatorThreadResultEnum cmd) :
cmd(cmd), fir_filter(NULL), resampler(NULL), resample_ratio(0), audio_resampler(NULL), audio_resample_ratio(0), inputRate(0), bandwidth( cmd(cmd), fir_filter(NULL), resampler(NULL), resample_ratio(0), audio_resampler(NULL), stereo_resampler(NULL), audio_resample_ratio(0), inputRate(0), bandwidth(
0), audioSampleRate(0) { 0), audioSampleRate(0) {
} }
@ -39,6 +39,7 @@ public:
msresamp_crcf resampler; msresamp_crcf resampler;
float resample_ratio; float resample_ratio;
msresamp_rrrf audio_resampler; msresamp_rrrf audio_resampler;
msresamp_rrrf stereo_resampler;
float audio_resample_ratio; float audio_resample_ratio;
unsigned int inputRate; unsigned int inputRate;