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
64 lines
2.4 KiB
Diff
64 lines
2.4 KiB
Diff
From ac520b2ed11f31e789a4da1d55e360e3eaeac50d Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Mon, 4 Jan 2021 17:14:42 +0100
|
|
Subject: [PATCH 32/33] pcm: rate - use pcm_frame_diff() on related places
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/pcm/pcm_rate.c | 20 +++++++-------------
|
|
1 file changed, 7 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c
|
|
index abb2753f6055..3d301d0e317b 100644
|
|
--- a/src/pcm/pcm_rate.c
|
|
+++ b/src/pcm/pcm_rate.c
|
|
@@ -561,17 +561,16 @@ snd_pcm_rate_read_areas1(snd_pcm_t *pcm,
|
|
|
|
static inline void snd_pcm_rate_sync_hwptr0(snd_pcm_t *pcm, snd_pcm_uframes_t slave_hw_ptr)
|
|
{
|
|
- snd_pcm_rate_t *rate = pcm->private_data;
|
|
-
|
|
- snd_pcm_sframes_t slave_hw_ptr_diff = slave_hw_ptr - rate->last_slave_hw_ptr;
|
|
+ snd_pcm_rate_t *rate;
|
|
+ snd_pcm_sframes_t slave_hw_ptr_diff;
|
|
snd_pcm_sframes_t last_slave_hw_ptr_frac;
|
|
|
|
if (pcm->stream != SND_PCM_STREAM_PLAYBACK)
|
|
return;
|
|
|
|
- if (slave_hw_ptr_diff < 0)
|
|
- slave_hw_ptr_diff += rate->gen.slave->boundary; /* slave boundary wraparound */
|
|
- else if (slave_hw_ptr_diff == 0)
|
|
+ rate = pcm->private_data;
|
|
+ slave_hw_ptr_diff = pcm_frame_diff(slave_hw_ptr, rate->last_slave_hw_ptr, rate->gen.slave->boundary);
|
|
+ if (slave_hw_ptr_diff == 0)
|
|
return;
|
|
last_slave_hw_ptr_frac = rate->last_slave_hw_ptr % rate->gen.slave->period_size;
|
|
/* While handling fraction part fo slave period, rounded value will be
|
|
@@ -922,10 +921,7 @@ static int snd_pcm_rate_sync_playback_area(snd_pcm_t *pcm, snd_pcm_uframes_t app
|
|
if (slave_size < 0)
|
|
return slave_size;
|
|
|
|
- if (appl_ptr < rate->last_commit_ptr)
|
|
- xfer = appl_ptr - rate->last_commit_ptr + pcm->boundary;
|
|
- else
|
|
- xfer = appl_ptr - rate->last_commit_ptr;
|
|
+ xfer = pcm_frame_diff(appl_ptr, rate->last_commit_ptr, pcm->boundary);
|
|
while (xfer >= pcm->period_size &&
|
|
(snd_pcm_uframes_t)slave_size >= rate->gen.slave->period_size) {
|
|
err = snd_pcm_rate_commit_next_period(pcm, rate->last_commit_ptr % pcm->buffer_size);
|
|
@@ -1059,9 +1055,7 @@ static int snd_pcm_rate_drain(snd_pcm_t *pcm)
|
|
sw_params.avail_min = 1;
|
|
snd_pcm_sw_params(rate->gen.slave, &sw_params);
|
|
|
|
- size = rate->appl_ptr - rate->last_commit_ptr;
|
|
- if (size > pcm->boundary)
|
|
- size -= pcm->boundary;
|
|
+ size = pcm_frame_diff(rate->appl_ptr, rate->last_commit_ptr, pcm->boundary);
|
|
ofs = rate->last_commit_ptr % pcm->buffer_size;
|
|
while (size > 0) {
|
|
snd_pcm_uframes_t psize, spsize;
|
|
--
|
|
2.26.2
|
|
|