Takashi Iwai
62cc03c4bc
- Update alsa-info.sh to match dmesg with snd_ - Run spec-cleaner - Add missing Loopback.conf manually - Upstream fixes: minor clean ups, 2.1 PCM channel config support, portability improvements, PCM float format conversion fix, fix for ioplug 32bit hwptr wrap, etc. 0020-minor-malloc-changes.patch 0021-alsa-lib-minor-typo-in-pcm-doc.patch 0022-control_hw-fix-potential-memory-leak.patch 0023-pcm-initialize-pcm_dmix-monotonic-field.patch 0024-pcm-initialize-monotonic-field-for-dshare-and-dsnoop.patch 0025-pcm-use-CLOCK_REALTIME-for-non-monotonic-ts.patch 0026-alsa-lib-heavy-pcm-atomics-cleanup.patch 0027-conf-Add-basic-infrastructure-for-2.1-surround-sound.patch 0028-conf-Add-surround-2.1-support-to-all-cards.patch 0029-Portability-fix-look-for-sys-endian.h-as-well-as-end.patch 0030-autotools-update-style.patch 0031-pcm-Insert-linear-to-float-conversion-when-rate-or-c.patch 0032-pcm-route-Allow-chmap-syntax-for-slave-channels-in-t.patch 0033-pcm-route-Select-slave-chmap-based-on-ttable-informa.patch 0034-conf-Allow-2.1-surround-to-use-different-number-of-c.patch 0035-pcm-Wrap-hw_ptr-to-boundary-in-pcm_ioplug.patch 0036-src-conf-cards-Add-missing-entry-for-Loopback.conf.patch OBS-URL: https://build.opensuse.org/request/show/225572 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=152
47 lines
1.3 KiB
Diff
47 lines
1.3 KiB
Diff
From 66f07aa3b77e4013110f7b12640e204d0c15ac8d Mon Sep 17 00:00:00 2001
|
|
From: Olivier Langlois <olivier@trillion01.com>
|
|
Date: Thu, 23 Jan 2014 19:03:00 -0500
|
|
Subject: [PATCH] pcm: use CLOCK_REALTIME for non-monotonic ts
|
|
|
|
gettimeofday() is the same than clock_gettime(CLOCK_REALTIME)
|
|
except for the loss of precision and the double unnecessary
|
|
conversion timespec <-> timeval.
|
|
|
|
Signed-off-by: Olivier Langlois <olivier@trillion01.com>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/pcm/pcm_local.h | 8 ++++++--
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h
|
|
index e1c0baa871f6..8a6c7431cc40 100644
|
|
--- a/src/pcm/pcm_local.h
|
|
+++ b/src/pcm/pcm_local.h
|
|
@@ -961,17 +961,21 @@ typedef union snd_tmp_double {
|
|
/* get the current timestamp */
|
|
static inline void gettimestamp(snd_htimestamp_t *tstamp, int monotonic)
|
|
{
|
|
-#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)
|
|
+#if defined(HAVE_CLOCK_GETTIME)
|
|
+#if defined(CLOCK_MONOTONIC)
|
|
if (monotonic) {
|
|
clock_gettime(CLOCK_MONOTONIC, tstamp);
|
|
} else {
|
|
#endif
|
|
+ clock_gettime(CLOCK_REALTIME, tstamp);
|
|
+#else
|
|
struct timeval tv;
|
|
|
|
gettimeofday(&tv, 0);
|
|
tstamp->tv_sec = tv.tv_sec;
|
|
tstamp->tv_nsec = tv.tv_usec * 1000L;
|
|
-#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)
|
|
+#endif
|
|
+#if defined(HAVE_CLOCK_GETTIME)
|
|
}
|
|
#endif
|
|
}
|
|
--
|
|
1.9.0
|
|
|