@@ -1,4 +1,9 @@

 -------------------------------------------------------------------

+Sun Oct  8 16:26:36 UTC 2023 - Bjørn Lie <zaitor@opensuse.org>

+

+- Update to version 0.3.81

+

+-------------------------------------------------------------------

 Fri Sep 22 17:21:32 UTC 2023 - Bjørn Lie <zaitor@opensuse.org>

 - Update to version 0.3.80

​

@@ -7,7 +7,7 @@

 %define soversion 0_2

 Name:           pipewire-aptx

-Version:        0.3.80

+Version:        0.3.81

 Release:        0

 Summary:        PipeWire Bluetooth aptX codec plugin

 License:        MIT

​

@@ -458,8 +458,15 @@

   extends:

     - .build_on_fedora

   stage: analysis

+  variables:

+    MESON_OPTIONS: >-

+        -Dpipewire-v4l2=enabled

+        -Dpipewire-jack=enabled

   script:

-    - shellcheck $(git grep -l "#\!/.*bin/.*sh")

+    - echo "Configuring with meson options $MESON_OPTIONS"

+    - meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS

+    - shellcheck $(git ls-files '*.sh')

+    - shellcheck $(grep -rl "#\!/.*bin/.*sh" "$BUILD_DIR")

 spellcheck:

   extends:

​

@@ -1,3 +1,88 @@

+# PipeWire 0.3.81 (2023-10-06)

+

+This is the first 1.0 release candidate that is API and ABI compatible

+with previous 0.3.x releases.

+

+## Highlights

+  - jackdbus support is now enabled by default.

+  - IRQ based scheduling in ALSA was improved and enabled by default for

+    Pro-Audio profile. It will also link the pcms together to get lower

+    latency. This now matches what JACK does and gives equal latency to

+    PipeWire for Pro-Audio profiles.

+  - Support both old and new versions of webrtc-audio-processing to make

+    the transition easier.

+  - Forced quantum changes by nodes or metadata will now also force a

+    suspend and resume of the graph, like the rate changes to make sure all

+    nodes adapt to the new quantum. This is important for Pro-Audio nodes

+    that need to reconfigure the hardware to a new period in IRQ based

+    scheduling.

+  - Fix a regression in regex parsing.

+  - Many bugfixes and improvements.

+

+

+## PipeWire

+  - jackdbus is by default enabled now. The idea is that when jackdbus is

+    installed, the real libjack.so is in the path and we can become a

+    real JACK client.

+  - Forces quantum changes by nodes or metadata will now also force a

+    suspend and resume in the graph, like the rate changes to make sure all

+    nodes adapt to the new quantum. This is important for Pro-Audio nodes

+    that need to reconfigure the hardware to a new period.

+  - The stream now has an EARLY_PROCESS option that can be used to implement

