Takashi Iwai
84789a8f60
- Backport upstream fixes / enhancements: mostly small fixes spotted by coccinelle and oethers, the fixes for proper rewind support, a new DSD format support, hwdep definitions sync, and addition of PAZ00 UCM configs. 0022-pcm-fix-snd_pcm_mmap_hw_avail-near-the-boundary.patch 0023-pcm-fix-return-value-of-snd_pcm_share_slave_avail.patch 0024-pcm-add-new-32-bit-DSD-sample-format.patch 0025-dmix-actually-rewind-when-running-or-being-drained.patch 0026-pcm-express-the-rewind-size-limitation-logic-better.patch 0027-pcm-handle-negative-values-from-snd_pcm_mmap_hw_avai.patch 0028-pcm-rate-use-the-snd_pcm_mmap_hw_avail-function.patch 0029-pcm-null-use-the-snd_pcm_mmap_avail-function.patch 0030-rate-handle-negative-values-from-snd_pcm_mmap_playba.patch 0031-dsnoop-rewindable-and-forwardable-logic-was-swapped.patch 0033-pcm-file-don-t-recurse-in-the-rewindable-and-forward.patch 0034-pcm-route-Fix-the-bad-condition-always-false.patch 0035-pcm-rate-hw_avail-must-not-be-negative-before-starti.patch 0036-hwdep-add-missing-declaration-for-snd_hwdep_poll_des.patch 0037-mixer-fixed-double-free.patch 0038-pcm_file-fixed-missing-free.patch 0039-sbase-fixed-missing-free.patch 0040-rawmidi-close-handle-h.patch 0041-pcm_share-fixing-missing-mutex-unlock.patch 0042-simple_abst-null-check-for-lib.patch 0043-socket-missing-socket-close.patch 0044-pcm_hooks-null-check-for-h.patch 0045-conf-return-negative-value-in-case-of-error.patch 0046-control-return-negative-value-in-case-of-error.patch 0047-pcm-return-negative-value-in-case-of-error.patch 0048-mixer-Fix-missing-hctl-handle-free-in-snd_mixer_atta.patch OBS-URL: https://build.opensuse.org/request/show/257835 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=170
132 lines
4.6 KiB
Diff
132 lines
4.6 KiB
Diff
From 78c804fc9348e4c29f1c77dd4b6ad586393aa628 Mon Sep 17 00:00:00 2001
|
|
From: "Alexander E. Patrakov" <patrakov@gmail.com>
|
|
Date: Sun, 14 Sep 2014 00:30:15 +0600
|
|
Subject: [PATCH] pcm: handle negative values from snd_pcm_mmap_hw_avail
|
|
|
|
Such negative values can happen when an underrun happens and xrun
|
|
detection is disabled. Another situation is if the device updated the
|
|
pointer before alsa-lib has a chance to detect the xrun.
|
|
|
|
The problem is that these negative values could propagate to the
|
|
snd_pcm_rewindable return value, where it is specified that negative
|
|
returns must be interpreted as error codes and not as negative amount of
|
|
samples.
|
|
|
|
Signed-off-by: Alexander E. Patrakov <patrakov@gmail.com>
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/pcm/pcm_dmix.c | 2 +-
|
|
src/pcm/pcm_dshare.c | 4 +---
|
|
src/pcm/pcm_hw.c | 2 +-
|
|
src/pcm/pcm_ioplug.c | 2 +-
|
|
src/pcm/pcm_local.h | 18 ++++++++++++++++++
|
|
src/pcm/pcm_plugin.c | 2 +-
|
|
6 files changed, 23 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
|
|
index ffde12a1a46c..babde6a15efe 100644
|
|
--- a/src/pcm/pcm_dmix.c
|
|
+++ b/src/pcm/pcm_dmix.c
|
|
@@ -661,7 +661,7 @@ static int snd_pcm_dmix_pause(snd_pcm_t *pcm ATTRIBUTE_UNUSED, int enable ATTRIB
|
|
|
|
static snd_pcm_sframes_t snd_pcm_dmix_rewindable(snd_pcm_t *pcm)
|
|
{
|
|
- return snd_pcm_mmap_hw_avail(pcm);
|
|
+ return snd_pcm_mmap_playback_hw_rewindable(pcm);
|
|
}
|
|
|
|
static snd_pcm_sframes_t snd_pcm_dmix_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t frames)
|
|
diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c
|
|
index f1a1a1d75229..020e6f7d9307 100644
|
|
--- a/src/pcm/pcm_dshare.c
|
|
+++ b/src/pcm/pcm_dshare.c
|
|
@@ -412,7 +412,7 @@ static int snd_pcm_dshare_pause(snd_pcm_t *pcm ATTRIBUTE_UNUSED, int enable ATTR
|
|
|
|
static snd_pcm_sframes_t snd_pcm_dshare_rewindable(snd_pcm_t *pcm)
|
|
{
|
|
- return snd_pcm_mmap_playback_hw_avail(pcm);
|
|
+ return snd_pcm_mmap_playback_hw_rewindable(pcm);
|
|
}
|
|
|
|
static snd_pcm_sframes_t snd_pcm_dshare_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t frames)
|
|
@@ -420,8 +420,6 @@ static snd_pcm_sframes_t snd_pcm_dshare_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t
|
|
snd_pcm_sframes_t avail;
|
|
|
|
avail = snd_pcm_dshare_rewindable(pcm);
|
|
- if (avail < 0)
|
|
- return 0;
|
|
if (frames > (snd_pcm_uframes_t)avail)
|
|
frames = avail;
|
|
snd_pcm_mmap_appl_backward(pcm, frames);
|
|
diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
|
|
index 74cff672a0c1..c34b766ee035 100644
|
|
--- a/src/pcm/pcm_hw.c
|
|
+++ b/src/pcm/pcm_hw.c
|
|
@@ -659,7 +659,7 @@ static int snd_pcm_hw_pause(snd_pcm_t *pcm, int enable)
|
|
|
|
static snd_pcm_sframes_t snd_pcm_hw_rewindable(snd_pcm_t *pcm)
|
|
{
|
|
- return snd_pcm_mmap_hw_avail(pcm);
|
|
+ return snd_pcm_mmap_hw_rewindable(pcm);
|
|
}
|
|
|
|
static snd_pcm_sframes_t snd_pcm_hw_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t frames)
|
|
diff --git a/src/pcm/pcm_ioplug.c b/src/pcm/pcm_ioplug.c
|
|
index 85a88911eafc..fe9347c835d5 100644
|
|
--- a/src/pcm/pcm_ioplug.c
|
|
+++ b/src/pcm/pcm_ioplug.c
|
|
@@ -503,7 +503,7 @@ static int snd_pcm_ioplug_pause(snd_pcm_t *pcm, int enable)
|
|
|
|
static snd_pcm_sframes_t snd_pcm_ioplug_rewindable(snd_pcm_t *pcm)
|
|
{
|
|
- return snd_pcm_mmap_hw_avail(pcm);
|
|
+ return snd_pcm_mmap_hw_rewindable(pcm);
|
|
}
|
|
|
|
static snd_pcm_sframes_t snd_pcm_ioplug_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t frames)
|
|
diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h
|
|
index 74ebd609334a..394505f978ac 100644
|
|
--- a/src/pcm/pcm_local.h
|
|
+++ b/src/pcm/pcm_local.h
|
|
@@ -464,6 +464,24 @@ static inline snd_pcm_sframes_t snd_pcm_mmap_hw_avail(snd_pcm_t *pcm)
|
|
return pcm->buffer_size - snd_pcm_mmap_avail(pcm);
|
|
}
|
|
|
|
+static inline snd_pcm_sframes_t snd_pcm_mmap_playback_hw_rewindable(snd_pcm_t *pcm)
|
|
+{
|
|
+ snd_pcm_sframes_t ret = snd_pcm_mmap_playback_hw_avail(pcm);
|
|
+ return (ret >= 0) ? ret : 0;
|
|
+}
|
|
+
|
|
+static inline snd_pcm_sframes_t snd_pcm_mmap_capture_hw_rewindable(snd_pcm_t *pcm)
|
|
+{
|
|
+ snd_pcm_sframes_t ret = snd_pcm_mmap_capture_hw_avail(pcm);
|
|
+ return (ret >= 0) ? ret : 0;
|
|
+}
|
|
+
|
|
+static inline snd_pcm_uframes_t snd_pcm_mmap_hw_rewindable(snd_pcm_t *pcm)
|
|
+{
|
|
+ snd_pcm_sframes_t ret = snd_pcm_mmap_hw_avail(pcm);
|
|
+ return (ret >= 0) ? ret : 0;
|
|
+}
|
|
+
|
|
static inline const snd_pcm_channel_area_t *snd_pcm_mmap_areas(snd_pcm_t *pcm)
|
|
{
|
|
if (pcm->stopped_areas &&
|
|
diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
|
|
index a607ccfe27de..c19e2f17a730 100644
|
|
--- a/src/pcm/pcm_plugin.c
|
|
+++ b/src/pcm/pcm_plugin.c
|
|
@@ -198,7 +198,7 @@ static int snd_pcm_plugin_reset(snd_pcm_t *pcm)
|
|
|
|
static snd_pcm_sframes_t snd_pcm_plugin_rewindable(snd_pcm_t *pcm)
|
|
{
|
|
- return snd_pcm_mmap_hw_avail(pcm);
|
|
+ return snd_pcm_mmap_hw_rewindable(pcm);
|
|
}
|
|
|
|
snd_pcm_sframes_t snd_pcm_plugin_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t frames)
|
|
--
|
|
2.1.2
|
|
|