Skip to content

Fix RX streaming space required calculation #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix RX streaming space required calculation #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Streaming.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void SoapySidekiq::rx_receive_operation(void) {
uint32_t num_samples = (len - SKIQ_RX_HEADER_SIZE_IN_BYTES) / sizeof(int16_t);

// buffer space required
uint32_t space_req = num_samples * elementsPerSample * shortsPerWord;
uint32_t space_req = num_samples * shortsPerWord;

// buf mutex
{
Expand Down Expand Up @@ -320,7 +320,7 @@ int SoapySidekiq::readStream(SoapySDR::Stream *stream,
if (useShort) {
std::memcpy(buff0, _currentBuff, returnedElems * elementsPerSample * sizeof(int16_t));
} else {
std::memcpy(buff0, (float *) _currentBuff, returnedElems * 2 * sizeof(float));
std::memcpy(buff0, (float *) _currentBuff, returnedElems * elementsPerSample * sizeof(float));
}

// bump variables for next call into readStream
Expand Down Expand Up @@ -441,7 +441,7 @@ int SoapySidekiq::acquireReadBuffer(SoapySDR::Stream *stream,
if (_buf_count == 0) {
_buf_cond.wait_for(lock, std::chrono::microseconds(timeoutUs));
if (_buf_count == 0) {
SoapySDR_logf(SOAPY_SDR_WARNING, "Read Timeout occured after %d ms", timeoutUs);
SoapySDR_logf(SOAPY_SDR_WARNING, "Read Timeout occured after %d us", timeoutUs);
return SOAPY_SDR_TIMEOUT;
}
}
Expand Down Expand Up @@ -487,4 +487,4 @@ void SoapySidekiq::releaseWriteBuffer(SoapySDR::Stream *stream,
if (stream != TX_STREAM) {
throw std::runtime_error("Invalid stream");
}
}
}