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

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

+Thu Jan 26 20:45:06 UTC 2023 - Bjørn Lie <zaitor@opensuse.org>

+

+- Update to version 0.3.65

+

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

 Mon Jan 16 08:13:26 UTC 2023 - Bjørn Lie <zaitor@opensuse.org>

 - Update to version 0.3.64

​

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

 %define soversion 0_2

 Name:           pipewire-aptx

-Version:        0.3.64

+Version:        0.3.65

 Release:        0

 Summary:        PipeWire Bluetooth aptX codec plugin

 License:        MIT

​

@@ -1,3 +1,117 @@

+# PipeWire 0.3.65 (2023-01-26)

+

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

+0.3.x releases.

+

+## Highlights

+  - Add back the deprecated symbols but make sure a deprecated warning is

+    emitted for them. This fixes compilation issues in bindings.

+  - Fix an error in the AVX code that could cause crackling in filter-chain

+    when using the mixer.

+  - The convolver in filter-chain can now select an IR from a list of IRs

+    that best matches the current samplerate. Also resampling of the IR

+    has been improved.

+  - A new native module-combine-stream was added. You can use this to create

+    a 5.1 device from 3 stereo soundcards, for example, or direct the output

+    to multiple sinks at once.

+  - Support for Bluetooth MIDI was added. This requires a wireplumber

+    addition as well.

+  - An ALSA plugin rule was added to tweak the buffer settings in Davinci

