Browse Source

alsa: fix the poll interval

should be set in milliseconds

Signed-off-by: Adam Miartus <external.Adam.Miartus@de.bosch.com>
(cherry picked from commit 17031895de)
Signed-off-by: Timo Wischer <twischer@de.adit-jv.com>

Change-Id: I3d32e4602c1bdf15474b14496173727aa130c924
tags/v1.9.15
Adam Miartus Filipe Coelho <falktx@falktx.com> 5 years ago
parent
commit
d9f84dcca3
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      linux/alsa/alsa_driver.c
  2. +1
    -1
      linux/alsa/alsa_driver.h

+ 2
- 2
linux/alsa/alsa_driver.c View File

@@ -900,7 +900,7 @@ alsa_driver_set_parameters (alsa_driver_t *driver,
driver->period_usecs = driver->period_usecs =
(jack_time_t) floor ((((float) driver->frames_per_cycle) / (jack_time_t) floor ((((float) driver->frames_per_cycle) /
driver->frame_rate) * 1000000.0f); driver->frame_rate) * 1000000.0f);
driver->poll_timeout = (int) floor (1.5f * driver->period_usecs);
driver->poll_timeout_ms = (int) floor (1.5f * (driver->period_usecs / 1000.0f));


// JACK2 // JACK2
/* /*
@@ -1362,7 +1362,7 @@ alsa_driver_wait (alsa_driver_t *driver, int extra_fd, int *status, float
#ifdef __ANDROID__ #ifdef __ANDROID__
poll_result = poll (driver->pfd, nfds, -1); //fix for sleep issue poll_result = poll (driver->pfd, nfds, -1); //fix for sleep issue
#else #else
poll_result = poll (driver->pfd, nfds, driver->poll_timeout);
poll_result = poll (driver->pfd, nfds, driver->poll_timeout_ms);
#endif #endif
if (poll_result < 0) { if (poll_result < 0) {




+ 1
- 1
linux/alsa/alsa_driver.h View File

@@ -58,7 +58,7 @@ typedef struct _alsa_driver {


JACK_DRIVER_NT_DECL JACK_DRIVER_NT_DECL


int poll_timeout;
int poll_timeout_ms;
jack_time_t poll_last; jack_time_t poll_last;
jack_time_t poll_next; jack_time_t poll_next;
char **playback_addr; char **playback_addr;


Loading…
Cancel
Save