mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2024-11-10 04:37:37 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

more work on network source and syntax cleanup in iq exporter

Browse Source
This commit is contained in:
AlexandreRouma 2024-02-13 03:11:37 +01:00
parent 34171d4edc
commit 95052c34ff
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc_modules/iq_exporter/src/main.cpp
View File

@ -509,7 +509,7 @@ private:
size = sizeof(int16_t)*2;
break;
case SAMPLE_TYPE_INT32:
volk_32f_s32f_convert_32i((int32_t*)_this->buffer, (float*)data, (float)2147483647.0f, count*2);
volk_32f_s32f_convert_32i((int32_t*)_this->buffer, (float*)data, 2147483647.0f, count*2);
size = sizeof(int32_t)*2;
break;
case SAMPLE_TYPE_FLOAT32:

23
source_modules/network_source/src/main.cpp
View File

@ -244,31 +244,37 @@ private:
}
void worker() {
// Compute sizes
int blockSize = samplerate / 200;
int frameSize = blockSize*SAMPLE_TYPE_SIZE[sampType];
int sampleSize = SAMPLE_TYPE_SIZE[sampType];
int frameSize = blockSize*sampleSize;
// Allocate receive buffer
uint8_t* buffer = dsp::buffer::alloc<uint8_t>(frameSize);
while (true) {
// Read samples from socket
int bytes;
{
std::lock_guard lck(sockMtx);
int bytes = sock->recv(buffer, frameSize, true);
bytes = sock->recv(buffer, frameSize, true);
if (bytes <= 0) { break; }
}
// Convert to CF32
int count;
// Convert to CF32 (note: problem if partial sample)
int count = bytes / sampleSize;
switch (sampType) {
case SAMPLE_TYPE_INT8:
volk_8i_s32f_convert_32f((float*)stream.writeBuf, (int8_t*)buffer, 128.0f, count*2);
break;
case SAMPLE_TYPE_INT16:
volk_16i_s32f_convert_32f((float*)stream.writeBuf, (int16_t*)buffer, 32768.0f, count*2);
break;
case SAMPLE_TYPE_INT32:
volk_32i_s32f_convert_32f((float*)stream.writeBuf, (int32_t*)buffer, 2147483647.0f, count*2);
break;
case SAMPLE_TYPE_FLOAT32:
//memcpy(stream.writeBuf, buffer, )
memcpy(stream.writeBuf, buffer, bytes);
break;
default:
break;
@ -278,6 +284,7 @@ private:
if (!stream.swap(count)) { break; }
}
// Free receive buffer
dsp::buffer::free(buffer);
}