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
86 lines
2.7 KiB
Diff
86 lines
2.7 KiB
Diff
From 5988bb3ff42827ab4c13f248291ad1767c8d973d Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Sun, 3 Jan 2021 16:56:38 +0100
|
|
Subject: [PATCH 28/33] pcm: rate - tidy up snd_pcm_rate_avail_update()
|
|
|
|
No functional change - just move the capture code to
|
|
a separate function for the better readability.
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/pcm/pcm_rate.c | 37 +++++++++++++++++++++----------------
|
|
1 file changed, 21 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c
|
|
index dc38e95e1116..7073f8ab6c63 100644
|
|
--- a/src/pcm/pcm_rate.c
|
|
+++ b/src/pcm/pcm_rate.c
|
|
@@ -964,29 +964,18 @@ static snd_pcm_sframes_t snd_pcm_rate_mmap_commit(snd_pcm_t *pcm,
|
|
return size;
|
|
}
|
|
|
|
-static snd_pcm_sframes_t snd_pcm_rate_avail_update(snd_pcm_t *pcm)
|
|
+static snd_pcm_sframes_t snd_pcm_rate_avail_update_capture(snd_pcm_t *pcm,
|
|
+ snd_pcm_sframes_t slave_size)
|
|
{
|
|
snd_pcm_rate_t *rate = pcm->private_data;
|
|
snd_pcm_t *slave = rate->gen.slave;
|
|
- snd_pcm_sframes_t slave_size;
|
|
-
|
|
- slave_size = snd_pcm_avail_update(slave);
|
|
- if (slave_size < 0)
|
|
- return slave_size;
|
|
-
|
|
- if (pcm->stream == SND_PCM_STREAM_CAPTURE)
|
|
- goto _capture;
|
|
- snd_pcm_rate_sync_hwptr(pcm);
|
|
- snd_pcm_rate_sync_playback_area(pcm, rate->appl_ptr);
|
|
- return snd_pcm_mmap_avail(pcm);
|
|
- _capture: {
|
|
snd_pcm_uframes_t xfer, hw_offset, size;
|
|
|
|
xfer = snd_pcm_mmap_capture_avail(pcm);
|
|
size = pcm->buffer_size - xfer;
|
|
hw_offset = snd_pcm_mmap_hw_offset(pcm);
|
|
while (size >= pcm->period_size &&
|
|
- (snd_pcm_uframes_t)slave_size >= rate->gen.slave->period_size) {
|
|
+ (snd_pcm_uframes_t)slave_size >= slave->period_size) {
|
|
int err = snd_pcm_rate_grab_next_period(pcm, hw_offset);
|
|
if (err < 0)
|
|
return err;
|
|
@@ -994,13 +983,29 @@ static snd_pcm_sframes_t snd_pcm_rate_avail_update(snd_pcm_t *pcm)
|
|
return (snd_pcm_sframes_t)xfer;
|
|
xfer += pcm->period_size;
|
|
size -= pcm->period_size;
|
|
- slave_size -= rate->gen.slave->period_size;
|
|
+ slave_size -= slave->period_size;
|
|
hw_offset += pcm->period_size;
|
|
hw_offset %= pcm->buffer_size;
|
|
snd_pcm_mmap_hw_forward(pcm, pcm->period_size);
|
|
}
|
|
return (snd_pcm_sframes_t)xfer;
|
|
- }
|
|
+}
|
|
+
|
|
+static snd_pcm_sframes_t snd_pcm_rate_avail_update(snd_pcm_t *pcm)
|
|
+{
|
|
+ snd_pcm_rate_t *rate = pcm->private_data;
|
|
+ snd_pcm_sframes_t slave_size;
|
|
+
|
|
+ slave_size = snd_pcm_avail_update(rate->gen.slave);
|
|
+ if (slave_size < 0)
|
|
+ return slave_size;
|
|
+
|
|
+ if (pcm->stream == SND_PCM_STREAM_CAPTURE)
|
|
+ return snd_pcm_rate_avail_update_capture(pcm, slave_size);
|
|
+
|
|
+ snd_pcm_rate_sync_hwptr(pcm);
|
|
+ snd_pcm_rate_sync_playback_area(pcm, rate->appl_ptr);
|
|
+ return snd_pcm_mmap_avail(pcm);
|
|
}
|
|
|
|
static int snd_pcm_rate_htimestamp(snd_pcm_t *pcm,
|
|
--
|
|
2.26.2
|
|
|