williamp/osmocom-analog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework on audio buffer management

Browse Source 
Use function to get samples to be sent to fill audio buffers to a
level. This replaces the function that only shows how much data
is in the buffer.

This way the function itself can control how much data will be
sent.
This commit is contained in:
Andreas Eversberg
2017-03-04 06:35:38 +01:00
parent 9d0e6b82b7
commit 4201717f36
11 changed files with 56 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/uhd.c
View File

@@ -379,19 +379,24 @@ int uhd_receive(float *buff, int max)
return got;
}
/* estimate current unsent number of samples */
int uhd_get_inbuffer(void)
/* estimate number of samples that can be sent */
int uhd_get_tosend(int latspl)
{
double advance;
int tosend;
/* we need the rx time stamp to determine how much data is already sent in advance */
if (rx_time_secs == 0 && rx_time_fract_sec == 0.0)
return -EAGAIN;
return 0;
/* if we have not yet sent any data, we set initial tx time stamp */
if (tx_time_secs == 0 && tx_time_fract_sec == 0.0) {
tx_time_secs = rx_time_secs;
tx_time_fract_sec = rx_time_fract_sec;
tx_time_fract_sec = rx_time_fract_sec + (double)latspl / samplerate;
if (tx_time_fract_sec >= 1.0) {
tx_time_fract_sec -= 1.0;
tx_time_secs++;
}
}
/* we check how advance our transmitted time stamp is */
@@ -399,7 +404,10 @@ int uhd_get_inbuffer(void)
/* in case of underrun: */
if (advance < 0)
advance = 0;
tosend = latspl - (int)(advance * samplerate);
if (tosend < 0)
tosend = 0;
return (int)(advance * samplerate);
return tosend;
}