Takashi Iwai
197f321105
- Backport upstream fixes: a PCM plugin regression fix about snd_pcm_status() call, plugin directory handling fixes, missing audio timestamp types, use-after-free fix for conf parser, PCM plugin delay account fixes, etc: 0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch 0002-dlmisc-fix-snd_plugin_dir-locking-for-not-DL_ORIGIN_.patch 0003-pcm-snd_pcm_mmap_readi-fix-typo-in-comment.patch 0007-pcm-set-the-snd_pcm_ioplug_status-tstamp-field.patch 0009-pcm-Add-snd_pcm_audio_tstamp_type_t-constants.patch 0010-test-audio_time-Make-use-of-SND_PCM_AUDIO_TSTAMP_TYP.patch 0011-pcm-Fix-a-typo-in-SND_PCM_AUDIO_TSTAMP_TYPE_LAST-def.patch 0012-conf-fix-use-after-free-in-_snd_config_load_with_inc.patch 0013-ucm-fix-bad-frees-in-get_list0-and-get_list20.patch 0014-rawmidi-fix-memory-leak-in-snd_rawmidi_virtual_open.patch 0015-timer-fix-sizeof-operator-mismatch-in-snd_timer_quer.patch 0016-pcm-remove-dead-assignments-from-snd_pcm_rate_-commi.patch 0017-pcm_multi-remove-dead-assignment-from-_snd_pcm_multi.patch 0018-conf-fix-get_hexachar-return-value.patch 0019-pcm-fix-__snd_pcm_state-return-value.patch 0020-confmisc-fix-memory-leak-in-snd_func_concat.patch 0021-conf-fix-return-code-in-_snd_config_load_with_includ.patch 0022-pcm-plugin-status-fix-the-return-value-regression.patch 0023-pcm-plugin-status-revert-the-recent-changes.patch 0024-pcm-plugin-tidy-snd_pcm_plugin_avail_update.patch 0025-pcm-plugin-optimize-sync-in-snd_pcm_plugin_status.patch 0026-Revert-pcm_plugin-fix-delay.patch 0027-pcm-ioplug-fix-the-delay-calculation-in-the-status-c.patch 0028-pcm-rate-tidy-up-snd_pcm_rate_avail_update.patch 0029-pcm-ioplug-fix-the-delay-calculation-for-old-plugins.patch OBS-URL: https://build.opensuse.org/request/show/860483 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=290
75 lines
2.1 KiB
Diff
75 lines
2.1 KiB
Diff
From 6ca01c07ee13435d6c2db4e9121d9a86cc4b1457 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Wed, 30 Dec 2020 19:14:25 +0100
|
|
Subject: [PATCH 27/33] pcm: ioplug - fix the delay calculation in the status
|
|
callback
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/pcm/pcm_ioplug.c | 32 ++++++++++++++++++--------------
|
|
1 file changed, 18 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/src/pcm/pcm_ioplug.c b/src/pcm/pcm_ioplug.c
|
|
index 9b1b8ac3b6fc..f2315a10e87c 100644
|
|
--- a/src/pcm/pcm_ioplug.c
|
|
+++ b/src/pcm/pcm_ioplug.c
|
|
@@ -107,9 +107,24 @@ static int snd_pcm_ioplug_channel_info(snd_pcm_t *pcm, snd_pcm_channel_info_t *i
|
|
return snd_pcm_channel_info_shm(pcm, info, -1);
|
|
}
|
|
|
|
+static int snd_pcm_ioplug_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp)
|
|
+{
|
|
+ ioplug_priv_t *io = pcm->private_data;
|
|
+
|
|
+ if (io->data->version >= 0x010001 &&
|
|
+ io->data->callback->delay)
|
|
+ return io->data->callback->delay(io->data, delayp);
|
|
+ else {
|
|
+ snd_pcm_ioplug_hw_ptr_update(pcm);
|
|
+ *delayp = snd_pcm_mmap_hw_avail(pcm);
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static int snd_pcm_ioplug_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
|
|
{
|
|
ioplug_priv_t *io = pcm->private_data;
|
|
+ snd_pcm_sframes_t sd;
|
|
|
|
memset(status, 0, sizeof(*status));
|
|
snd_pcm_ioplug_hw_ptr_update(pcm);
|
|
@@ -118,6 +133,9 @@ static int snd_pcm_ioplug_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
|
|
gettimestamp(&status->tstamp, pcm->tstamp_type);
|
|
status->avail = snd_pcm_mmap_avail(pcm);
|
|
status->avail_max = io->avail_max;
|
|
+ if (snd_pcm_ioplug_delay(pcm, &sd) < 0)
|
|
+ sd = snd_pcm_mmap_delay(pcm);
|
|
+ status->delay = sd;
|
|
return 0;
|
|
}
|
|
|
|
@@ -133,20 +151,6 @@ static int snd_pcm_ioplug_hwsync(snd_pcm_t *pcm)
|
|
return 0;
|
|
}
|
|
|
|
-static int snd_pcm_ioplug_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp)
|
|
-{
|
|
- ioplug_priv_t *io = pcm->private_data;
|
|
-
|
|
- if (io->data->version >= 0x010001 &&
|
|
- io->data->callback->delay)
|
|
- return io->data->callback->delay(io->data, delayp);
|
|
- else {
|
|
- snd_pcm_ioplug_hw_ptr_update(pcm);
|
|
- *delayp = snd_pcm_mmap_hw_avail(pcm);
|
|
- }
|
|
- return 0;
|
|
-}
|
|
-
|
|
static int snd_pcm_ioplug_reset(snd_pcm_t *pcm)
|
|
{
|
|
ioplug_priv_t *io = pcm->private_data;
|
|
--
|
|
2.26.2
|
|
|