cellular-infrastructure
/
osmocom-analog
9
1
Fork 2
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

fixup Rework on audio buffer management

This commit is contained in:
Andreas Eversberg 2017-03-18 09:57:38 +01:00
parent 9dda9e1efc
commit 6e0e0c9ce8
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/sender.c
View File

@ -297,6 +297,9 @@ cant_recover:
return;
}
if (count > 0) {
/* limit to our buffer */
if (count > latspl)
count = latspl;
/* loop through all channels */
for (i = 0, inst = sender; inst; i++, inst = inst->slave) {
/* load TX data from audio loop or from sender instance */

13
src/common/soapy.c
View File

@ -32,8 +32,8 @@ SoapySDRStream *rxStream = NULL;
SoapySDRStream *txStream = NULL;
static int tx_samps_per_buff, rx_samps_per_buff;
static double samplerate;
static long long rx_count = 0;
static long long tx_count = 0;
static uint64_t rx_count = 0;
static uint64_t tx_count = 0;
int soapy_open(const char *device_args, double tx_frequency, double rx_frequency, double rate, double rx_gain, double tx_gain, double bandwidth)
{
@ -266,7 +266,8 @@ int soapy_receive(float *buff, int max)
while (1) {
if (max < rx_samps_per_buff) {
PDEBUG(DUHD, DEBUG_ERROR, "SDR rx buffer overflow!\n");
/* no more space this time */
PDEBUG(DUHD, DEBUG_ERROR, "SDR RX overflow!\n");
break;
}
/* read RX stream */
@ -299,13 +300,15 @@ int soapy_get_tosend(int latspl)
/* if we have not yet sent any data, we set initial tx time stamp */
if (tx_count == 0)
tx_count = rx_count + latspl;
tx_count = rx_count;
/* we check how advance our transmitted time stamp is */
tosend = latspl - (tx_count - rx_count);
/* in case of underrun: */
if (tosend < 0)
if (tosend < 0) {
PDEBUG(DUHD, DEBUG_ERROR, "SDR TX underrun!\n");
tosend = 0;
}
return tosend;
}

3
src/common/uhd.c
View File

@ -369,7 +369,8 @@ int uhd_receive(float *buff, int max)
while (1) {
if (max < (int)rx_samps_per_buff) {
PDEBUG(DUHD, DEBUG_ERROR, "SDR rx buffer overflow!\n");
/* no more space this time */
PDEBUG(DUHD, DEBUG_ERROR, "SDR RX overflow!\n");
break;
}
/* read RX stream */