VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-10-01 01:06:35 -04:00
Code Issues Projects Releases Wiki Activity

SDRDaemon input: differentiate SDRdaemon samples struct from internal DSP sample struct

Browse Source
This commit is contained in:
f4exb 2018-01-23 00:07:38 +01:00
parent 9bafb2d9b3
commit 4448b57b60
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.cpp
View File

@ -174,7 +174,7 @@ void SDRdaemonSourceBuffer::checkSlotData(int slotIndex)
if (sampleRate > 0) if (sampleRate > 0)
{ {
int64_t ts = m_currentMeta.m_tv_sec * 1000000LL + m_currentMeta.m_tv_usec; int64_t ts = m_currentMeta.m_tv_sec * 1000000LL + m_currentMeta.m_tv_usec;
ts -= (rwDelayBytes * 1000000LL) / (sampleRate * sizeof(Sample)); ts -= (rwDelayBytes * 1000000LL) / (sampleRate * sizeof(SDRdaemonSample));
m_tvOut_sec = ts / 1000000LL; m_tvOut_sec = ts / 1000000LL;
m_tvOut_usec = ts - (m_tvOut_sec * 1000000LL); m_tvOut_usec = ts - (m_tvOut_sec * 1000000LL);
} }

6
plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.h
View File

@ -55,7 +55,7 @@ public:
} }
}; };
struct Sample struct SDRdaemonSample
{ {
int16_t i; int16_t i;
int16_t q; int16_t q;
@ -68,12 +68,12 @@ public:
uint8_t filler; uint8_t filler;
}; };
static const int samplesPerBlock = (SDRDAEMONSOURCE_UDPSIZE - sizeof(Header)) / sizeof(Sample); static const int samplesPerBlock = (SDRDAEMONSOURCE_UDPSIZE - sizeof(Header)) / sizeof(SDRdaemonSample);
static const int framesSize = SDRDAEMONSOURCE_NBDECODERSLOTS * (SDRDAEMONSOURCE_NBORIGINALBLOCKS - 1) * (SDRDAEMONSOURCE_UDPSIZE - sizeof(Header)); static const int framesSize = SDRDAEMONSOURCE_NBDECODERSLOTS * (SDRDAEMONSOURCE_NBORIGINALBLOCKS - 1) * (SDRDAEMONSOURCE_UDPSIZE - sizeof(Header));
struct ProtectedBlock struct ProtectedBlock
{ {
Sample samples[samplesPerBlock]; SDRdaemonSample samples[samplesPerBlock];
}; };
struct SuperBlock struct SuperBlock