comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-27 06:08:37 -05:00
Code Issues Projects Releases Wiki Activity

Implementing digital data buffer with vectors

Browse Source
This commit is contained in:
Dantali0n 2015-06-29 21:55:21 +02:00
parent cac5d0b9ea
commit 74255606df
2 changed files with 51 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/demod/DemodulatorThread.cpp
View File

@ -218,6 +218,22 @@ void DemodulatorThread::threadMain() {
demodOutputData.resize(bufSize); demodOutputData.resize(bufSize);
} }
if (demodOutputDataDigital.size() != bufSize) {
if (demodOutputDataDigital.capacity() < bufSize) {
demodOutputDataDigital.reserve(bufSize);
}
demodOutputDataDigital.resize(bufSize);
}
/*
if (demodOutputDataDigitalTest.size() != bufSize) {
if (demodOutputDataDigitalTest.capacity() < bufSize) {
demodOutputDataDigitalTest.reserve(bufSize);
}
demodOutputDataDigitalTest.resize(bufSize);
}
*/
int audio_out_size = ceil((double) (bufSize) * audio_resample_ratio) + 512; int audio_out_size = ceil((double) (bufSize) * audio_resample_ratio) + 512;
agc_crcf_execute_block(iqAutoGain, &(inp->data[0]), bufSize, &agcData[0]); agc_crcf_execute_block(iqAutoGain, &(inp->data[0]), bufSize, &agcData[0]);
@ -234,7 +250,10 @@ void DemodulatorThread::threadMain() {
updateDemodulatorCons(0); updateDemodulatorCons(0);
// create digital output buffer // create digital output buffer
demodOutputDataDigital = new unsigned int[bufSize]; //demodOutputDataDigital = new unsigned int[bufSize];
//demodOutputDataDigitalTest = new unsigned int[bufSize];
//demodOutputSoftbits = new unsigned char[bufSize];
//demodOutputSoftbitsTest = new unsigned char[bufSize];
if (demodulatorType == DEMOD_TYPE_FM) { if (demodulatorType == DEMOD_TYPE_FM) {
currentDemodLock = false; currentDemodLock = false;
@ -581,12 +600,14 @@ void DemodulatorThread::threadMain() {
updateDemodulatorLock(demodQAM, 0.5f); updateDemodulatorLock(demodQAM, 0.5f);
break; break;
case DEMOD_TYPE_QPSK: case DEMOD_TYPE_QPSK:
for (int i = 0; i < bufSize; i++) { freqdem_demodulate_block(demodFM, &agcData[0], bufSize, &demodOutputData[0]);
for (int i = 0; i < bufSize; i++) {
//modem_demodulate(demodQPSK, inp->data[i], &demodOutputDataDigitalTest[i]);
modem_demodulate(demodQPSK, inp->data[i], &demodOutputDataDigital[i]); modem_demodulate(demodQPSK, inp->data[i], &demodOutputDataDigital[i]);
// std::cout << bitstream << std::endl; }
}
// std::cout << bitstream << std::endl;
updateDemodulatorLock(demodQPSK, 0.8f); updateDemodulatorLock(demodQPSK, 0.8f);
break; break;
} }
@ -618,9 +639,27 @@ void DemodulatorThread::threadMain() {
unsigned int numAudioWritten; unsigned int numAudioWritten;
msresamp_rrrf_execute(audioResampler, &demodOutputData[0], bufSize, &resampledOutputData[0], &numAudioWritten); msresamp_rrrf_execute(audioResampler, &demodOutputData[0], bufSize, &resampledOutputData[0], &numAudioWritten);
/*
if (demodulatorType.load() == DEMOD_TYPE_QPSK) {
if (!std::equal(demodOutputDataDigitalTest, demodOutputDataDigitalTest + sizeof demodOutputDataDigitalTest / sizeof *demodOutputDataDigitalTest, demodOutputDataDigital)) {
if (!std::equal(demodOutputSoftbitsTest, demodOutputSoftbitsTest + sizeof demodOutputSoftbitsTest / sizeof *demodOutputSoftbitsTest, demodOutputSoftbits)) {
std::cout << "Data not equal?!" << std::endl;
for (int i = 0; i < bufSize; i++) {
std::cout << std::to_string(demodOutputDataDigitalTest[i]) + std::to_string(demodOutputDataDigital[i]) << std::endl;
std::cout << std::to_string(demodOutputSoftbitsTest[i]) + std::to_string(demodOutputSoftbits[i]) << std::endl;
}
terminated = true;
}
}
// destroy the digital buffer // destroy the digital buffer
delete[] demodOutputDataDigital; delete[] demodOutputDataDigital;
delete[] demodOutputDataDigitalTest;
delete[] demodOutputSoftbits;
delete[] demodOutputSoftbitsTest;
}
*/
if (stereo) { if (stereo) {
if (demodStereoData.size() != bufSize) { if (demodStereoData.size() != bufSize) {

6
src/demod/DemodulatorThread.h
View File

@ -61,7 +61,11 @@ protected:
std::vector<float> resampledOutputData; std::vector<float> resampledOutputData;
std::vector<float> resampledStereoData; std::vector<float> resampledStereoData;
unsigned int *demodOutputDataDigital; std::vector<unsigned int> demodOutputDataDigital;
//std::vector<unsigned int> demodOutputDataDigitalTest;
//std::vector<unsigned char> demodOutputSoftbits;
//std::vector<unsigned char> demodOutputSoftbitsTest;
DemodulatorThreadPostInputQueue* iqInputQueue; DemodulatorThreadPostInputQueue* iqInputQueue;
DemodulatorThreadOutputQueue* audioVisOutputQueue; DemodulatorThreadOutputQueue* audioVisOutputQueue;