diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-03 11:36:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-03 11:36:22 +0000 |
| commit | 584e788b97cebfb0ede51b7d603b9e03e6142c18 (patch) | |
| tree | d5ef5f1d516d12301b0a65b5dbfea16938588270 /cras/src/server/cras_alsa_helpers.c | |
| parent | 123981960ed4bc72bde18b7625d98120a8c235a4 (diff) | |
| parent | 6552c7ad8262a749b92997500b850fda099ed13e (diff) | |
| download | adhd-584e788b97cebfb0ede51b7d603b9e03e6142c18.tar.gz | |
Merge "Revert^2 "Merge branch 'upstream-master'"" am: 0aaab56eba am: 1a33fa0434 am: 6552c7ad82
Original change: https://android-review.googlesource.com/c/platform/external/adhd/+/1613721
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3b73f8ff54dc52938ca7c787479130b235bcc747
Diffstat (limited to 'cras/src/server/cras_alsa_helpers.c')
| -rw-r--r-- | cras/src/server/cras_alsa_helpers.c | 45 |
1 files changed, 1 insertions, 44 deletions
diff --git a/cras/src/server/cras_alsa_helpers.c b/cras/src/server/cras_alsa_helpers.c index 4f402498..6cdc165a 100644 --- a/cras/src/server/cras_alsa_helpers.c +++ b/cras/src/server/cras_alsa_helpers.c @@ -556,7 +556,7 @@ int cras_alsa_set_hwparams(snd_pcm_t *handle, struct cras_audio_format *format, return 0; } -int cras_alsa_set_swparams(snd_pcm_t *handle, int *enable_htimestamp) +int cras_alsa_set_swparams(snd_pcm_t *handle) { int err; snd_pcm_sw_params_t *swparams; @@ -593,50 +593,7 @@ int cras_alsa_set_swparams(snd_pcm_t *handle, int *enable_htimestamp) return err; } - if (*enable_htimestamp) { - /* Use MONOTONIC_RAW time-stamps. */ - err = snd_pcm_sw_params_set_tstamp_type( - handle, swparams, SND_PCM_TSTAMP_TYPE_MONOTONIC_RAW); - if (err < 0) { - syslog(LOG_ERR, "set_tstamp_type: %s\n", - snd_strerror(err)); - return err; - } - err = snd_pcm_sw_params_set_tstamp_mode(handle, swparams, - SND_PCM_TSTAMP_ENABLE); - if (err < 0) { - syslog(LOG_ERR, "set_tstamp_mode: %s\n", - snd_strerror(err)); - return err; - } - } - - /* This hack is required because ALSA-LIB does not provide any way to - * detect whether MONOTONIC_RAW timestamps are supported by the kernel. - * In ALSA-LIB, the code checks the hardware protocol version. */ err = snd_pcm_sw_params(handle, swparams); - if (err == -EINVAL && *enable_htimestamp) { - *enable_htimestamp = 0; - syslog(LOG_WARNING, - "MONOTONIC_RAW timestamps are not supported."); - - err = snd_pcm_sw_params_set_tstamp_type( - handle, swparams, SND_PCM_TSTAMP_TYPE_GETTIMEOFDAY); - if (err < 0) { - syslog(LOG_ERR, "set_tstamp_type: %s\n", - snd_strerror(err)); - return err; - } - err = snd_pcm_sw_params_set_tstamp_mode(handle, swparams, - SND_PCM_TSTAMP_NONE); - if (err < 0) { - syslog(LOG_ERR, "set_tstamp_mode: %s\n", - snd_strerror(err)); - return err; - } - - err = snd_pcm_sw_params(handle, swparams); - } if (err < 0) { syslog(LOG_ERR, "sw_params: %s\n", snd_strerror(err)); |