+    custum buffer fill levels. (#3480)

+  - Fix a regression in regex parsing. (#3528)

+  - Fix a bug in position reporting in the driver node. (#3189) (#3544)

+  - Destroying a link will now recalculate the graph correctly.

+  - Fix the rate comparison for finding the best rate in the graph.

+  - Use malloc_trim() when available to release memory. (#1840)

+

+## Tools

+  - pw-cat now supports DFF DSD files.

+  - pw-cli avoid some NULL derefs in some cases.

+

+## Modules

+  - The RAOP sink has seen some cleanups and improvements. It will now ask

+    for feedback every 2 seconds to keep some devices alive.

+  - A bug in filter-chain was fixed where it would fail to apply the gain

+    when mixing just one source.

+  - The filter-chain can now pass the stream volume to a control in the

+    filter-chain graph. (#3434)

+  - Improve volume handling in RAOP sink.

+

+## Pulse-server

+  - Some cleanup in the pending_stream handling.

+  - Fix a regression in the event emission code where it failed to emit

+    a changed event when a node was linked. (#3522)

+  - Lower the realtime priority of pulseaudio clients.

+  - Set pulse.module.id on the echo-cancel streams. (#3541)

+

+## SPA

+  - Support both old and new versions of webrtc-audio-processing to make

+    the transition easier.

+  - The ALSA driver now does the sync of all followers directly from the

+    wakeup event. This results in more stable rate matching.

+  - IRQ based scheduling in ALSA was improved and enabled by default for

+    Pro-Audio profile. It will also link the pcms together to get lower

+    latency. This now matches what JACK does and gives equal latency to

+    PipeWire for Pro-Audio profiles.

+  - GNU/Hurd support was added.

+  - Some improvements to passthrough handling.

+

+## Bluetooth

+  - Improvements to the codec handling when PipeWire is used as Audio

+    Gateway.

+  - Adapt to new Bluez API for BAP devices.

+

+## JACK

+  - When the jack library is set in the default library path, avoid using

+    LD_LIBRARY_PATH because this can cause confusion.

+  - Handle clearing the latency on a port.

+  - jack_property now always manages to actually change the metadata because

+    it waits for a roundtrip before exiting.

+

+Older versions:

+

+

 # PipeWire 0.3.80 (2023-09-14)

 This is a bugfix release that is API and ABI compatible with previous

@@ -63,9 +148,6 @@

   - The mixer io areas are updated and handled safely now to avoid

     crashes. (#3506)

-Older versions:

-

-

 # PipeWire 0.3.79 (2023-08-29)

 This is a quick bugfix release that is API and ABI compatible with previous

​

@@ -11,6 +11,7 @@

 # Add \ingroup commands for the file, for each \addgroup in it

 BASEFILE=$(echo "$FILENAME" | sed -e 's@.*src/pipewire/@pipewire/@; s@.*spa/include/spa/@spa/@; s@.*src/test/@test/@;')

+# shellcheck disable=SC2028 # \file is not an escape sequence

 echo "/** \file"

 echo "\`$BASEFILE\`"

 sed -n -e '/.*\\addtogroup a-zA-Z0-9_.*/ { s/.*addtogroup /\\ingroup /; p; }' < "$FILENAME" | sort | uniq

​

@@ -1,5 +1,5 @@

 project('pipewire', 'c' ,

-  version : '0.3.80',

+  version : '0.3.81',

   license :  'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ,

   meson_version : '>= 0.61.1',

   default_options :  'warning_level=3',

@@ -23,15 +23,15 @@

 spaversion = '0.2'

 apiversion = '0.3'

 soversion = 0

-libversion = '@0@.@1@.0'.format(soversion, pipewire_version_minor.to_int() * 100 + pipewire_version_micro.to_int())

+libversion_minor = pipewire_version_major.to_int() * 1000 + pipewire_version_minor.to_int() * 100 + pipewire_version_micro.to_int()

+libversion = '@0@.@1@.0'.format(soversion, libversion_minor)

 # LADI/jack

 # 3, for PipeWire being the third JACK implementation, after JACK1 and jackdmp/JACK2)

 jack_version_major = 3

-jack_version_minor = pipewire_version_minor.to_int() * 100 + pipewire_version_micro.to_int()

+jack_version_minor = libversion_minor

 # libjackserver version has 0 for major (for compatibility with other implementations),

-# 3 for minor, and "100*pipewire_version_minor + pipewire_version_micro"

-# as micro version (the minor libpipewire soversion number)

+# 3 for minor, and "1000*major + 100*minor + micro" as micro version (the minor libpipewire soversion number)

 libjackversion = '@0@.@1@.@2@'.format(soversion, jack_version_major, jack_version_minor)

 pipewire_name = 'pipewire-@0@'.format(apiversion)

@@ -377,9 +377,17 @@

 webrtc_dep = dependency('webrtc-audio-processing-1',

   version : '>= 1.2' ,

-  required : get_option('echo-cancel-webrtc'))

-summary({'WebRTC Echo Canceling': webrtc_dep.found()}, bool_yn: true, section: 'Misc dependencies')

-cdata.set('HAVE_WEBRTC', webrtc_dep.found())

+  required : false)

+cdata.set('HAVE_WEBRTC1', webrtc_dep.found())

+if webrtc_dep.found()

+  summary({'WebRTC Echo Canceling >= 1.2': webrtc_dep.found()}, bool_yn: true, section: 'Misc dependencies')

+else

+  webrtc_dep = dependency('webrtc-audio-processing',

+    version : '>= 0.2', '< 1.0',

+    required : get_option('echo-cancel-webrtc'))

+  cdata.set('HAVE_WEBRTC', webrtc_dep.found())

+  summary({'WebRTC Echo Canceling < 1.0': webrtc_dep.found()}, bool_yn: true, section: 'Misc dependencies')

+endif

 # On FreeBSD and MidnightBSD, epoll-shim library is required for eventfd() and timerfd()

 epoll_shim_dep = (host_machine.system() == 'freebsd' or host_machine.system() == 'midnightbsd'

@@ -427,6 +435,7 @@

   'reallocarray', '#include <stdlib.h>', '-D_GNU_SOURCE', ,

   'sigabbrev_np', '#include <string.h>', '-D_GNU_SOURCE', ,

   'XSetIOErrorExitHandler', '#include <X11/Xlib.h>', , x11_dep,

+  'malloc_trim', '#include <malloc.h>', , ,

 foreach f : check_functions

​

@@ -21,12 +21,19 @@

 if libjack_path == ''

   libjack_path = modules_install_dir / 'jack'

   libjack_path_dlopen = modules_install_dir_dlopen / 'jack'

+  libjack_path_enable = ''

+elif libjack_path == get_option('libdir') or libjack_path == pipewire_libdir

+  libjack_path = pipewire_libdir

+  libjack_path_dlopen = libjack_path

+  libjack_path_enable = '#'

 else

   libjack_path_dlopen = libjack_path

+  libjack_path_enable = ''

 endif

 tools_config = configuration_data()

 tools_config.set('LIBJACK_PATH', libjack_path_dlopen)

+tools_config.set('LIBJACK_PATH_ENABLE', libjack_path_enable)

 configure_file(input : 'pw-jack.in',

                output : 'pw-jack',

​

@@ -230,7 +230,7 @@

    pw_log_info("set id:%u (%"PRIu64") '%s' to '%s@%s'", o->id, subject, key, value, type);

    if (update_property(c, subject, key, type, value))

        pw_metadata_set_property(c->metadata->proxy, o->id, key, type, value);

-   res = 0;

+   res = do_sync(c);

 done:

    pw_thread_loop_unlock(c->context.loop);

@@ -340,7 +340,7 @@

    pw_log_info("remove id:%u (%"PRIu64") '%s'", id, subject, key);

    pw_metadata_set_property(c->metadata->proxy,

            id, key, NULL, NULL);

-   res = 0;

+   res = do_sync(c);

 done:

    pw_thread_loop_unlock(c->context.loop);

@@ -365,7 +365,7 @@

    pw_log_info("remove id:%u (%"PRIu64")", id, subject);

    pw_metadata_set_property(c->metadata->proxy,

            id, NULL, NULL, NULL);

-   res = 0;

+   res = do_sync(c);

 done:

    pw_thread_loop_unlock(c->context.loop);

@@ -375,15 +375,17 @@

 SPA_EXPORT

 int jack_remove_all_properties (jack_client_t* client)

 {

+   int res;

    struct client *c = (struct client *) client;

    spa_return_val_if_fail(c != NULL, -EINVAL);

    pw_thread_loop_lock(c->context.loop);

    pw_metadata_clear(c->metadata->proxy);

+   res = do_sync(c);

    pw_thread_loop_unlock(c->context.loop);

-   return 0;

+   return res;

 }

 SPA_EXPORT

​

@@ -2441,9 +2441,11 @@

    int res;

    if (param == NULL)

-       return 0;

-   if ((res = spa_latency_parse(param, &info)) < 0)

+       info = SPA_LATENCY_INFO(SPA_DIRECTION_REVERSE(p->direction));

+   else if ((res = spa_latency_parse(param, &info)) < 0)

        return res;

+   if (info.direction == p->direction)

+       return 0;

    current = &p->object->port.latencyinfo.direction;

    if (spa_latency_info_compare(current, &info) == 0)

@@ -2457,8 +2459,6 @@

            info.min_rate, info.max_rate,

            info.min_ns, info.max_ns);

-   if (info.direction == p->direction)

-       return 0;

    if (info.direction == SPA_DIRECTION_INPUT)

        mode = JackPlaybackLatency;

​

@@ -52,7 +52,9 @@

    fi

    export PIPEWIRE_QUANTUM

 fi

-LD_LIBRARY_PATH='@LIBJACK_PATH@'"${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}"

-export LD_LIBRARY_PATH

+

+# shellcheck disable=SC2016 # ${LIB} is interpreted by ld.so, not the shell

+@LIBJACK_PATH_ENABLE@LD_LIBRARY_PATH='@LIBJACK_PATH@'"${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}"

+@LIBJACK_PATH_ENABLE@export LD_LIBRARY_PATH

 exec "$@"

​

@@ -37,6 +37,7 @@

 if  "$PW_UNINSTALLED" = 1  ; then

    PW_V4L2_LD_PRELOAD="$PW_BUILDDIR"'/pipewire-v4l2/src/libpw-v4l2.so'

 else

+   # shellcheck disable=SC2016 # ${LIB} is interpreted by ld.so, not the shell

    PW_V4L2_LD_PRELOAD='@LIBV4L2_PATH@/libpw-v4l2.so'

 fi

​

@@ -906,9 +906,9 @@

        printf("got error %d\n", res);

 }

-static char *getscale(uint32_t scale)

+static const char *getscale(uint32_t scale)

 {

-   char *scale_s = NULL;

+   const char *scale_s = NULL;

    if (scale == SPA_AUDIO_VOLUME_RAMP_LINEAR)

        scale_s = LINEAR;

​

@@ -15,6 +15,10 @@

 #include <spa/utils/defs.h>

 #include <spa/support/log.h>

 #include <spa/debug/context.h>

+#include <spa/debug/dict.h>

+#include <spa/debug/format.h>

+#include <spa/debug/mem.h>

+#include <spa/debug/pod.h>

 /**

  * \addtogroup spa_debug

​

@@ -35,15 +35,16 @@

 #define spa_exchange(var, new_value) \

 __extension__ ({ \

-   __typeof__(var) _old_value = (var); \

-   (var) = (new_value); \

+   __typeof__(var) *_ptr = &(var); \

+   __typeof__(var) _old_value = *_ptr; \

+   *_ptr = (new_value); \

    _old_value; \

 })

-#if __GNUC__ > 10 || defined(__clang__)

+#if __GNUC__ >= 10 || defined(__clang__)

 #define spa_steal_ptr(ptr) ((__typeof__(*(ptr)) *) spa_exchange((ptr), NULL))

 #else

-#define spa_steal_ptr(ptr) ((__typeof__(ptr)) spa_exchange((ptr), NULL))

+#define spa_steal_ptr(ptr) spa_exchange((ptr), NULL)

 #endif

 #define spa_steal_fd(fd) spa_exchange((fd), -1)

@@ -52,16 +53,6 @@

 #include <stdlib.h>

-

-#if __GNUC__ > 10 || defined(__clang__)

-#define spa_clear_ptr(ptr, destructor) \

-__extension__ ({ \

-   __typeof__(*(ptr)) *_old_value = spa_steal_ptr(ptr); \

-   if (_old_value) \

-       destructor(_old_value); \

-   (void) 0; \

-})

-#else

 #define spa_clear_ptr(ptr, destructor) \

 __extension__ ({ \

    __typeof__(ptr) _old_value = spa_steal_ptr(ptr); \

@@ -69,7 +60,6 @@

        destructor(_old_value); \

    (void) 0; \

 })

-#endif

 static inline void _spa_autofree_cleanup_func(void *p)

 {

​

@@ -3,6 +3,8 @@

 /* SPDX-FileCopyrightText: Copyright © 2021 Arun Raghavan <arun@asymptotic.io> */

 /* SPDX-License-Identifier: MIT */

+#include "config.h"

+

 #include <memory>

 #include <utility>

@@ -13,7 +15,13 @@

 #include <spa/utils/json.h>

 #include <spa/support/plugin.h>

+#ifdef HAVE_WEBRTC

+#include <webrtc/modules/audio_processing/include/audio_processing.h>

+#include <webrtc/modules/interface/module_common_types.h>

+#include <webrtc/system_wrappers/include/trace.h>

+#else

 #include <modules/audio_processing/include/audio_processing.h>

+#endif

 struct impl_data {

    struct spa_handle handle;

@@ -39,6 +47,54 @@

    return default_value;

 }

+#ifdef HAVE_WEBRTC

+/*  f0 f1 f2  */

+static int parse_point(struct spa_json *it, float (&f)3)

+{

+   struct spa_json arr;

+   int i, res;

+

+   if (spa_json_enter_array(it, &arr) <= 0)

+       return -EINVAL;

+

+   for (i = 0; i < 3; i++) {

+       if ((res = spa_json_get_float(&arr, &fi)) <= 0)

+           return -EINVAL;

+   }

+   return 0;

+}

+

+/*  point1 point2 ...  */

+static int parse_mic_geometry(struct impl_data *impl, const char *mic_geometry,

+       std::vector<webrtc::Point>& geometry)

+{

+   int res;

+   size_t i;

+   struct spa_json it2;

+

+   spa_json_init(&it0, mic_geometry, strlen(mic_geometry));

+   if (spa_json_enter_array(&it0, &it1) <= 0) {

+       spa_log_error(impl->log, "Error: webrtc.mic-geometry expects an array");

+       return -EINVAL;

+   }

+

+   for (i = 0; i < geometry.size(); i++) {

+       float f3;

+

+       if ((res = parse_point(&it1, f)) < 0) {

+           spa_log_error(impl->log, "Error: can't parse webrtc.mic-geometry points: %d", res);

+           return res;

+       }

+

+       spa_log_info(impl->log, "mic %zd position: (%g %g %g)", i, f0, f1, f2);

+       geometryi.c0 = f0;

+       geometryi.c1 = f1;

+       geometryi.c2 = f2;

+   }

+   return 0;

+}

+#endif

+

 static int webrtc_init2(void *object, const struct spa_dict *args,

        struct spa_audio_info_raw *rec_info, struct spa_audio_info_raw *out_info,

        struct spa_audio_info_raw *play_info)

@@ -48,9 +104,18 @@

    bool high_pass_filter = webrtc_get_spa_bool(args, "webrtc.high_pass_filter", true);

    bool noise_suppression = webrtc_get_spa_bool(args, "webrtc.noise_suppression", true);

-   bool transient_suppression = webrtc_get_spa_bool(args, "webrtc.transient_suppression", true);

    bool voice_detection = webrtc_get_spa_bool(args, "webrtc.voice_detection", true);

-

+#ifdef HAVE_WEBRTC

+   bool extended_filter = webrtc_get_spa_bool(args, "webrtc.extended_filter", true);

+   bool delay_agnostic = webrtc_get_spa_bool(args, "webrtc.delay_agnostic", true);

+   // Disable experimental flags by default

+   bool experimental_agc = webrtc_get_spa_bool(args, "webrtc.experimental_agc", false);

+   bool experimental_ns = webrtc_get_spa_bool(args, "webrtc.experimental_ns", false);

+

+   bool beamforming = webrtc_get_spa_bool(args, "webrtc.beamforming", false);

+#else

+   bool transient_suppression = webrtc_get_spa_bool(args, "webrtc.transient_suppression", true);

+#endif

    // Note: AGC seems to mess up with Agnostic Delay Detection, especially with speech,

    // result in very poor performance, disable by default

    bool gain_control = webrtc_get_spa_bool(args, "webrtc.gain_control", false);

@@ -59,6 +124,51 @@

    // This filter will modify playback buffer (when calling ProcessReverseStream), but now

    // playback buffer modifications are discarded.

+#ifdef HAVE_WEBRTC

+   webrtc::Config config;

+   config.Set<webrtc::ExtendedFilter>(new webrtc::ExtendedFilter(extended_filter));

+   config.Set<webrtc::DelayAgnostic>(new webrtc::DelayAgnostic(delay_agnostic));

+   config.Set<webrtc::ExperimentalAgc>(new webrtc::ExperimentalAgc(experimental_agc));

+   config.Set<webrtc::ExperimentalNs>(new webrtc::ExperimentalNs(experimental_ns));

+

+   if (beamforming) {

+       std::vector<webrtc::Point> geometry(rec_info->channels);

+       const char *mic_geometry, *target_direction;

+

+       /* The beamformer gives a single mono channel */

+       out_info->channels = 1;

+       out_info->position0 = SPA_AUDIO_CHANNEL_MONO;

+

+       if ((mic_geometry = spa_dict_lookup(args, "webrtc.mic-geometry")) == NULL) {

+           spa_log_error(impl->log, "Error: webrtc.beamforming requires webrtc.mic-geometry");

+           return -EINVAL;

+       }

+

+       if ((res = parse_mic_geometry(impl, mic_geometry, geometry)) < 0)

+           return res;

+

+       if ((target_direction = spa_dict_lookup(args, "webrtc.target-direction")) != NULL) {

+           webrtc::SphericalPointf direction(0.0f, 0.0f, 0.0f);

+           struct spa_json it;

+           float f3;

+

+           spa_json_init(&it, target_direction, strlen(target_direction));

+           if (parse_point(&it, f) < 0) {

+               spa_log_error(impl->log, "Error: can't parse target-direction %s",

+                       target_direction);

+               return -EINVAL;

+           }

+

+           direction.s0 = f0;

+           direction.s1 = f1;

+           direction.s2 = f2;

+

+           config.Set<webrtc::Beamforming>(new webrtc::Beamforming(true, geometry, direction));

+       } else {

+           config.Set<webrtc::Beamforming>(new webrtc::Beamforming(true, geometry));

+       }

+   }

+#else

    webrtc::AudioProcessing::Config config;

    config.echo_canceller.enabled = true;

    // FIXME: Example code enables both gain controllers, but that seems sus

@@ -73,6 +183,7 @@

    // FIXME: expose pre/postamp gain

    config.transient_suppression.enabled = transient_suppression;

    config.voice_detection.enabled = voice_detection;

+#endif

    webrtc::ProcessingConfig pconfig = {{

        webrtc::StreamConfig(rec_info->rate, rec_info->channels, false), /* input stream */

@@ -81,15 +192,35 @@

        webrtc::StreamConfig(play_info->rate, play_info->channels, false), /* reverse output stream */

    }};

+#ifdef HAVE_WEBRTC

+   auto apm = std::unique_ptr<webrtc::AudioProcessing>(webrtc::AudioProcessing::Create(config));

+#else

    auto apm = std::unique_ptr<webrtc::AudioProcessing>(webrtc::AudioProcessingBuilder().Create());

    apm->ApplyConfig(config);

+#endif

    if ((res = apm->Initialize(pconfig)) != webrtc::AudioProcessing::kNoError) {

        spa_log_error(impl->log, "Error initialising webrtc audio processing module: %d", res);

        return -EINVAL;

    }

+#ifdef HAVE_WEBRTC

+   apm->high_pass_filter()->Enable(high_pass_filter);

+   // Always disable drift compensation since PipeWire will already do

+   // drift compensation on all sinks and sources linked to this echo-canceler

+   apm->echo_cancellation()->enable_drift_compensation(false);

+   apm->echo_cancellation()->Enable(true);

+   // TODO: wire up supression levels to args

+   apm->echo_cancellation()->set_suppression_level(webrtc::EchoCancellation::kHighSuppression);

+   apm->noise_suppression()->set_level(webrtc::NoiseSuppression::kHigh);

+   apm->noise_suppression()->Enable(noise_suppression);

+   apm->voice_detection()->Enable(voice_detection);

+   // TODO: wire up AGC parameters to args

+   apm->gain_control()->set_analog_level_limits(0, 255);

+   apm->gain_control()->set_mode(webrtc::GainControl::kAdaptiveDigital);

+   apm->gain_control()->Enable(gain_control);

+#endif

    impl->apm = std::move(apm);

    impl->rec_info = *rec_info;

    impl->out_info = *out_info;

​

@@ -388,6 +388,8 @@

                pa_alsa_init_proplist_pcm(NULL, m->output_proplist, m->output_pcm);

                pa_proplist_setf(m->output_proplist, "clock.name", "api.alsa.%u", index);

                pa_proplist_setf(m->output_proplist, "device.profile.pro", "true");

+               pa_proplist_setf(m->output_proplist, "node.group", "pro-audio-%u", index);

+               pa_proplist_setf(m->output_proplist, "node.link-group", "pro-audio-%u", index);

                pa_alsa_close(&m->output_pcm);

                m->supported = true;

                pa_channel_map_init_auto(&m->channel_map, m->sample_spec.channels, PA_CHANNEL_MAP_AUX);

@@ -419,6 +421,8 @@

                pa_alsa_init_proplist_pcm(NULL, m->input_proplist, m->input_pcm);

                pa_proplist_setf(m->input_proplist, "clock.name", "api.alsa.%u", index);

                pa_proplist_setf(m->input_proplist, "device.profile.pro", "true");

+               pa_proplist_setf(m->input_proplist, "node.group", "pro-audio-%u", index);

+               pa_proplist_setf(m->input_proplist, "node.link-group", "pro-audio-%u", index);

                pa_alsa_close(&m->input_pcm);

                m->supported = true;

                pa_channel_map_init_auto(&m->channel_map, m->sample_spec.channels, PA_CHANNEL_MAP_AUX);

​

@@ -843,12 +843,12 @@

    nextptr = device + 3;

    for (value_index = 0; ; ++value_index) {

-       char *value_label;

+       const char *value_label;

        switch (value_index) {

        case 0: value_label = "card"; break;

        case 1: value_label = "device"; break;

-       default: assert(false);

+       default: spa_assert_not_reached();

        }

        errno = 0;

​

@@ -252,9 +252,13 @@

    switch (id) {

    case SPA_IO_Clock:

+       if (size > 0 && size < sizeof(struct spa_io_clock))

+           return -EINVAL;

        this->clock = data;

        break;

    case SPA_IO_Position:

+       if (size > 0 && size < sizeof(struct spa_io_position))

+           return -EINVAL;

        this->position = data;

        break;

    default:

​

@@ -235,6 +235,8 @@

        this->clock = data;

        break;

    case SPA_IO_Position:

+       if (size > 0 && size < sizeof(struct spa_io_position))

+           return -EINVAL;

        this->position = data;

        break;

    default:

​

@@ -17,6 +17,7 @@

 #include "alsa-pcm.h"

 static struct spa_list cards = SPA_LIST_INIT(&cards);

+static struct spa_list states = SPA_LIST_INIT(&states);

 static struct card *find_card(uint32_t index)

 {

@@ -501,6 +502,9 @@

    int err;

    const char *str;

+   spa_list_init(&state->followers);

+   spa_list_init(&state->rt.followers);

+

    snd_config_update_free_global();

    if ((str = spa_dict_lookup(info, "device.profile.pro")) != NULL)

@@ -508,6 +512,7 @@

    state->multi_rate = true;

    state->htimestamp = false;

+   state->disable_tsched = state->is_pro;

    for (i = 0; info && i < info->n_items; i++) {

        const char *k = info->itemsi.key;

        const char *s = info->itemsi.value;

@@ -547,6 +552,8 @@

    }

    CHECK(snd_output_stdio_attach(&state->output, state->log_file, 0), "attach failed");

+   spa_list_append(&states, &state->link);

+

    state->rate_limit.interval = 2 * SPA_NSEC_PER_SEC;

    state->rate_limit.burst = 1;

@@ -557,6 +564,7 @@

 {

    int err;

+   spa_list_remove(&state->link);

    release_card(state->card);

    state->card = NULL;

@@ -584,7 +592,7 @@

    err = snd_ctl_open(&state->ctl, device_name, SND_CTL_NONBLOCK);

    if (err < 0) {

        spa_log_info(state->log, "%s could not find ctl device: %s",

-               state->props.device, snd_strerror(err));

+               device_name, snd_strerror(err));

        state->ctl = NULL;

        goto error;

    }

@@ -599,7 +607,7 @@

    err = snd_ctl_elem_read(state->ctl, state->pitch_elem);

    if (err < 0) {

        spa_log_debug(state->log, "%s: did not find ctl %s: %s",

-               state->props.device, elem_name, snd_strerror(err));

+               device_name, elem_name, snd_strerror(err));

        snd_ctl_elem_value_free(state->pitch_elem);

        state->pitch_elem = NULL;

@@ -613,13 +621,34 @@

    CHECK(snd_ctl_elem_write(state->ctl, state->pitch_elem), "snd_ctl_elem_write");

    state->last_rate = 1.0;

-   spa_log_info(state->log, "%s: found ctl %s", state->props.device, elem_name);

+   spa_log_info(state->log, "%s: found ctl %s", device_name, elem_name);

    err = 0;

 error:

    snd_lib_error_set_handler(NULL);

    return err;

 }

+static int do_link(struct state *driver, struct state *state)

+{

+   int res;

+   snd_pcm_status_t *status;

+

+   snd_pcm_status_alloca(&status);

+   snd_pcm_status(driver->hndl, status);

+   snd_pcm_status_dump(status, state->output);

+   snd_pcm_status(state->hndl, status);

+   snd_pcm_status_dump(status, state->output);

+   fflush(state->log_file);

+

+   res = snd_pcm_link(driver->hndl, state->hndl);

+   if (res >= 0 || res == -EALREADY)

+       state->linked = true;

+

+   spa_log_info(state->log, "%p: linked to driver %p: %u (%s)",

+           state, driver, state->linked, snd_strerror(res));

+   return 0;

+}

+

 int spa_alsa_open(struct state *state, const char *params)

 {

    int err;

@@ -632,6 +661,8 @@

    spa_scnprintf(device_name, sizeof(device_name), "%s%s%s",

            state->card->ucm_prefix ? state->card->ucm_prefix : "",

            props->device, params ? params : "");

+   spa_scnprintf(state->name, sizeof(state->name), "%s%s",

+           props->device, state->stream == SND_PCM_STREAM_CAPTURE ? "c" : "p");

    spa_log_info(state->log, "%p: ALSA device open '%s' %s", state, device_name,

            state->stream == SND_PCM_STREAM_CAPTURE ? "capture" : "playback");

@@ -655,9 +686,6 @@

         * these are initialised in spa_alsa_start() */

    }

-   if (state->clock)

-       spa_scnprintf(state->clock->name, sizeof(state->clock->name),

-               "%s", state->clock_name);

    state->opened = true;

    state->sample_count = 0;

    state->sample_time = 0;

@@ -667,12 +695,32 @@

    return 0;

 error_exit_close:

-   spa_log_info(state->log, "%p: Device '%s' closing: %s", state, state->props.device,

+   spa_log_info(state->log, "%p: Device '%s' closing: %s", state, state->name,

            spa_strerror(err));

    snd_pcm_close(state->hndl);

    return err;

 }

+static void try_unlink(struct state *state)

+{

+   struct state *follower;

+

+   if (state->driver != NULL && state->linked) {

+       snd_pcm_unlink(state->hndl);

+       spa_log_info(state->log, "%p: unlinked from driver %p",

+               state, state->driver);

+       state->linked = false;

+   }

+   spa_list_for_each(follower, &state->followers, driver_link) {

+       if (follower->opened && follower->linked) {

+           snd_pcm_unlink(follower->hndl);

+           spa_log_info(state->log, "%p: follower unlinked from driver %p",

+               follower, state);

+           follower->linked = false;

+       }

+   }

+}

+

 int spa_alsa_close(struct state *state)

 {

    int err = 0;

@@ -680,11 +728,13 @@

    if (!state->opened)

        return 0;

+   try_unlink(state);

+

    spa_alsa_pause(state);

-   spa_log_info(state->log, "%p: Device '%s' closing", state, state->props.device);

+   spa_log_info(state->log, "%p: Device '%s' closing", state, state->name);

    if ((err = snd_pcm_close(state->hndl)) < 0)

-       spa_log_warn(state->log, "%s: close failed: %s", state->props.device,

+       spa_log_warn(state->log, "%s: close failed: %s", state->name,

                snd_strerror(err));

    if (!state->disable_tsched)

@@ -697,6 +747,7 @@

    state->have_format = false;

    state->opened = false;

+   state->linked = false;

    if (state->pitch_elem) {

        snd_ctl_elem_value_free(state->pitch_elem);

@@ -1094,7 +1145,7 @@

        CHECK(snd_pcm_hw_params_set_channels_near(hndl, params, &rchannels), "set_channels");

        if (state->default_channels != rchannels) {

            spa_log_warn(state->log, "%s: Channels doesn't match (requested %u, got %u)",

-               state->props.device, state->default_channels, rchannels);

+               state->name, state->default_channels, rchannels);

        }

    }

    if (state->default_rate != 0) {

@@ -1102,7 +1153,7 @@

        CHECK(snd_pcm_hw_params_set_rate_near(hndl, params, &rrate, 0), "set_rate_near");

        if (state->default_rate != rrate) {

            spa_log_warn(state->log, "%s: Rate doesn't match (requested %u, got %u)",

-               state->props.device, state->default_rate, rrate);

+               state->name, state->default_rate, rrate);

        }

    }

@@ -1164,7 +1215,7 @@

            }

        }

        spa_log_warn(state->log, "%s: no format found (def:%d) formats:%s",

-               state->props.device, state->default_format, buf);

+               state->name, state->default_format, buf);

        for (i = 0, offs = 0; i <= SND_PCM_ACCESS_LAST; i++) {

​

@@ -82,6 +82,15 @@

    uint32_t rate;

 };

+struct rt_state {

+   struct spa_list followers;

+   struct state *driver;

+   struct spa_list driver_link;

+

+   unsigned int sources_added:1;

+   unsigned int following:1;

+};

+

 struct state {

    struct spa_handle handle;

    struct spa_node node;

@@ -97,6 +106,7 @@

    struct card *card;

    snd_pcm_stream_t stream;

    snd_output_t *output;

+   char name64;

    struct spa_hook_list hooks;

    struct spa_callbacks callbacks;

@@ -111,7 +121,9 @@

    struct spa_param_info paramsN_NODE_PARAMS;

    struct props props;

-   bool opened;

+   unsigned int opened:1;

+   unsigned int prepared:1;

+   unsigned int started:1;

    snd_pcm_t *hndl;

    bool have_format;

@@ -127,9 +139,9 @@

    uint32_t allowed_ratesMAX_RATES;

    uint32_t n_allowed_rates;

    struct channel_map default_pos;

-   unsigned int disable_mmap;

-   unsigned int disable_batch;

-   unsigned int disable_tsched;

+   unsigned int disable_mmap:1;

+   unsigned int disable_batch:1;

+   unsigned int disable_tsched:1;

    char clock_name64;

    uint32_t quantum_limit;

@@ -141,9 +153,9 @@

    size_t frame_size;

    size_t frame_scale;

    int blocks;

-   uint32_t rate_denom;

    uint32_t delay;

    uint32_t read_size;

+   uint32_t max_read;

    uint64_t port_info_all;

    struct spa_port_info port_info;

@@ -169,7 +181,6 @@

    size_t ready_offset;

-   bool started;

    /* Either a single source for tsched, or a set of pollfds from ALSA */

    struct spa_source sourceMAX_POLL;

    int timerfd;

@@ -183,7 +194,9 @@

    uint32_t max_delay;

    uint32_t htimestamp_error;

-   uint32_t duration;

+   struct spa_fraction driver_rate;

+   uint32_t driver_duration;

+

    unsigned int alsa_started:1;

    unsigned int alsa_sync:1;

    unsigned int alsa_sync_warning:1;

@@ -200,6 +213,8 @@

    unsigned int multi_rate:1;

    unsigned int htimestamp:1;

    unsigned int is_pro:1;

+   unsigned int sources_added:1;

+   unsigned int linked:1;

    uint64_t iec958_codecs;

@@ -222,6 +237,14 @@

    snd_ctl_t *ctl;

    snd_ctl_elem_value_t *pitch_elem;

    double last_rate;

+

+   struct spa_list link;

+

+   struct spa_list followers;

+   struct state *driver;

+   struct spa_list driver_link;

+

+   struct rt_state rt;

 };

 struct spa_pod *spa_alsa_enum_propinfo(struct state *state,

@@ -240,6 +263,7 @@

 int spa_alsa_clear(struct state *state);

 int spa_alsa_open(struct state *state, const char *params);

+int spa_alsa_prepare(struct state *state);

 int spa_alsa_start(struct state *state);

 int spa_alsa_reassign_follower(struct state *state);

 int spa_alsa_pause(struct state *state);

​

@@ -373,9 +373,6 @@

    struct spa_data *datas;

    uint64_t follower_flags, conv_flags;

-   if (this->target == this->follower)

-       return 0;

-

    spa_log_debug(this->log, "%p: n_buffers:%d", this, this->n_buffers);

    if (this->n_buffers > 0)

@@ -516,10 +513,9 @@

    this->have_format = format != NULL;

    if (format == NULL) {

        this->n_buffers = 0;

-   } else {

+   } else if (this->target != this->follower) {

        res = negotiate_buffers(this);

    }

-

    return res;

 }

@@ -555,7 +551,7 @@

    struct spa_latency_info latency;

    int res;

-   spa_log_info(this->log, "%p: %d:%d", this, direction, port_id);

+   spa_log_debug(this->log, "%p: %d:%d", this, direction, port_id);

    if (this->target == this->follower)

        return 0;

@@ -625,7 +621,7 @@

    int res = 0;

    struct spa_hook l;

-   spa_log_info(this->log, "%p: passthrough mode %d", this, passthrough);

+   spa_log_debug(this->log, "%p: passthrough mode %d", this, passthrough);

    if (this->passthrough != passthrough) {

        if (passthrough) {

@@ -846,9 +842,6 @@

    struct spa_pod_builder b = { 0 };

    int res;

-   if (this->target == this->follower)

-       return 0;

-

    spa_log_debug(this->log, "%p: have_format:%d", this, this->have_format);

    if (this->have_format)

@@ -920,12 +913,12 @@

    switch (SPA_NODE_COMMAND_ID(command)) {

    case SPA_NODE_COMMAND_Start:

        spa_log_debug(this->log, "%p: starting %d", this, this->started);

-       if (this->started)

-           return 0;

-       if ((res = negotiate_format(this)) < 0)

-           return res;

-       if ((res = negotiate_buffers(this)) < 0)

-           return res;

+       if (this->target != this->follower) {

+           if (this->started)

+               return 0;

+           if ((res = negotiate_format(this)) < 0)

+               return res;

+       }

        this->ready = true;

        this->warned = false;

        break;

@@ -1043,7 +1036,7 @@

    uint32_t i;

    int res;

-   spa_log_info(this->log, "%p: convert port info %s %p %08"PRIx64, this,

+   spa_log_debug(this->log, "%p: convert port info %s %p %08"PRIx64, this,

            this->direction == SPA_DIRECTION_INPUT ?

                "Input" : "Output", info, info->change_mask);

​

@@ -370,8 +370,9 @@

    }

    spa_list_init(&port->queue);

-   spa_log_info(this->log, "%p: add port %d:%d position:%s %d %d %d",

-           this, direction, port_id, port->position, is_dsp, is_monitor, is_control);

+   spa_log_debug(this->log, "%p: add port %d:%d position:%s %d %d %d",

+           this, direction, port_id, port->position, is_dsp,

+           is_monitor, is_control);

    emit_port_info(this, port, true);

    return 0;

@@ -1266,8 +1267,9 @@

        (info == NULL || memcmp(&dir->format, info, sizeof(*info)) == 0))

        return 0;

-   spa_log_info(this->log, "%p: port config direction:%d monitor:%d control:%d mode:%d %d", this,

-           direction, monitor, control, mode, dir->n_ports);

+   spa_log_debug(this->log, "%p: port config direction:%d monitor:%d "

+           "control:%d mode:%d %d", this, direction, monitor,

+           control, mode, dir->n_ports);

    for (i = 0; i < dir->n_ports; i++) {

        spa_node_emit_port_info(&this->hooks, direction, i, NULL);

@@ -2443,6 +2445,53 @@

    SPA_FLAG_CLEAR(b->flags, BUFFER_FLAG_QUEUED);

 }

+static void free_tmp(struct impl *this)

+{

+   uint32_t i;

+

+   spa_log_debug(this->log, "free tmp %d", this->empty_size);

+

+   free(this->empty);

+   this->empty = NULL;

+   this->empty_size = 0;

+   free(this->scratch);

+   this->scratch = NULL;

+   free(this->tmp0);

+   this->tmp0 = NULL;

+   free(this->tmp1);

+   this->tmp1 = NULL;

+   for (i = 0; i < MAX_PORTS; i++) {

+       this->tmp_datas0i = NULL;

+       this->tmp_datas1i = NULL;

+   }

+}