openharmony/third_party_tinyalsa
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_tinyalsa.git synced 2026-07-19 23:33:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

pcm: Rewrite pcm_get_htimestamp()

Browse Source 
Use pcm_avail_update(), check avail for timestamp
coherence.

Signed-off-by: Ricardo Biehl Pasquali <pasqualirb@gmail.com>
This commit is contained in:
Ricardo Biehl Pasquali
2018-12-22 14:42:57 -02:00
parent dd8ec69106
commit 7a1de1965e
1 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pcm.c
+21 -22
View File
@@ -1287,7 +1287,6 @@ int pcm_avail_update(struct pcm *pcm)
* otherwise the clock is CLOCK_REALTIME.
* For an input stream, frames available are frames ready for the application to read.
* For an output stream, frames available are the number of empty frames available for the application to write.
* Only available for PCMs opened with the @ref PCM_MMAP flag.
* @param pcm A PCM handle.
* @param avail The number of available frames
* @param tstamp The timestamp
@@ -1296,36 +1295,36 @@ int pcm_avail_update(struct pcm *pcm)
int pcm_get_htimestamp(struct pcm *pcm, unsigned int *avail,
struct timespec *tstamp)
{
int frames;
int rc;
snd_pcm_uframes_t hw_ptr;
int checking;
int tmp;
if (!pcm_is_ready(pcm))
return -1;
rc = pcm_sync_ptr(pcm, SNDRV_PCM_SYNC_PTR_APPL|SNDRV_PCM_SYNC_PTR_HWSYNC);
if (rc < 0)
return -1;
checking = 0;
if ((pcm->mmap_status->state != PCM_STATE_RUNNING) &&
(pcm->mmap_status->state != PCM_STATE_DRAINING))
return -1;
again:
tmp = pcm_avail_update(pcm);
if (tmp < 0)
return tmp; /* error */
if (checking && (unsigned int) tmp == *avail)
return 0;
*avail = (unsigned int) tmp;
*tstamp = pcm->mmap_status->tstamp;
if (tstamp->tv_sec == 0 && tstamp->tv_nsec == 0)
return -1;
hw_ptr = pcm->mmap_status->hw_ptr;
if (pcm->flags & PCM_IN)
frames = hw_ptr - pcm->mmap_control->appl_ptr;
else
frames = hw_ptr + pcm->buffer_size - pcm->mmap_control->appl_ptr;
if (frames < 0)
return -1;
*avail = (unsigned int)frames;
/*
* When status is mmaped, get avail again to ensure
* valid timestamp.
*/
if (!pcm->sync_ptr) {
checking = 1;
goto again;
}
/* SYNC_PTR ioctl was used, no need to check avail */
return 0;
}