+    Resolve so that it now runs with acceptable latency. (#1697)

+  - Support for compress offload was added using tinycompress. This allows

+    compressed formats to be decoded in hardware using ALSA on some devices.

+  - Many more buffixes and improvements.

+

+

+## PipeWire

+  - Add back the deprecated symbols but make sure a deprecated warning is

+    emitted for them. (#2952)

+  - Fix a regression when running older servers and newer clients (such as

+    flatpaks on older server) where the server would run clients too soon,

+    causing crashes. (#2964)

+  - Ensure that environment variables override any config values.

+

+## Tools

+  - pw-cli has received some improvements in the output.

+  - pw-cat can now use ffmpeg to demux streams for compress offload.

+

+## modules

+  - The convolver IR volume is now preserved after resampling.

+  - Adapter ports can now have a custom prefix.

+  - module-rt now clamps the realtime priority to the user allowed one if

+    it is within an acceptable range. Before it would fall back to RTKit

+    immediately.

+  - The module-echo-cancel can now have per stream channel layouts which

+    makes it possible to link to specific audio ports on a device. (#2939)

+  - Fix an error in the AVX code that could cause crackling in filter-chain

+    when using the mixer. (#2965)

+  - The convolver in filter-chain can now select an IR from a list of IRs

+    that best matches the current sample-rate.

+  - module-pipe-* now better matches the pulseaudio properties. (#2973)

+  - A new combine-stream module was added to combine multiple sinks into

+    one sink. It is also possible to merge multiple sources into one.

+  - module-rtp-source now has match rules to select what SAP sessions

+    to stream from. There were also improvements to the buffering and

+    latency handling.

+  - module-rtp-sink now handles multicast loopback correctly.

+  - module-rtp-sink implements min-ptime and max-ptime to control the

+    send packet latency.

+

+## SPA

+  - A new modifier flag was added to the video format parser helper to

+    allow 0 (linear) as a valid modifier. (#2943)

+  - Params includes were reorganized to make it more scalable. Many compressed

+    audio formats were added.

+  - The alsa pcm plugin now handles invalid values from the driver

+    gracefully. (#2953)

+  - Fix some potential stuttering cause by wrong scaling and overflow

+    of the output buffers in audioconvert. (#2680)

+  - Debug output is now also sent to the log instead of stdout. (#2923)

+  - A debug context was added to debug macros to implement custom debug

+    handling. This is used to redirect the debug of pods to the debug log

+    instead of using some custom duplicated code.

+  - Fix some warnings for potentially undefined shifts in format

+    conversion.

+  - Support for compress offload was added using tinycompress. This is mostly

+    used on some embedded hardware where decoding of audio formats can be

+    done in hardware.

+

+## Bluetooth

+  - Some fixes for LE audio were added.

+  - Support for Bluetooth MIDI was added. This requires a wireplumber

+    addition as well.

+  - Reply OK to empty commands.

+  - Improve compatibility with some devices that send stray \n such as

+    the Sennheiser HD 350BT. (#2991)

+

+## pulse-server

+  - Devices with unsupported formats (by the pulseaudio API) are now also

+    listed in the pulseaudio API (with invalid formats).

+  - The native module-combine-stream is used for module-combine-sink.

+

+## JACK

+  - Make jack.merge-monitor default to true to better match the jack1/2

+    behaviour. Add an exception for mixxx, which is more usable with

+    unmerged monitors. (#1760)

+

+## ALSA

+  - The property handling in the ALSA plugin was improved. alsa.properties

+    and alsa.rules can now be added to the config file.

+  - A rule was added to tweak the buffer settings in Davinci Resolve so that

+    it can run with acceptable latency. (#1697)

+  - ALSA volume will now also use cubic volumes, like pulseaudio.

+  - The ALSA ctl plugin now also uses the client-rt.conf file.

+  - A new alsa.volume-method was added to configure cubic or linear volume.

+    This can be set per application using the rules.

+

+## GStreamer

+  - pipewiresrc will now advertize DMABUF support if the pipeline suports

+    this.

+  - pipewiresrc will now always be a live source unless told otherwise.

+

+Older versions:

+

+

 # PipeWire 0.3.64 (2023-01-12)

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

@@ -85,9 +199,6 @@

     to PipeWire sessions from the portal.

   - DMABuf support was re-enabled in gstpipewiresrc.

-

-Older versions:

-

 # PipeWire 0.3.63 (2022-12-15)

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

​

@@ -1,13 +1,12 @@

 PROJECT_NAME           = PipeWire

 PROJECT_NUMBER         = @PACKAGE_VERSION@

-OUTPUT_DIRECTORY       = doc

+OUTPUT_DIRECTORY       = "@output_directory@"

 FULL_PATH_NAMES        = NO

 JAVADOC_AUTOBRIEF      = YES

 TAB_SIZE               = 8

 OPTIMIZE_OUTPUT_FOR_C  = YES

 EXTRACT_ALL            = YES

 EXTRACT_STATIC         = YES

-FULL_PATH_NAMES        = YES

 STRIP_FROM_PATH        = @path_prefixes@

 STRIP_FROM_INC_PATH    = @path_prefixes@

 SHOW_FILES             = NO

​

@@ -3,6 +3,7 @@

 doxyfile_conf.set('PACKAGE_VERSION', meson.project_version())

 doxyfile_conf.set('top_srcdir', meson.project_source_root())

 doxyfile_conf.set('top_builddir', meson.project_build_root())

+doxyfile_conf.set('output_directory', meson.current_build_dir())

 dot_found = find_program('dot', required: false).found()

 summary({'dot (used with doxygen)': dot_found}, bool_yn: true, section: 'Optional programs')

​

@@ -54,6 +54,7 @@

 - \subpage page_module_avb

 - \subpage page_module_client_device

 - \subpage page_module_client_node

+- \subpage page_module_combine_stream

 - \subpage page_module_echo_cancel

 - \subpage page_module_example_sink

 - \subpage page_module_example_source

​

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

 --volume=VALUE

   The stream volume, default 1.000.

   Depending on the locale you have configured, "," or "." may be

-  used as a decimal seperator. Check with **locale** command.

+  used as a decimal separator. Check with **locale** command.

 AUTHORS

 =======

​

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

 CONNECTING PORTS

 ================

-Whithout any list option (-i, -o or -l), the given ports will be linked.

+Without any list option (-i, -o or -l), the given ports will be linked.

 Valid port specifications are:

 *port-id*

​

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

 project('pipewire', 'c' ,

-  version : '0.3.64',

+  version : '0.3.65',

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

   meson_version : '>= 0.59.0',

   default_options :  'warning_level=3',

@@ -266,6 +266,19 @@

   readline_dep = cc.find_library('readline', required : get_option('readline'))

 endif

+# Both the FFmpeg SPA plugin and the pw-cat FFmpeg integration use libavcodec.

+# But only the latter also needs libavformat.

+# Search for these libraries here, globally, so both of these subprojects can reuse the results.

+pw_cat_ffmpeg = get_option('pw-cat-ffmpeg')

+ffmpeg = get_option('ffmpeg')

+if pw_cat_ffmpeg.allowed() or ffmpeg.allowed()

+  avcodec_dep = dependency('libavcodec', required: pw_cat_ffmpeg.enabled() or ffmpeg.enabled())

+  avformat_dep = dependency('libavformat', required: pw_cat_ffmpeg.enabled())

+else

+  avcodec_dep = dependency('', required: false)

+endif

+cdata.set('HAVE_PW_CAT_FFMPEG_INTEGRATION', pw_cat_ffmpeg.allowed())

+

 summary({'readline (for pw-cli)': readline_dep.found()}, bool_yn: true, section: 'Misc dependencies')

 cdata.set('HAVE_READLINE', readline_dep.found())

 ncurses_dep = dependency('ncursesw', required : false)

​

@@ -188,6 +188,10 @@

        description: 'Build pw-cat/pw-play/pw-record',

        type: 'feature',

        value: 'auto')

+option('pw-cat-ffmpeg',

+       description: 'Enable FFmpeg integration in pw-cat/pw-play/pw-record',

+       type: 'feature',

+       value: 'disabled')

 option('udev',

        description: 'Enable Udev integration',

        type: 'feature',

@@ -273,3 +277,7 @@

        description: 'Enable code that depends on gsettings',

        type: 'feature',

        value: 'auto')

+option('compress-offload',

+       description: 'Enable ALSA Compress-Offload support',

+       type: 'feature',

+       value: 'disabled')

​

@@ -37,7 +37,10 @@

 PW_LOG_TOPIC_STATIC(alsa_log_topic, "alsa.ctl");

 #define PW_LOG_TOPIC_DEFAULT alsa_log_topic

-#define VOLUME_MAX 65536

+#define DEFAULT_VOLUME_METHOD  "cubic"

+

+#define VOLUME_MIN ((uint32_t) 0U)

+#define VOLUME_MAX ((uint32_t) 0x10000U)

 struct volume {

    uint32_t channels;

@@ -47,6 +50,8 @@

 typedef struct {

    snd_ctl_ext_t ext;

+   struct pw_properties *props;

+

    struct spa_system *system;

    struct pw_thread_loop *mainloop;

@@ -74,6 +79,9 @@

    struct volume source_volume;

    int subscribed;

+#define VOLUME_METHOD_LINEAR   (0)

+#define VOLUME_METHOD_CUBIC    (1)

+   int volume_method;

 #define UPDATE_SINK_VOL     (1<<0)

 #define UPDATE_SINK_MUTE    (1<<1)

@@ -84,6 +92,32 @@

    struct spa_list globals;

 } snd_ctl_pipewire_t;

+static inline uint32_t volume_from_linear(float vol, int method)

+{

+   if (vol <= 0.0f)

+       vol = 0.0f;

+

+   switch (method) {

+   case VOLUME_METHOD_CUBIC:

+       vol = cbrtf(vol);

+       break;

+   }

+   return SPA_CLAMP((uint64_t)lroundf(vol * VOLUME_MAX),

+           VOLUME_MIN, VOLUME_MAX);

+}

+

+static inline float volume_to_linear(uint32_t vol, int method)

+{

+   float v = ((float)vol) / VOLUME_MAX;

+

+   switch (method) {

+   case VOLUME_METHOD_CUBIC:

+       v = v * v * v;

+       break;

+   }

+   return v;

+}

+

 struct global;

 struct global_info {

@@ -416,7 +450,7 @@

                  long *imax, long *istep)

 {

    *istep = 1;

-   *imin = 0;

+   *imin = VOLUME_MIN;

    *imax = VOLUME_MAX;

    return 0;

@@ -476,7 +510,8 @@

    return err;

 }

-static struct spa_pod *build_volume_mute(struct spa_pod_builder *b, struct volume *volume, int *mute)

+static struct spa_pod *build_volume_mute(struct spa_pod_builder *b, struct volume *volume,

+       int *mute, int volume_method)

 {

    struct spa_pod_frame f1;

@@ -488,7 +523,7 @@

        n_volumes = volume->channels;

        for (i = 0; i < n_volumes; i++)

-           volumesi = volume->valuesi / (float) VOLUME_MAX;

+           volumesi = volume_to_linear(volume->valuesi, volume_method);

        spa_pod_builder_prop(b, SPA_PROP_channelVolumes, 0);

        spa_pod_builder_array(b, sizeof(float),

@@ -536,7 +571,7 @@

            0);

        spa_pod_builder_prop(&b, SPA_PARAM_ROUTE_props, 0);

-       build_volume_mute(&b, volume, mute);

+       build_volume_mute(&b, volume, mute, ctl->volume_method);

        param = spa_pod_builder_pop(&b, &f0);

        pw_log_debug("set device %d mute/volume for node %d", dg->id, g->id);

@@ -546,7 +581,7 @@

        if (!SPA_FLAG_IS_SET(g->permissions, PW_PERM_W | PW_PERM_X))

            return -EPERM;

-       param = build_volume_mute(&b, volume, mute);

+       param = build_volume_mute(&b, volume, mute, ctl->volume_method);

        pw_log_debug("set node %d mute/volume", g->id);

        pw_node_set_param((struct pw_node*)g->proxy,

@@ -761,6 +796,7 @@

        spa_system_close(ctl->system, ctl->fd);

    if (ctl->mainloop)

        pw_thread_loop_destroy(ctl->mainloop);

+   pw_properties_free(ctl->props);

    free(ctl);

 }

@@ -816,6 +852,7 @@

 {

    struct spa_pod_prop *prop;

    struct spa_pod_object *obj = (struct spa_pod_object *) param;

+   snd_ctl_pipewire_t *ctl = g->ctl;

    SPA_POD_OBJECT_FOREACH(obj, prop) {

        switch (prop->key) {

@@ -841,7 +878,8 @@

            g->node.channel_volume.channels = n_volumes;

            for (i = 0; i < n_volumes; i++)

-               g->node.channel_volume.valuesi = volumesi * VOLUME_MAX;

+               g->node.channel_volume.valuesi =

+                   volume_from_linear(volumesi, ctl->volume_method);

            SPA_FLAG_UPDATE(g->node.flags, NODE_FLAG_DEVICE_VOLUME, device);

            pw_log_debug("update node %d channelVolumes", g->id);

@@ -1230,6 +1268,14 @@

         .done = on_core_done,

 };

+static int execute_match(void *data, const char *location, const char *action,

+                const char *val, size_t len)

+{

+   snd_ctl_pipewire_t *ctl = data;

+   if (spa_streq(action, "update-props"))

+       pw_properties_update_string(ctl->props, val, len);

+   return 1;

+}

 SPA_EXPORT

 SND_CTL_PLUGIN_DEFINE_FUNC(pipewire)

@@ -1242,7 +1288,6 @@

    const char *fallback_name = NULL;

    int err;

    const char *str;

-   struct pw_properties *props = NULL;

    snd_ctl_pipewire_t *ctl;

    struct pw_loop *loop;

@@ -1305,10 +1350,6 @@

        return -EINVAL;

    }

-   str = getenv("PIPEWIRE_REMOTE");

-   if (str != NULL && str0 != '\0')

-       server = str;

-

    if (fallback_name && name && spa_streq(name, fallback_name))

        fallback_name = NULL; /* no fallback for the same name */

@@ -1343,30 +1384,57 @@

        goto error;

    }

-   ctl->context = pw_context_new(loop, NULL, 0);

+   ctl->context = pw_context_new(loop,

+                   pw_properties_new(

+                       PW_KEY_CLIENT_API, "alsa",

+                       PW_KEY_CONFIG_NAME, "client-rt.conf",

+                       NULL),

+                   0);

    if (ctl->context == NULL) {

        err = -errno;

        goto error;

    }

-   props = pw_properties_new(NULL, NULL);

-   if (props == NULL) {

+   ctl->props = pw_properties_new(NULL, NULL);

+   if (ctl->props == NULL) {

        err = -errno;

        goto error;

    }

-   pw_properties_setf(props, PW_KEY_APP_NAME, "PipeWire ALSA %s",

-           pw_get_prgname());

-

    if (server)

-       pw_properties_set(props, PW_KEY_REMOTE_NAME, server);

+       pw_properties_set(ctl->props, PW_KEY_REMOTE_NAME, server);

​

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

     pipewire_alsa_plugin_ctl_sources,

     c_args : pipewire_alsa_plugin_c_args,

     include_directories : configinc,

-    dependencies : pipewire_dep, alsa_dep,

+    dependencies : pipewire_dep, alsa_dep, mathlib,

     install : true,

     install_dir : pipewire_libdir / 'alsa-lib',

 )

​

@@ -70,30 +70,12 @@

 #define MIN_BUFFER_BYTES   (2*MIN_PERIOD_BYTES)

 #define MAX_BUFFER_BYTES   (2*MAX_PERIOD_BYTES)

-struct params {

-   const char *node_name;

-   const char *server_name;

-   const char *playback_node;

-   const char *capture_node;

-   const char *role;

-   snd_pcm_format_t format;

-   int rate;

-   int channels;

-   int period_bytes;

-   int buffer_bytes;

-   uint32_t flags;

-};

-

 typedef struct {

    snd_pcm_ioplug_t io;

    snd_output_t *output;

    FILE *log_file;

-   char *node_name;

-   char *target;

-   char *role;

-

    int fd;

    int error;

    unsigned int activated:1;   /* PipeWire is activated? */

@@ -113,12 +95,12 @@

    struct spa_system *system;

    struct pw_thread_loop *main_loop;

+   struct pw_properties *props;

    struct pw_context *context;

    struct pw_core *core;

    struct spa_hook core_listener;

-   uint32_t flags;

    struct pw_stream *stream;

    struct spa_hook stream_listener;

@@ -192,9 +174,7 @@

        spa_system_close(pw->system, pw->fd);

    if (pw->main_loop)

        pw_thread_loop_destroy(pw->main_loop);

-   free(pw->node_name);

-   free(pw->target);

-   free(pw->role);

+   pw_properties_free(pw->props);

    snd_output_close(pw->output);

    fclose(pw->log_file);

    free(pw);

@@ -541,7 +521,6 @@

    const struct spa_pod *params1;

    uint8_t buffer1024;

    struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));

-   struct pw_properties *props;

    uint32_t min_period;

    pw_thread_loop_lock(pw->main_loop);

@@ -568,40 +547,18 @@

        goto done;

    pw->hw_params_changed = false;

-   props = pw_properties_new(NULL, NULL);

-   if (props == NULL)

-       goto error;

-

-   pw_properties_set(props, PW_KEY_CLIENT_API, "alsa");

-   pw_properties_setf(props, PW_KEY_APP_NAME, "%s", pw_get_prgname());

-

-   if (pw_properties_get(props, PW_KEY_NODE_LATENCY) == NULL)

-       pw_properties_setf(props, PW_KEY_NODE_LATENCY, "%lu/%u", pw->min_avail, io->rate);

-   if (pw_properties_get(props, PW_KEY_NODE_RATE) == NULL)

-       pw_properties_setf(props, PW_KEY_NODE_RATE, "1/%u", io->rate);

-   if (pw->target != NULL && !spa_streq(pw->target, "-1") &&

-       pw_properties_get(props, PW_KEY_TARGET_OBJECT) == NULL)

-       pw_properties_setf(props, PW_KEY_TARGET_OBJECT, "%s", pw->target);

-

-   if (pw_properties_get(props, PW_KEY_MEDIA_TYPE) == NULL)

-       pw_properties_set(props, PW_KEY_MEDIA_TYPE, "Audio");

-   if (pw_properties_get(props, PW_KEY_MEDIA_CATEGORY) == NULL)

-       pw_properties_set(props, PW_KEY_MEDIA_CATEGORY,

-               io->stream == SND_PCM_STREAM_PLAYBACK ?

-               "Playback" : "Capture");

-   if (pw->role != NULL &&

-       pw_properties_get(props, PW_KEY_MEDIA_ROLE) == NULL)

-       pw_properties_setf(props, PW_KEY_MEDIA_ROLE, "%s", pw->role);

+   pw_properties_setf(pw->props, PW_KEY_NODE_LATENCY, "%lu/%u", pw->min_avail, io->rate);

+   pw_properties_setf(pw->props, PW_KEY_NODE_RATE, "1/%u", io->rate);

    params0 = spa_format_audio_raw_build(&b, SPA_PARAM_EnumFormat, &pw->format);

    if (pw->stream != NULL) {

-       pw_stream_update_properties(pw->stream, &props->dict);

+       pw_stream_update_properties(pw->stream, &pw->props->dict);

        pw_stream_update_params(pw->stream, params, 1);

        goto done;

    }

-   pw->stream = pw_stream_new(pw->core, pw->node_name, props);

+   pw->stream = pw_stream_new(pw->core, NULL, pw_properties_copy(pw->props));

    if (pw->stream == NULL)

        goto error;

@@ -614,7 +571,6 @@

                PW_DIRECTION_OUTPUT :

                PW_DIRECTION_INPUT,

                PW_ID_ANY,

-               pw->flags |

                PW_STREAM_FLAG_AUTOCONNECT |

                PW_STREAM_FLAG_MAP_BUFFERS |

                PW_STREAM_FLAG_RT_PROCESS,

@@ -969,7 +925,7 @@

    .query_chmaps = snd_pcm_pipewire_query_chmaps,

 };

-static int pipewire_set_hw_constraint(snd_pcm_pipewire_t *pw, struct params *p)

+static int pipewire_set_hw_constraint(snd_pcm_pipewire_t *pw)

 {

    unsigned int access_list = {

        SND_PCM_ACCESS_MMAP_INTERLEAVED,

@@ -995,6 +951,7 @@

 #endif

        SND_PCM_FORMAT_U8,

    };

+   int val;

    int min_rate;

    int max_rate;

    int min_channels;

@@ -1003,29 +960,35 @@

    int max_period_bytes;

    int min_buffer_bytes;

    int max_buffer_bytes;

+   const char *str;

+   snd_pcm_format_t format;

    int err;

-   if (p->rate > 0) {

-       min_rate = max_rate = SPA_CLAMP(p->rate, 1, MAX_RATE);

+   val = pw_properties_get_uint32(pw->props, "alsa.rate", 0);

+   if (val > 0) {

+       min_rate = max_rate = SPA_CLAMP(val, 1, MAX_RATE);

    } else {

        min_rate = 1;

        max_rate = MAX_RATE;

    }

-   if (p->channels > 0) {

-       min_channels = max_channels = SPA_CLAMP(p->channels, 1, MAX_CHANNELS);

+   val = pw_properties_get_uint32(pw->props, "alsa.channels", 0);

+   if (val > 0) {

+       min_channels = max_channels = SPA_CLAMP(val, 1, MAX_CHANNELS);

    } else {

        min_channels = 1;

        max_channels = MAX_CHANNELS;

    }

-   if (p->period_bytes > 0) {

-       min_period_bytes = max_period_bytes = SPA_CLAMP(p->period_bytes,

+   val = pw_properties_get_uint32(pw->props, "alsa.period-bytes", 0);

+   if (val > 0) {

+       min_period_bytes = max_period_bytes = SPA_CLAMP(val,

                MIN_PERIOD_BYTES, MAX_PERIOD_BYTES);

    } else {

        min_period_bytes = MIN_PERIOD_BYTES;

        max_period_bytes = MAX_PERIOD_BYTES;

    }

-   if (p->buffer_bytes > 0) {

-       min_buffer_bytes = max_buffer_bytes = SPA_CLAMP(p->buffer_bytes,

+   val = pw_properties_get_uint32(pw->props, "alsa.buffer-bytes", 0);

+   if (val > 0) {

+       min_buffer_bytes = max_buffer_bytes = SPA_CLAMP(val,

                MIN_BUFFER_BYTES, MAX_BUFFER_BYTES);

    } else {

        min_buffer_bytes = MIN_BUFFER_BYTES;

@@ -1052,11 +1015,14 @@

        pw_log_warn("Can't set param list: %s", snd_strerror(err));

        return err;

    }

+   format = SND_PCM_FORMAT_UNKNOWN;

+   if ((str = pw_properties_get(pw->props, "alsa.format")))

+       format = snd_pcm_format_value(str);

-   if (p->format != SND_PCM_FORMAT_UNKNOWN) {

+   if (format != SND_PCM_FORMAT_UNKNOWN) {

        err = snd_pcm_ioplug_set_param_list(&pw->io,

                SND_PCM_IOPLUG_HW_FORMAT,

-               1, (unsigned int *)&p->format);

+               1, (unsigned int *)&format);

        if (err < 0) {

            pw_log_warn("Can't set param list: %s", snd_strerror(err));

            return err;

@@ -1113,61 +1079,31 @@

    .write = log_write,

 };

+static int execute_match(void *data, const char *location, const char *action,

​

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

    client->info.change_mask = 0;

    client->show_monitor = pw_properties_get_bool(client->props, "jack.show-monitor", true);

-   client->merge_monitor = pw_properties_get_bool(client->props, "jack.merge-monitor", false);

+   client->merge_monitor = pw_properties_get_bool(client->props, "jack.merge-monitor", true);

    client->short_name = pw_properties_get_bool(client->props, "jack.short-name", false);

    client->filter_name = pw_properties_get_bool(client->props, "jack.filter-name", false);

    client->filter_char = ' ';

​

@@ -177,7 +177,8 @@

 /** a transformation of the buffer */

 struct spa_meta_videotransform {

-   uint32_t transform;     /**< orientation transformation that was applied to the buffer */

+   uint32_t transform;         /**< orientation transformation that was applied to the buffer,

+                         *  one of enum spa_meta_videotransform_value */

 };

 /**

​

@@ -79,6 +79,7 @@

    { SPA_META_Cursor, SPA_TYPE_Pointer, SPA_TYPE_INFO_META_BASE "Cursor", NULL },

    { SPA_META_Control, SPA_TYPE_Pointer, SPA_TYPE_INFO_META_BASE "Control", NULL },

    { SPA_META_Busy, SPA_TYPE_Pointer, SPA_TYPE_INFO_META_BASE "Busy", NULL },

+   { SPA_META_VideoTransform, SPA_TYPE_Pointer, SPA_TYPE_INFO_META_BASE "VideoTransform", NULL },

    { 0, 0, NULL, NULL },

 };

​

@@ -38,56 +38,56 @@

  * \{

  */

-#include <spa/debug/log.h>

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

 #include <spa/debug/mem.h>

 #include <spa/debug/types.h>

 #include <spa/buffer/type-info.h>

-static inline int spa_debug_buffer(int indent, const struct spa_buffer *buffer)

+static inline int spa_debugc_buffer(struct spa_debug_context *ctx, int indent, const struct spa_buffer *buffer)

 {

    uint32_t i;

-   spa_debug("%*s" "struct spa_buffer %p:", indent, "", buffer);

-   spa_debug("%*s" " n_metas: %u (at %p)", indent, "", buffer->n_metas, buffer->metas);

+   spa_debugc(ctx, "%*s" "struct spa_buffer %p:", indent, "", buffer);

+   spa_debugc(ctx, "%*s" " n_metas: %u (at %p)", indent, "", buffer->n_metas, buffer->metas);

    for (i = 0; i < buffer->n_metas; i++) {

        struct spa_meta *m = &buffer->metasi;

        const char *type_name;

        type_name = spa_debug_type_find_name(spa_type_meta_type, m->type);

-       spa_debug("%*s" "  meta %d: type %d (%s), data %p, size %d:", indent, "", i, m->type,

+       spa_debugc(ctx, "%*s" "  meta %d: type %d (%s), data %p, size %d:", indent, "", i, m->type,

            type_name, m->data, m->size);

        switch (m->type) {

        case SPA_META_Header:

        {

            struct spa_meta_header *h = (struct spa_meta_header*)m->data;

-           spa_debug("%*s" "    struct spa_meta_header:", indent, "");

-           spa_debug("%*s" "      flags:      %08x", indent, "", h->flags);

-           spa_debug("%*s" "      offset:     %u", indent, "", h->offset);

-           spa_debug("%*s" "      seq:        %" PRIu64, indent, "", h->seq);

-           spa_debug("%*s" "      pts:        %" PRIi64, indent, "", h->pts);

-           spa_debug("%*s" "      dts_offset: %" PRIi64, indent, "", h->dts_offset);

+           spa_debugc(ctx, "%*s" "    struct spa_meta_header:", indent, "");

+           spa_debugc(ctx, "%*s" "      flags:      %08x", indent, "", h->flags);

+           spa_debugc(ctx, "%*s" "      offset:     %u", indent, "", h->offset);

+           spa_debugc(ctx, "%*s" "      seq:        %" PRIu64, indent, "", h->seq);

+           spa_debugc(ctx, "%*s" "      pts:        %" PRIi64, indent, "", h->pts);

+           spa_debugc(ctx, "%*s" "      dts_offset: %" PRIi64, indent, "", h->dts_offset);

            break;

        }

        case SPA_META_VideoCrop:

        {

            struct spa_meta_region *h = (struct spa_meta_region*)m->data;

-           spa_debug("%*s" "    struct spa_meta_region:", indent, "");

-           spa_debug("%*s" "      x:      %d", indent, "", h->region.position.x);

-           spa_debug("%*s" "      y:      %d", indent, "", h->region.position.y);

-           spa_debug("%*s" "      width:  %d", indent, "", h->region.size.width);

-           spa_debug("%*s" "      height: %d", indent, "", h->region.size.height);

+           spa_debugc(ctx, "%*s" "    struct spa_meta_region:", indent, "");

+           spa_debugc(ctx, "%*s" "      x:      %d", indent, "", h->region.position.x);

+           spa_debugc(ctx, "%*s" "      y:      %d", indent, "", h->region.position.y);

+           spa_debugc(ctx, "%*s" "      width:  %d", indent, "", h->region.size.width);

+           spa_debugc(ctx, "%*s" "      height: %d", indent, "", h->region.size.height);

            break;

        }

        case SPA_META_VideoDamage:

        {

            struct spa_meta_region *h;

            spa_meta_for_each(h, m) {

-               spa_debug("%*s" "    struct spa_meta_region:", indent, "");

-               spa_debug("%*s" "      x:      %d", indent, "", h->region.position.x);

-               spa_debug("%*s" "      y:      %d", indent, "", h->region.position.y);

-               spa_debug("%*s" "      width:  %d", indent, "", h->region.size.width);

-               spa_debug("%*s" "      height: %d", indent, "", h->region.size.height);

+               spa_debugc(ctx, "%*s" "    struct spa_meta_region:", indent, "");

+               spa_debugc(ctx, "%*s" "      x:      %d", indent, "", h->region.position.x);

+               spa_debugc(ctx, "%*s" "      y:      %d", indent, "", h->region.position.y);

+               spa_debugc(ctx, "%*s" "      width:  %d", indent, "", h->region.size.width);

+               spa_debugc(ctx, "%*s" "      height: %d", indent, "", h->region.size.height);

            }

            break;

        }

@@ -96,28 +96,32 @@

        case SPA_META_Cursor:

            break;

        default:

-           spa_debug("%*s" "    Unknown:", indent, "");

-           spa_debug_mem(5, m->data, m->size);

+           spa_debugc(ctx, "%*s" "    Unknown:", indent, "");

+           spa_debugc_mem(ctx, 5, m->data, m->size);

        }

    }

-   spa_debug("%*s" " n_datas: \t%u (at %p)", indent, "", buffer->n_datas, buffer->datas);

+   spa_debugc(ctx, "%*s" " n_datas: \t%u (at %p)", indent, "", buffer->n_datas, buffer->datas);

    for (i = 0; i < buffer->n_datas; i++) {

        struct spa_data *d = &buffer->datasi;

-       spa_debug("%*s" "   type:    %d (%s)", indent, "", d->type,

+       spa_debugc(ctx, "%*s" "   type:    %d (%s)", indent, "", d->type,

            spa_debug_type_find_name(spa_type_data_type, d->type));

-       spa_debug("%*s" "   flags:   %d", indent, "", d->flags);

-       spa_debug("%*s" "   data:    %p", indent, "", d->data);

-       spa_debug("%*s" "   fd:      %" PRIi64, indent, "", d->fd);

-       spa_debug("%*s" "   offset:  %d", indent, "", d->mapoffset);

-       spa_debug("%*s" "   maxsize: %u", indent, "", d->maxsize);

-       spa_debug("%*s" "   chunk:   %p", indent, "", d->chunk);

-       spa_debug("%*s" "    offset: %d", indent, "", d->chunk->offset);

-       spa_debug("%*s" "    size:   %u", indent, "", d->chunk->size);

-       spa_debug("%*s" "    stride: %d", indent, "", d->chunk->stride);

+       spa_debugc(ctx, "%*s" "   flags:   %d", indent, "", d->flags);

+       spa_debugc(ctx, "%*s" "   data:    %p", indent, "", d->data);

+       spa_debugc(ctx, "%*s" "   fd:      %" PRIi64, indent, "", d->fd);

+       spa_debugc(ctx, "%*s" "   offset:  %d", indent, "", d->mapoffset);

+       spa_debugc(ctx, "%*s" "   maxsize: %u", indent, "", d->maxsize);

+       spa_debugc(ctx, "%*s" "   chunk:   %p", indent, "", d->chunk);

+       spa_debugc(ctx, "%*s" "    offset: %d", indent, "", d->chunk->offset);

+       spa_debugc(ctx, "%*s" "    size:   %u", indent, "", d->chunk->size);

+       spa_debugc(ctx, "%*s" "    stride: %d", indent, "", d->chunk->stride);

    }

    return 0;

 }

+static inline int spa_debug_buffer(int indent, const struct spa_buffer *buffer)

+{

+   return spa_debugc_buffer(NULL, indent, buffer);

+}

 /**

  * \}

  */

​

@@ -0,0 +1,62 @@

+/* Simple Plugin API

+ *

+ * Copyright © 2023 Wim Taymans

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) shall be included in all copies or substantial portions of the

+ * Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+#ifndef SPA_DEBUG_CONTEXT_H

+#define SPA_DEBUG_CONTEXT_H

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+#include <stdio.h>

+#include <stdarg.h>

+

+#include <spa/utils/defs.h>

+/**

+ * \addtogroup spa_debug

+ * \{

+ */

+

+#ifndef spa_debugn

+#define spa_debugn(_fmt,...)   printf((_fmt), ## __VA_ARGS__)

+#endif

+#ifndef spa_debug

+#define spa_debug(_fmt,...)    spa_debugn(_fmt"\n", ## __VA_ARGS__)

+#endif

+

+struct spa_debug_context {

+   void (*log) (struct spa_debug_context *ctx, const char *fmt, ...) SPA_PRINTF_FUNC(2, 3);

+};

+

+#define spa_debugc(_c,_fmt,...)    (_c)?((_c)->log((_c),_fmt, ## __VA_ARGS__)):(void)spa_debug(_fmt, ## __VA_ARGS__)

+

+/**

+ * \}

+ */

+

+#ifdef __cplusplus

+}  /* extern "C" */

+#endif

+

+#endif /* SPA_DEBUG_CONTEXT_H */

​

@@ -34,19 +34,23 @@

  * \{

  */

-#include <spa/debug/log.h>

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

 #include <spa/utils/dict.h>

-static inline int spa_debug_dict(int indent, const struct spa_dict *dict)

+static inline int spa_debugc_dict(struct spa_debug_context *ctx, int indent, const struct spa_dict *dict)

 {

    const struct spa_dict_item *item;

-   spa_debug("%*sflags:%08x n_items:%d", indent, "", dict->flags, dict->n_items);

+   spa_debugc(ctx, "%*sflags:%08x n_items:%d", indent, "", dict->flags, dict->n_items);

    spa_dict_for_each(item, dict) {

-       spa_debug("%*s  %s = \"%s\"", indent, "", item->key, item->value);

+       spa_debugc(ctx, "%*s  %s = \"%s\"", indent, "", item->key, item->value);

    }

    return 0;

 }

+static inline int spa_debug_dict(int indent, const struct spa_dict *dict)

+{

+   return spa_debugc_dict(NULL, indent, dict);

+}

 /**

  * \}

  */

​

@@ -35,18 +35,20 @@

  */

 #include <spa/pod/parser.h>

-#include <spa/debug/log.h>

+#include <spa/utils/string.h>

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

 #include <spa/debug/types.h>

 #include <spa/param/type-info.h>

 #include <spa/param/format-utils.h>

 static inline int

-spa_debug_format_value(const struct spa_type_info *info,

+spa_debug_strbuf_format_value(struct spa_strbuf *buffer, const struct spa_type_info *info,

        uint32_t type, void *body, uint32_t size)

 {

+

    switch (type) {

    case SPA_TYPE_Bool:

-       spa_debugn("%s", *(int32_t *) body ? "true" : "false");

+       spa_strbuf_append(buffer, "%s", *(int32_t *) body ? "true" : "false");

        break;

    case SPA_TYPE_Id:

    {

@@ -56,41 +58,41 @@

            snprintf(tmp, sizeof(tmp), "%d", *(int32_t*)body);

            str = tmp;

        }

-       spa_debugn("%s", str);

+       spa_strbuf_append(buffer, "%s", str);

        break;

    }

    case SPA_TYPE_Int:

-       spa_debugn("%d", *(int32_t *) body);

+       spa_strbuf_append(buffer, "%d", *(int32_t *) body);

        break;

    case SPA_TYPE_Long:

-       spa_debugn("%" PRIi64, *(int64_t *) body);

+       spa_strbuf_append(buffer, "%" PRIi64, *(int64_t *) body);

        break;

    case SPA_TYPE_Float:

-       spa_debugn("%f", *(float *) body);

+       spa_strbuf_append(buffer, "%f", *(float *) body);

        break;

    case SPA_TYPE_Double:

-       spa_debugn("%f", *(double *) body);

+       spa_strbuf_append(buffer, "%f", *(double *) body);

        break;

    case SPA_TYPE_String:

-       spa_debugn("%s", (char *) body);

+       spa_strbuf_append(buffer, "%s", (char *) body);

        break;

    case SPA_TYPE_Rectangle:

    {

        struct spa_rectangle *r = (struct spa_rectangle *)body;

-       spa_debugn("%" PRIu32 "x%" PRIu32, r->width, r->height);

+       spa_strbuf_append(buffer, "%" PRIu32 "x%" PRIu32, r->width, r->height);

        break;

    }

    case SPA_TYPE_Fraction:

    {

        struct spa_fraction *f = (struct spa_fraction *)body;

-       spa_debugn("%" PRIu32 "/%" PRIu32, f->num, f->denom);

+       spa_strbuf_append(buffer, "%" PRIu32 "/%" PRIu32, f->num, f->denom);

        break;

    }

    case SPA_TYPE_Bitmap:

-       spa_debugn("Bitmap");

+       spa_strbuf_append(buffer, "Bitmap");

        break;

    case SPA_TYPE_Bytes:

-       spa_debugn("Bytes");

+       spa_strbuf_append(buffer, "Bytes");

        break;

    case SPA_TYPE_Array:

    {

@@ -98,23 +100,35 @@

        struct spa_pod_array_body *b = (struct spa_pod_array_body *)body;

        int i = 0;

        info = info && info->values ? info->values : info;

-       spa_debugn("< ");

+       spa_strbuf_append(buffer, "< ");

        SPA_POD_ARRAY_BODY_FOREACH(b, size, p) {

            if (i++ > 0)

-               spa_debugn(", ");

-           spa_debug_format_value(info, b->child.type, p, b->child.size);

+               spa_strbuf_append(buffer, ", ");

+           spa_debug_strbuf_format_value(buffer, info, b->child.type, p, b->child.size);

        }

-       spa_debugn(" >");

+       spa_strbuf_append(buffer, " >");

        break;

    }

    default:

-       spa_debugn("INVALID type %d", type);

+       spa_strbuf_append(buffer, "INVALID type %d", type);

        break;

    }

    return 0;

 }

-static inline int spa_debug_format(int indent,

+static inline int

+spa_debug_format_value(const struct spa_type_info *info,

+       uint32_t type, void *body, uint32_t size)

+{

+   char buffer1024;

+   struct spa_strbuf buf;

+   spa_strbuf_init(&buf, buffer, sizeof(buffer));

+   spa_debug_strbuf_format_value(&buf, info, type, body, size);

+   spa_debugn("%s", buffer);

+   return 0;

+}

+

+static inline int spa_debugc_format(struct spa_debug_context *ctx, int indent,

        const struct spa_type_info *info, const struct spa_pod *format)

 {

    const char *media_type;

@@ -134,7 +148,7 @@

    media_type = spa_debug_type_find_name(spa_type_media_type, mtype);

    media_subtype = spa_debug_type_find_name(spa_type_media_subtype, mstype);

-   spa_debug("%*s %s/%s", indent, "",

+   spa_debugc(ctx, "%*s %s/%s", indent, "",

        media_type ? spa_debug_type_short_name(media_type) : "unknown",

        media_subtype ? spa_debug_type_short_name(media_subtype) : "unknown");

@@ -144,6 +158,8 @@

        uint32_t i, type, size, n_vals, choice;

        const struct spa_pod *val;

        void *vals;

+       char buffer1024;

+       struct spa_strbuf buf;

        if (prop->key == SPA_FORMAT_mediaType ||

            prop->key == SPA_FORMAT_mediaSubtype)

@@ -161,12 +177,13 @@

        ti = spa_debug_type_find(info, prop->key);

        key = ti ? ti->name : NULL;

-       spa_debugn("%*s %16s : (%s) ", indent, "",

+       spa_strbuf_init(&buf, buffer, sizeof(buffer));

+       spa_strbuf_append(&buf, "%*s %16s : (%s) ", indent, "",

            key ? spa_debug_type_short_name(key) : "unknown",

            spa_debug_type_short_name(spa_typestype.name));

        if (choice == SPA_CHOICE_None) {

-           spa_debug_format_value(ti ? ti->values : NULL, type, vals, size);

+           spa_debug_strbuf_format_value(&buf, ti ? ti->values : NULL, type, vals, size);

        } else {

            const char *ssep, *esep, *sep;

@@ -186,21 +203,26 @@

                break;

            }

-           spa_debugn("%s", ssep);

+           spa_strbuf_append(&buf, "%s", ssep);

            for (i = 1; i < n_vals; i++) {

                vals = SPA_PTROFF(vals, size, void);

                if (i > 1)

-                   spa_debugn("%s", sep);

-               spa_debug_format_value(ti ? ti->values : NULL, type, vals, size);

+                   spa_strbuf_append(&buf, "%s", sep);

+               spa_debug_strbuf_format_value(&buf, ti ? ti->values : NULL, type, vals, size);

            }

-           spa_debugn("%s", esep);

+           spa_strbuf_append(&buf, "%s", esep);