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

Better comments on CF32 format coming out of SoapySDR

Browse Source
This commit is contained in:
vsonnier 2017-03-10 19:12:54 +01:00
parent 97639d1d09
commit 772e24fdb3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/sdr/SoapySDRThread.cpp
View File

@ -222,9 +222,10 @@ void SDRThread::readStream(SDRThreadIQDataQueue* iqDataOutQueue) {
//Copy at most n_requested CF32 into inpBuffer.data liquid_float_complex, //Copy at most n_requested CF32 into inpBuffer.data liquid_float_complex,
//starting at n_read position. //starting at n_read position.
//inspired from SoapyRTLSDR code, this mysterious void** is indeed an array of CF32(real/imag) samples, //inspired from SoapyRTLSDR code, this mysterious void** is indeed an array of CF32(real/imag) samples, indeed an array of
//so interpret as a flat (float) array. There is indeed no garanteed that sizeof(liquid_float_complex) = sizeof ("CF32") //float with the following layout [sample 1 real part , sample 1 imag part, sample 2 real part , sample 2 imag part,sample 3 real part , sample 3 imag part,...etc]
//nor that the Re/Im order of fields is the one expected. (hence the swap I/Q option !) //Since there is indeed no garantee that sizeof(liquid_float_complex) = 2 * sizeof (float)
//nor that the Re/Im layout of fields matches the float array order, assign liquid_float_complex field by field.
float *pp = (float *)buffs[0]; float *pp = (float *)buffs[0];
for (int i = 0; i < n_requested; i++) { for (int i = 0; i < n_requested; i++) {
@ -234,11 +235,11 @@ void SDRThread::readStream(SDRThreadIQDataQueue* iqDataOutQueue) {
numOverflow = n_stream_read-n_requested; numOverflow = n_stream_read-n_requested;
//shift of n_requested * CF32 samples //shift of n_requested samples, each one made of 2 floats...
pp += n_requested * 2; pp += n_requested * 2;
//so push the remainder samples to overflowBuffer: //so push the remainder samples to overflowBuffer:
for (int i = 0; i < numOverflow; i++) { for (int i = 0; i < numOverflow; i++) {
overflowBuffer.data[i].real = pp[2 * i]; // suppose the real part comes first. overflowBuffer.data[i].real = pp[2 * i];
overflowBuffer.data[i].imag = pp[2 * i + 1]; overflowBuffer.data[i].imag = pp[2 * i + 1];
} }
n_read += n_requested; n_read += n_requested;
@ -247,7 +248,7 @@ void SDRThread::readStream(SDRThreadIQDataQueue* iqDataOutQueue) {
float *pp = (float *)buffs[0]; float *pp = (float *)buffs[0];
for (int i = 0; i < n_stream_read; i++) { for (int i = 0; i < n_stream_read; i++) {
inpBuffer.data[n_read + i].real = pp[2 * i]; // suppose the real part comes first. inpBuffer.data[n_read + i].real = pp[2 * i];
inpBuffer.data[n_read + i].imag = pp[2 * i + 1]; inpBuffer.data[n_read + i].imag = pp[2 * i + 1];
} }