[pulseaudio-commits] 4 commits - configure.ac src/Makefile.am src/modules

[Tanu Kaskinen]

 configure.ac                 |    2 +-
 src/Makefile.am              |    7 ++++---
 src/modules/alsa/alsa-util.c |    7 +++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 26b41dd16983982c2a7bd1b1af75d31aaeed0a30
Author: Tanu Kaskinen <tanuk at iki.fi>
Date:   Fri May 11 14:13:53 2018 +0300

    build-sys: remove module-defs.h.m4 from EXTRA_DIST
    
    The file doesn't exist any more.

diff --git a/src/Makefile.am b/src/Makefile.am
index e77624f6..f4464d25 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -105,7 +105,6 @@ EXTRA_DIST = \
 		daemon/systemd/user/pulseaudio.socket \
 		utils/padsp.in \
 		utils/qpaeq \
-		modules/module-defs.h.m4 \
 		daemon/pulseaudio.desktop.in \
 		map-file \
 		daemon/pulseaudio-system.conf \

commit d25387454a8aafa9cde0de17d8792e58e95722ef
Author: Tanu Kaskinen <tanuk at iki.fi>
Date:   Fri May 11 14:06:21 2018 +0300

    build-sys: fix distribution of GSettings files
    
    dist_gsettingsdataconvert_DATA was set only if GSettings was enabled. If
    the developer that generates the tarball doesn't have GSettings enabled,
    pulseaudio.convert wouldn't get included in the tarball.
    
    The schema file was not being added to the tarball even if GSettings was
    enabled.

diff --git a/src/Makefile.am b/src/Makefile.am
index 8ef9eb25..e77624f6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -109,7 +109,9 @@ EXTRA_DIST = \
 		daemon/pulseaudio.desktop.in \
 		map-file \
 		daemon/pulseaudio-system.conf \
-		modules/echo-cancel/adrian-license.txt
+		modules/echo-cancel/adrian-license.txt \
+		modules/gsettings/org.freedesktop.pulseaudio.gschema.xml \
+		modules/gsettings/pulseaudio.convert
 
 pulseconf_DATA = \
 		default.pa \
@@ -1422,7 +1424,7 @@ modlibexec_LTLIBRARIES += \
 pulselibexec_PROGRAMS += \
 		gsettings-helper
 
-dist_gsettingsdataconvert_DATA = \
+gsettingsdataconvert_DATA = \
 		modules/gsettings/pulseaudio.convert
 endif
 

commit 0ee9d654673ac40691208b5aace52d9a4b69d822
Author: Tanu Kaskinen <tanuk at iki.fi>
Date:   Fri May 11 13:53:31 2018 +0300

    build-sys: bump sonames
    
    A few small internal changes in libpulse. No changes in libpulse-simple
    and libpulse-mainloop-glib.

diff --git a/configure.ac b/configure.ac
index aa275a95..c9c414f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ AC_SUBST(PA_PROTOCOL_VERSION, 32)
 
 # The stable ABI for client applications, for the version info x:y:z
 # always will hold y=z
-AC_SUBST(LIBPULSE_VERSION_INFO, [20:2:20])
+AC_SUBST(LIBPULSE_VERSION_INFO, [20:3:20])
 
 # A simplified, synchronous, ABI-stable interface for client
 # applications, for the version info x:y:z always will hold y=z

commit b32705a5d48e9fd022d406c5a803f5bf1585ce51
Author: Georg Chini <georg at chini.tk>
Date:   Fri May 4 21:10:46 2018 +0200

    alsa-util: Set ALSA report_delay flag in pa_alsa_safe_delay()
    
    The current code does not call snd_pcm_status_set_audio_htstamp_config()
    to configure the way timestamps are updated in ALSA. In kernel 4.14 and
    above a bug in ALSA has been fixed which changes timmestamp behavior.
    This leads to inconsistencies in the delay reporting because the time
    stamp no longer reflects the time when the delay was updated if the
    ALSA report_delay flag is not set. Therefore latencies are not calculated
    correctly.
    
    This patch uses snd_pcm_status_set_audio_htstamp_config() to set the
    ALSA report_delay flag to 1 before the call to snd_pcm_status(). With
    this, time stamps are updated as expected.

diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
index 61fb4903..b91a0e98 100644
--- a/src/modules/alsa/alsa-util.c
+++ b/src/modules/alsa/alsa-util.c
@@ -1187,6 +1187,7 @@ int pa_alsa_safe_delay(snd_pcm_t *pcm, snd_pcm_status_t *status, snd_pcm_sframes
     size_t abs_k;
     int err;
     snd_pcm_sframes_t avail = 0;
+    snd_pcm_audio_tstamp_config_t tstamp_config;
 
     pa_assert(pcm);
     pa_assert(delay);
@@ -1200,6 +1201,12 @@ int pa_alsa_safe_delay(snd_pcm_t *pcm, snd_pcm_status_t *status, snd_pcm_sframes
      * avail, delay and timestamp values in a single kernel call to improve
      * timer-based scheduling */
 
+    /* The time stamp configuration needs to be set so that the
+     * ALSA code will use the internal delay reported by the driver */
+    tstamp_config.type_requested = 1; /* ALSA default time stamp type */
+    tstamp_config.report_delay = 1;
+    snd_pcm_status_set_audio_htstamp_config(status, &tstamp_config);
+
     if ((err = snd_pcm_status(pcm, status)) < 0)
         return err;