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

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

+Fri Nov  3 13:41:27 UTC 2023 - Bjørn Lie <zaitor@opensuse.org>

+

+- Update to version 0.3.84

+

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

 Mon Oct 23 15:00:54 UTC 2023 - Bjørn Lie <zaitor@opensuse.org>

 - Update to version 0.3.83

​

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

 %define soversion 0_2

 Name:           pipewire-aptx

-Version:        0.3.83

+Version:        0.3.84

 Release:        0

 Summary:        PipeWire Bluetooth aptX codec plugin

 License:        MIT

​

@@ -1,3 +1,64 @@

+# PipeWire 0.3.84 (2023-11-02)

+

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

+with previous 0.3.x releases.

+

+## Highlights

+  - Fix a regression with openal because the queued buffers in the stream

+    were not reported correctly.

+  - Fix a bug in port busy counters that could cause random silent links.

+  - Fix a regression in echo-cancel because it was not reporting its

+    streams as ASYNC.

+  - Fix a JACK regression where not all ports were enumerated in all cases.

+  - Many more fixes and improvements.

+

+

+## PipeWire

+  - pw_stream now reports the queued buffers more accurately. This fixes

+    a regression when using openal. (#3592)

+  - The port busy counters were not updated correctly in some cases. This

+    could lead to negotiation errors and silent links. (#3547)

+  - Ignore latency maximum when forcing rate/quantum. (#3613)

+  - Nodes can now be added to multiple groups and link-groups. (#3612)

+

+## Modules

+  - The filter-chain now also handles notify port dependencies

+    correctly. (#3596)

+  - Filter-chain has support for new linear, clamp, recip, exp, log, mult,

+    sine builtin plugins.

+  - The echo-cancel module now correctly reports its playback and capture

+    streams as ASYNC to avoid running out of buffers. (#3593)

+  - It is now possible to specify an array of remote names to connect to

+    with the native protocol.

+  - module-rtp-sap and module-rtp-sink now try to bind to the specified

+    interface.

+

+## SPA

+  - The alsa plugin now removes the runtime properties such as period-num,

+    period-size and max-latency when suspended. (#3613)

+

+## Bluetooth

+  - BAP Locations/Context is now set on endpoints as required by new bluez.

+  - Improve selection of BAP leader.

+

+## JACK

+  - Add a jack_set_sample_rate() extension function.

+  - Make sure we get the info of all nodes/ports before completing the

+    jack_client_open() operation so that we can enumerate the ports

+    correctly in all cases. (#3618)

+

+## GStreamer

+  - Fix types of metadata in pipewiresink.

+  - Also copy metadata in buffers in all cases.

+  - Fix size allocation in bufferpool for compressed formats.

+  - Don't stop streaming thread when unlinked. (#3620)

+

+## ALSA

+  - The ALSA plugin now handles NULL values from mmap_areas. (#3600)

+

+Older versions:

+

+

 # PipeWire 0.3.83 (2023-10-19)

 This is the third 1.0 release candidate that is API and ABI compatible

@@ -52,9 +113,6 @@

     (#3585)

   - Potentially fix silent export in ardour in some cases. (#3514)

-Older versions:

-

-

 # PipeWire 0.3.82 (2023-10-13)

 This is the second 1.0 release candidate that is API and ABI compatible

​

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

 project('pipewire', 'c' ,

-  version : '0.3.83',

+  version : '0.3.84',

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

   meson_version : '>= 0.61.1',

   default_options :  'warning_level=3',

​

@@ -309,21 +309,21 @@

        xfer = nframes;

        if (xfer > 0) {

            const snd_pcm_channel_area_t *areas = snd_pcm_ioplug_mmap_areas(io);

-           const snd_pcm_uframes_t offset = hw_ptr % io->buffer_size;

-

-           if (io->stream == SND_PCM_STREAM_PLAYBACK)

-               snd_pcm_areas_copy_wrap(pwareas, 0, nframes,

-                       areas, offset,

-                       io->buffer_size,

-                       io->channels, xfer,

-                       io->format);

-           else

-               snd_pcm_areas_copy_wrap(areas, offset,

-                       io->buffer_size,

-                       pwareas, 0, nframes,

-                       io->channels, xfer,

-                       io->format);

-

+           if (areas != NULL) {

+               const snd_pcm_uframes_t offset = hw_ptr % io->buffer_size;

+               if (io->stream == SND_PCM_STREAM_PLAYBACK)

+                   snd_pcm_areas_copy_wrap(pwareas, 0, nframes,

+                           areas, offset,

+                           io->buffer_size,

+                           io->channels, xfer,

+                           io->format);

+               else

+                   snd_pcm_areas_copy_wrap(areas, offset,

+                           io->buffer_size,

+                           pwareas, 0, nframes,

+                           io->channels, xfer,

+                           io->format);

+           }

            hw_ptr += xfer;

            if (hw_ptr >= pw->boundary)

                hw_ptr -= pw->boundary;

​

@@ -23,6 +23,8 @@

 int jack_get_video_image_size(jack_client_t *client, jack_image_size_t *size);

+int jack_set_sample_rate (jack_client_t *client, jack_nframes_t nframes);

+

 #ifdef __cplusplus

 }

 #endif

​

@@ -426,6 +426,7 @@

    int rt_max;

    unsigned int fix_midi_events:1;

    unsigned int global_buffer_size:1;

+   unsigned int global_sample_rate:1;

    unsigned int passive_links:1;

    unsigned int graph_callback_pending:1;

    unsigned int pending_callbacks:1;

@@ -1519,13 +1520,17 @@

 static void prepare_output(struct port *p, uint32_t frames)

 {

    struct mix *mix;

+   struct spa_io_buffers *io;

    if (SPA_UNLIKELY(p->empty_out || p->tied))

        process_empty(p, frames);

+   if (p->global_mix == NULL || (io = p->global_mix->io) == NULL)

+       return;

+

    spa_list_for_each(mix, &p->mix, port_link) {

        if (SPA_LIKELY(mix->io != NULL))

-           *mix->io = p->io;

+           *mix->io = *io;

    }

 }

@@ -3261,7 +3266,7 @@

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

    struct object *o, *ot, *op;

    const char *str;

-   bool do_emit = true;

+   bool do_emit = true, do_sync = false;

    uint32_t serial;

    if (props == NULL)

@@ -3343,6 +3348,7 @@

                        &o->proxy_listener, &proxy_events, o);

                pw_proxy_add_object_listener(o->proxy,

                        &o->object_listener, &node_events, o);

+               do_sync = true;

            }

        }

        pthread_mutex_lock(&c->context.lock);

@@ -3437,6 +3443,7 @@

                pw_port_subscribe_params((struct pw_port*)o->proxy,

                        ids, 1);

+               do_sync = true;

            }

            pthread_mutex_lock(&c->context.lock);

            spa_list_append(&c->context.objects, &o->link);

@@ -3558,6 +3565,7 @@

            pw_metadata_add_listener(proxy,

                    &c->metadata->listener,

                    &metadata_events, c);

+           do_sync = true;

        } else if (spa_streq(str, "settings")) {

            proxy = pw_registry_bind(c->registry,

                    id, type, PW_VERSION_METADATA, sizeof(struct metadata));

@@ -3567,6 +3575,7 @@

            pw_proxy_add_listener(proxy,

                    &c->settings->proxy_listener,

                    &settings_proxy_events, c);

+           do_sync = true;

        }

        goto exit;

    }

@@ -3601,6 +3610,9 @@

    }

       exit:

+   if (do_sync)

+       c->pending_sync = pw_proxy_sync((struct pw_proxy*)c->core,

+               c->pending_sync);

    return;

       exit_free:

    free_object(c, o);

@@ -3932,6 +3944,7 @@

    client->default_as_system = pw_properties_get_bool(client->props, "jack.default-as-system", false);

    client->fix_midi_events = pw_properties_get_bool(client->props, "jack.fix-midi-events", true);

    client->global_buffer_size = pw_properties_get_bool(client->props, "jack.global-buffer-size", false);

+   client->global_sample_rate = pw_properties_get_bool(client->props, "jack.global-sample-rate", false);

    client->max_ports = pw_properties_get_uint32(client->props, "jack.max-client-ports", MAX_CLIENT_PORTS);

    client->fill_aliases = pw_properties_get_bool(client->props, "jack.fill-aliases", false);

    client->writable_input = pw_properties_get_bool(client->props, "jack.writable-input", true);

@@ -3952,13 +3965,15 @@

    if (status)

        *status = 0;

+   client->pending_sync = pw_proxy_sync((struct pw_proxy*)client->core, client->pending_sync);

+

    while (true) {

            pw_thread_loop_wait(client->context.loop);

        if (client->last_res < 0)

            goto init_failed;

-       if (client->has_transport)

+       if (client->pending_sync == client->last_sync)

            break;

    }

@@ -4720,6 +4735,37 @@

 }

 SPA_EXPORT

+int jack_set_sample_rate (jack_client_t *client, jack_nframes_t nframes)

+{

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

+

+   return_val_if_fail(c != NULL, -EINVAL);

+

+   pw_log_info("%p: sample-size %u", client, nframes);

+

+   pw_thread_loop_lock(c->context.loop);

+   if (c->global_sample_rate && c->settings && c->settings->proxy) {

+       char val256;

+       snprintf(val, sizeof(val), "%u", nframes);

+       pw_metadata_set_property(c->settings->proxy, 0,

+               "clock.force-rate", "", val);

+   } else {

+       pw_properties_setf(c->props, PW_KEY_NODE_FORCE_RATE, "%u", nframes);

+

+       c->info.change_mask |= SPA_NODE_CHANGE_MASK_PROPS;

+       c->info.props = &c->props->dict;

+

+       pw_client_node_update(c->node,

+                                       PW_CLIENT_NODE_UPDATE_INFO,

+                       0, NULL, &c->info);

+       c->info.change_mask = 0;

+   }

+   pw_thread_loop_unlock(c->context.loop);

+

+   return 0;

+}

+

+SPA_EXPORT

 jack_nframes_t jack_get_sample_rate (jack_client_t *client)

 {

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

@@ -5045,6 +5091,19 @@

    return &mix->buffersio->buffer_id;

 }

+static inline void *get_buffer_data(struct buffer *b, jack_nframes_t frames)

+{

+   struct spa_data *d;

+   uint32_t offset, size;

+

+   d = &b->datas0;

+   offset = SPA_MIN(d->chunk->offset, d->maxsize);

+   size = SPA_MIN(d->chunk->size, d->maxsize - offset);

+   if (size / sizeof(float) < frames)

+       return NULL;

+   return SPA_PTROFF(d->data, offset, void);

+}

+

 static void *get_buffer_input_float(struct port *p, jack_nframes_t frames)

 {

    struct mix *mix;

@@ -5055,8 +5114,8 @@

    bool ptr_aligned = true;

    spa_list_for_each(mix, &p->mix, port_link) {

-       struct spa_data *d;

-       uint32_t offset, size;

+       if (mix->id == SPA_ID_INVALID)

+           continue;

        pw_log_trace_fp("%p: port %s mix %d.%d get buffer %d",

                p->client, p->object->port.name, p->port_id, mix->id, frames);

@@ -5064,13 +5123,9 @@

        if ((b = get_mix_buffer(mix, frames)) == NULL)

            continue;

-       d = &b->datas0;

-       offset = SPA_MIN(d->chunk->offset, d->maxsize);

-       size = SPA_MIN(d->chunk->size, d->maxsize - offset);

-       if (size / sizeof(float) < frames)

+       if ((np = get_buffer_data(b, frames)) == NULL)

            continue;

-       np = SPA_PTROFF(d->data, offset, float);

        if (!SPA_IS_ALIGNED(np, 16))

            ptr_aligned = false;

@@ -5104,6 +5159,9 @@

        struct buffer *b;

        void *pod;

+       if (mix->id == SPA_ID_INVALID)

+           continue;

+

        pw_log_trace_fp("%p: port %p mix %d.%d get buffer %d",

                p->client, p, p->port_id, mix->id, frames);

@@ -5168,8 +5226,6 @@

    if ((p = o->port.port) == NULL) {

        struct mix *mix;

​

@@ -55,6 +55,11 @@

            itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.period-num", nperiods);

            snprintf(headroom, sizeof(headroom), "%u", this->headroom);

            itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.headroom", headroom);

+       } else {

+           itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_MAX_LATENCY, NULL);

+           itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.period-size", NULL);

+           itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.period-num", NULL);

+           itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.headroom", NULL);

        }

        this->info.props = &SPA_DICT_INIT(items, n_items);

​

@@ -55,6 +55,11 @@

            itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.period-num", nperiods);

            snprintf(headroom, sizeof(headroom), "%u", this->headroom);

            itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.headroom", headroom);

+       } else {

+           itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_MAX_LATENCY, NULL);

+           itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.period-size", NULL);

+           itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.period-num", NULL);

+           itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.headroom", NULL);

        }

        this->info.props = &SPA_DICT_INIT(items, n_items);

​

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

 #define LC3_CONFIG_DURATION_7_5 0x00

 #define LC3_CONFIG_DURATION_10  0x01

-#define LC3_CONFIG_CHNL_NOT_ALLOWED 0x00000000

-#define LC3_CONFIG_CHNL_FL          0x00000001 /* front left */

-#define LC3_CONFIG_CHNL_FR          0x00000002 /* front right */

-#define LC3_CONFIG_CHNL_FC          0x00000004 /* front center */

-#define LC3_CONFIG_CHNL_LFE         0x00000008 /* LFE */

-#define LC3_CONFIG_CHNL_BL          0x00000010 /* back left */

-#define LC3_CONFIG_CHNL_BR          0x00000020 /* back right */

-#define LC3_CONFIG_CHNL_FLC         0x00000040 /* front left center */

-#define LC3_CONFIG_CHNL_FRC         0x00000080 /* front right center */

-#define LC3_CONFIG_CHNL_BC          0x00000100 /* back center */

-#define LC3_CONFIG_CHNL_LFE2       0x00000200 /* LFE 2 */

-#define LC3_CONFIG_CHNL_SL          0x00000400 /* side left */

-#define LC3_CONFIG_CHNL_SR          0x00000800 /* side right */

-#define LC3_CONFIG_CHNL_TFL         0x00001000 /* top front left */

-#define LC3_CONFIG_CHNL_TFR         0x00002000 /* top front right */

-#define LC3_CONFIG_CHNL_TFC         0x00004000 /* top front center */

-#define LC3_CONFIG_CHNL_TC          0x00008000 /* top center */

-#define LC3_CONFIG_CHNL_TBL         0x00010000 /* top back left */

-#define LC3_CONFIG_CHNL_TBR         0x00020000 /* top back right */

-#define LC3_CONFIG_CHNL_TSL         0x00040000 /* top side left */

-#define LC3_CONFIG_CHNL_TSR         0x00080000 /* top side right */

-#define LC3_CONFIG_CHNL_TBC         0x00100000 /* top back center */

-#define LC3_CONFIG_CHNL_BFC         0x00200000 /* bottom front center */

-#define LC3_CONFIG_CHNL_BFL         0x00400000 /* bottom front left */

-#define LC3_CONFIG_CHNL_BFR         0x00800000 /* bottom front right */

-#define LC3_CONFIG_CHNL_FLW         0x01000000 /* front left wide */

-#define LC3_CONFIG_CHNL_FRW         0x02000000 /* front right wide */

-#define LC3_CONFIG_CHNL_LS          0x04000000 /* left surround */

-#define LC3_CONFIG_CHNL_RS          0x08000000 /* right surround */

-

 #define LC3_MAX_CHANNELS 28

+#define BAP_CHANNEL_NOT_ALLOWED    0x00000000

+#define BAP_CHANNEL_FL     0x00000001 /* front left */

+#define BAP_CHANNEL_FR     0x00000002 /* front right */

+#define BAP_CHANNEL_FC     0x00000004 /* front center */

+#define BAP_CHANNEL_LFE        0x00000008 /* LFE */

+#define BAP_CHANNEL_BL     0x00000010 /* back left */

+#define BAP_CHANNEL_BR     0x00000020 /* back right */

+#define BAP_CHANNEL_FLC        0x00000040 /* front left center */

+#define BAP_CHANNEL_FRC        0x00000080 /* front right center */

+#define BAP_CHANNEL_BC     0x00000100 /* back center */

+#define BAP_CHANNEL_LFE2   0x00000200 /* LFE 2 */

+#define BAP_CHANNEL_SL     0x00000400 /* side left */

+#define BAP_CHANNEL_SR     0x00000800 /* side right */

+#define BAP_CHANNEL_TFL        0x00001000 /* top front left */

+#define BAP_CHANNEL_TFR        0x00002000 /* top front right */

+#define BAP_CHANNEL_TFC        0x00004000 /* top front center */

+#define BAP_CHANNEL_TC     0x00008000 /* top center */

+#define BAP_CHANNEL_TBL        0x00010000 /* top back left */

+#define BAP_CHANNEL_TBR        0x00020000 /* top back right */

+#define BAP_CHANNEL_TSL        0x00040000 /* top side left */

+#define BAP_CHANNEL_TSR        0x00080000 /* top side right */

+#define BAP_CHANNEL_TBC        0x00100000 /* top back center */

+#define BAP_CHANNEL_BFC        0x00200000 /* bottom front center */

+#define BAP_CHANNEL_BFL        0x00400000 /* bottom front left */

+#define BAP_CHANNEL_BFR        0x00800000 /* bottom front right */

+#define BAP_CHANNEL_FLW        0x01000000 /* front left wide */

+#define BAP_CHANNEL_FRW        0x02000000 /* front right wide */

+#define BAP_CHANNEL_LS     0x04000000 /* left surround */

+#define BAP_CHANNEL_RS     0x08000000 /* right surround */

+

+#define BAP_CHANNEL_ALL         0x0fffffff /* mask of all */

+

+#define BAP_CONTEXT_PROHIBITED     0x0000 /* Prohibited */

+#define BAP_CONTEXT_UNSPECIFIED        0x0001 /* Unspecified */

+#define BAP_CONTEXT_CONVERSATIONAL 0x0002 /* Telephony, video calls, ... */

+#define BAP_CONTEXT_MEDIA      0x0004 /* Music, radio, podcast, movie soundtrack, TV */

+#define BAP_CONTEXT_GAME       0x0008 /* Gaming media, game effects, music, in-game voice chat  */

+#define BAP_CONTEXT_INSTRUCTIONAL  0x0010 /* Instructional audio, navigation, announcements, user guidance */

+#define BAP_CONTEXT_VOICE      0x0020 /* Man-machine communication, voice recognition, virtual assistants */

+#define BAP_CONTEXT_LIVE       0x0040 /* Live audio, perceived both via direct acoustic path and via BAP */

+#define BAP_CONTEXT_SOUND_EFFECTS  0x0080 /* Keyboard and touch feedback, menu, UI, other system sounds */

+#define BAP_CONTEXT_NOTIFICATIONS  0x0100 /* Attention-seeking, message arrival, reminders */

+#define BAP_CONTEXT_RINGTONE       0x0200 /* Incoming call alert audio */

+#define BAP_CONTEXT_ALERTS     0x0400 /* Alarms and timers, critical battery, alarm clock, toaster */

+#define BAP_CONTEXT_EMERGENCY      0x0800 /* Fire alarm, other urgent alerts */

+

+#define BAP_CONTEXT_ALL            0x0fff

+

 #define BT_ISO_QOS_CIG_UNSET    0xff

 #define BT_ISO_QOS_CIS_UNSET    0xff

​

@@ -53,34 +53,34 @@

    uint32_t bit;

    enum spa_audio_channel channel;

 } channel_bits = {

-   { LC3_CONFIG_CHNL_FL,   SPA_AUDIO_CHANNEL_FL },

-   { LC3_CONFIG_CHNL_FR,   SPA_AUDIO_CHANNEL_FR },

-   { LC3_CONFIG_CHNL_FC,   SPA_AUDIO_CHANNEL_FC },

-   { LC3_CONFIG_CHNL_LFE,  SPA_AUDIO_CHANNEL_LFE },

-   { LC3_CONFIG_CHNL_BL,   SPA_AUDIO_CHANNEL_RL },

-   { LC3_CONFIG_CHNL_BR,   SPA_AUDIO_CHANNEL_RR },

-   { LC3_CONFIG_CHNL_FLC,  SPA_AUDIO_CHANNEL_FLC },

-   { LC3_CONFIG_CHNL_FRC,  SPA_AUDIO_CHANNEL_FRC },

-   { LC3_CONFIG_CHNL_BC,   SPA_AUDIO_CHANNEL_BC },

-   { LC3_CONFIG_CHNL_LFE2, SPA_AUDIO_CHANNEL_LFE2 },

-   { LC3_CONFIG_CHNL_SL,   SPA_AUDIO_CHANNEL_SL },

-   { LC3_CONFIG_CHNL_SR,   SPA_AUDIO_CHANNEL_SR },

-   { LC3_CONFIG_CHNL_TFL,  SPA_AUDIO_CHANNEL_TFL },

-   { LC3_CONFIG_CHNL_TFR,  SPA_AUDIO_CHANNEL_TFR },

-   { LC3_CONFIG_CHNL_TFC,  SPA_AUDIO_CHANNEL_TFC },

-   { LC3_CONFIG_CHNL_TC,   SPA_AUDIO_CHANNEL_TC },

-   { LC3_CONFIG_CHNL_TBL,  SPA_AUDIO_CHANNEL_TRL },

-   { LC3_CONFIG_CHNL_TBR,  SPA_AUDIO_CHANNEL_TRR },

-   { LC3_CONFIG_CHNL_TSL,  SPA_AUDIO_CHANNEL_TSL },

-   { LC3_CONFIG_CHNL_TSR,  SPA_AUDIO_CHANNEL_TSR },

-   { LC3_CONFIG_CHNL_TBC,  SPA_AUDIO_CHANNEL_TRC },

-   { LC3_CONFIG_CHNL_BFC,  SPA_AUDIO_CHANNEL_BC },

-   { LC3_CONFIG_CHNL_BFL,  SPA_AUDIO_CHANNEL_BLC },

-   { LC3_CONFIG_CHNL_BFR,  SPA_AUDIO_CHANNEL_BRC },

-   { LC3_CONFIG_CHNL_FLW,  SPA_AUDIO_CHANNEL_FLW },

-   { LC3_CONFIG_CHNL_FRW,  SPA_AUDIO_CHANNEL_FRW },

-   { LC3_CONFIG_CHNL_LS,   SPA_AUDIO_CHANNEL_SL }, /* is it the right mapping? */

-   { LC3_CONFIG_CHNL_RS,   SPA_AUDIO_CHANNEL_SR }, /* is it the right mapping? */

+   { BAP_CHANNEL_FL,   SPA_AUDIO_CHANNEL_FL },

+   { BAP_CHANNEL_FR,   SPA_AUDIO_CHANNEL_FR },

+   { BAP_CHANNEL_FC,   SPA_AUDIO_CHANNEL_FC },

+   { BAP_CHANNEL_LFE,  SPA_AUDIO_CHANNEL_LFE },

+   { BAP_CHANNEL_BL,   SPA_AUDIO_CHANNEL_RL },

+   { BAP_CHANNEL_BR,   SPA_AUDIO_CHANNEL_RR },

+   { BAP_CHANNEL_FLC,  SPA_AUDIO_CHANNEL_FLC },

+   { BAP_CHANNEL_FRC,  SPA_AUDIO_CHANNEL_FRC },

+   { BAP_CHANNEL_BC,   SPA_AUDIO_CHANNEL_BC },

+   { BAP_CHANNEL_LFE2, SPA_AUDIO_CHANNEL_LFE2 },

+   { BAP_CHANNEL_SL,   SPA_AUDIO_CHANNEL_SL },

+   { BAP_CHANNEL_SR,   SPA_AUDIO_CHANNEL_SR },

+   { BAP_CHANNEL_TFL,  SPA_AUDIO_CHANNEL_TFL },

+   { BAP_CHANNEL_TFR,  SPA_AUDIO_CHANNEL_TFR },

+   { BAP_CHANNEL_TFC,  SPA_AUDIO_CHANNEL_TFC },

+   { BAP_CHANNEL_TC,   SPA_AUDIO_CHANNEL_TC },

+   { BAP_CHANNEL_TBL,  SPA_AUDIO_CHANNEL_TRL },

+   { BAP_CHANNEL_TBR,  SPA_AUDIO_CHANNEL_TRR },

+   { BAP_CHANNEL_TSL,  SPA_AUDIO_CHANNEL_TSL },

+   { BAP_CHANNEL_TSR,  SPA_AUDIO_CHANNEL_TSR },

+   { BAP_CHANNEL_TBC,  SPA_AUDIO_CHANNEL_TRC },

+   { BAP_CHANNEL_BFC,  SPA_AUDIO_CHANNEL_BC },

+   { BAP_CHANNEL_BFL,  SPA_AUDIO_CHANNEL_BLC },

+   { BAP_CHANNEL_BFR,  SPA_AUDIO_CHANNEL_BRC },

+   { BAP_CHANNEL_FLW,  SPA_AUDIO_CHANNEL_FLW },

+   { BAP_CHANNEL_FRW,  SPA_AUDIO_CHANNEL_FRW },

+   { BAP_CHANNEL_LS,   SPA_AUDIO_CHANNEL_SL }, /* is it the right mapping? */

+   { BAP_CHANNEL_RS,   SPA_AUDIO_CHANNEL_SR }, /* is it the right mapping? */

 };

 static int write_ltv(uint8_t *dest, uint8_t type, void* value, size_t len)

​

@@ -38,6 +38,7 @@

 #include "dbus-helpers.h"

 #include "player.h"

 #include "iso-io.h"

+#include "bap-codec-caps.h"

 #include "defs.h"

 static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5");

@@ -2017,41 +2018,31 @@

 static bool device_set_update_leader(struct spa_bt_set_membership *set)

 {

-   struct spa_bt_set_membership *s, *leader;

-   int min_rank = INT_MAX;

-   int leader_rank = INT_MAX;

-

-   leader = NULL;

+   struct spa_bt_set_membership *s, *leader = NULL;

+   /* Make minimum rank device the leader, so that device set nodes always

+    * appear under a specific device.

+    */

    spa_bt_for_each_set_member(s, set) {

        if (!(s->device->connected_profiles & SPA_BT_PROFILE_BAP_DUPLEX))

            continue;

-       min_rank = SPA_MIN(min_rank, s->rank);

-       if (s->leader) {

-           leader_rank = s->rank;

+

+       if (leader == NULL || s->rank < leader->rank ||

+               (s->rank == leader->rank && s->leader))

            leader = s;

-       }

    }

-   if (min_rank >= leader_rank && leader)

+   if (leader == NULL || (leader && leader->leader))

        return false;

-   spa_bt_for_each_set_member(s, set) {

-       if (leader == NULL && s->rank == min_rank &&

-               (s->device->connected_profiles & SPA_BT_PROFILE_BAP_DUPLEX)) {

-           s->leader = true;

-           leader = s;

-       } else {

-           s->leader = false;

-       }

-   }

+   spa_bt_for_each_set_member(s, set)

+       s->leader = false;

-   if (leader) {

-       struct spa_bt_monitor *monitor = leader->device->monitor;

+   leader->leader = true;

-       spa_log_debug(monitor->log, "device set %s: leader is %s",

-               leader->path, leader->device->path);

-   }

+   spa_log_debug(leader->device->monitor->log,

+           "device set %p %s: leader is %s",

+           set, leader->path, leader->device->path);

    return true;

 }

@@ -4684,7 +4675,6 @@

 {

    const char *interface_name = BLUEZ_MEDIA_ENDPOINT_INTERFACE;

    DBusMessageIter object, array, entry, dict;

-   dbus_bool_t delay_reporting;

    dbus_message_iter_open_container(iter, DBUS_TYPE_DICT_ENTRY, NULL, &object);

    dbus_message_iter_append_basic(&object, DBUS_TYPE_OBJECT_PATH, &endpoint);

@@ -4699,10 +4689,28 @@

    append_basic_variant_dict_entry(&dict, "UUID", DBUS_TYPE_STRING, "s", &uuid);

    append_basic_variant_dict_entry(&dict, "Codec", DBUS_TYPE_BYTE, "y", &codec_id);

    append_basic_array_variant_dict_entry(&dict, "Capabilities", "ay", "y", DBUS_TYPE_BYTE, caps, caps_size);

+

    if (spa_bt_profile_from_uuid(uuid) & SPA_BT_PROFILE_A2DP_SOURCE) {

-       delay_reporting = TRUE;

+       dbus_bool_t delay_reporting = TRUE;

+

        append_basic_variant_dict_entry(&dict, "DelayReporting", DBUS_TYPE_BOOLEAN, "b", &delay_reporting);

    }

+   if (spa_bt_profile_from_uuid(uuid) & (SPA_BT_PROFILE_BAP_SINK | SPA_BT_PROFILE_BAP_SOURCE)) {

+       dbus_uint32_t locations;

+       dbus_uint16_t supported_context, context;

+

+       locations = BAP_CHANNEL_ALL;

+       if (spa_bt_profile_from_uuid(uuid) & SPA_BT_PROFILE_BAP_SINK) {

+           supported_context = context = BAP_CONTEXT_ALL;

+       } else {

+           supported_context = context = (BAP_CONTEXT_UNSPECIFIED | BAP_CONTEXT_CONVERSATIONAL |

+                   BAP_CONTEXT_MEDIA | BAP_CONTEXT_GAME);

+       }

+

+       append_basic_variant_dict_entry(&dict, "Locations", DBUS_TYPE_UINT32, "u", &locations);

+       append_basic_variant_dict_entry(&dict, "Context", DBUS_TYPE_UINT16, "q", &context);

+       append_basic_variant_dict_entry(&dict, "SupportedContext", DBUS_TYPE_UINT16, "q", &supported_context);

+   }

    dbus_message_iter_close_container(&entry, &dict);

    dbus_message_iter_close_container(&array, &entry);

​

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

    char transport32, str_id32, object_path512;

    bool is_dyn_node = SPA_FLAG_IS_SET(id, DYNAMIC_NODE_ID_FLAG);

-   spa_log_debug(this->log, "node, transport:%p id:%08x factory:%s", t, id, factory_name);

+   spa_log_debug(this->log, "%p: node, transport:%p id:%08x factory:%s", this, t, id, factory_name);

    snprintf(transport, sizeof(transport), "pointer:%p", t);

    items0 = SPA_DICT_ITEM_INIT(SPA_KEY_API_BLUEZ5_TRANSPORT, transport);

@@ -838,8 +838,8 @@

 static void emit_dynamic_node(struct dynamic_node *this, struct impl *impl,

    struct spa_bt_transport *t, uint32_t id, const char *factory_name, bool a2dp_duplex)

 {

-   spa_log_debug(impl->log, "dynamic node, transport: %p->%p id: %08x->%08x",

-       this->transport, t, this->id, id);

+   spa_log_debug(impl->log, "%p: dynamic node, transport: %p->%p id: %08x->%08x",

+           this, this->transport, t, this->id, id);

    if (this->transport) {

        /* Session manager don't really handles transport ptr changing. */

@@ -955,6 +955,9 @@

            continue;

        }

+       spa_log_debug(this->log, "%p: %s belongs to set %s leader:%d", this,

+               device->path, set->path, set->leader);

+

        dset->path = strdup(set->path);

        dset->leader = set->leader;

        break;

@@ -1124,7 +1127,7 @@

 static void emit_remove_nodes(struct impl *this)

 {

-   spa_log_debug(this->log, "remove nodes");

+   spa_log_debug(this->log, "%p: remove nodes", this);

    remove_dynamic_node (&this->dyn_media_source);

    remove_dynamic_node (&this->dyn_media_sink);

​

@@ -89,6 +89,9 @@

    struct spa_param_info params2;

    struct props props;

+   struct spa_io_clock *clock;

+   struct spa_io_position *position;

+

    struct spa_hook_list hooks;

    struct spa_callbacks callbacks;

@@ -196,7 +199,23 @@

 static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)

 {

-   return -ENOTSUP;

+   struct impl *this = object;

+

+   spa_return_val_if_fail(this != NULL, -EINVAL);

+

+   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:

+       this->position = data;

+       break;

+   default:

+       return -ENOENT;

+   }

+   return 0;

 }

 static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,

​

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

     # Creates an object from a PipeWire factory with the given parameters.

     # If nofail is given, errors are ignored (and no object is created).

     #

-    #{ factory = spa-node-factory   args = { factory.name = videotestsrc node.name = videotestsrc node.description = videotestsrc Spa:Pod:Object:Param:Props:patternType = 1 } }

+    #{ factory = spa-node-factory   args = { factory.name = videotestsrc node.name = videotestsrc node.description = videotestsrc "Spa:Pod:Object:Param:Props:patternType" = 1 } }

     #{ factory = spa-device-factory args = { factory.name = api.jack.device foo=bar } flags =  nofail  }

     #{ factory = spa-device-factory args = { factory.name = api.alsa.enum.udev } }

     #{ factory = spa-node-factory   args = { factory.name = api.alsa.seq.bridge node.name = Internal-MIDI-Bridge } }

​

@@ -88,11 +88,11 @@

     # If condition is given, the object is created only when the context properties

     # all match the match rules.

     #

-    #{ factory = spa-node-factory   args = { factory.name = videotestsrc node.name = videotestsrc Spa:Pod:Object:Param:Props:patternType = 1 } }

+    #{ factory = spa-node-factory   args = { factory.name = videotestsrc node.name = videotestsrc node.description = videotestsrc "Spa:Pod:Object:Param:Props:patternType" = 1 } }

     #{ factory = spa-device-factory args = { factory.name = api.jack.device foo=bar } flags =  nofail  }

     #{ factory = spa-device-factory args = { factory.name = api.alsa.enum.udev } }

     #{ factory = spa-node-factory   args = { factory.name = api.alsa.seq.bridge node.name = Internal-MIDI-Bridge } }

-    #{ factory = adapter            args = { factory.name = audiotestsrc node.name = my-test } }

+    #{ factory = adapter            args = { factory.name = audiotestsrc node.name = my-test node.description = audiotestsrc } }

     { factory = spa-node-factory   args = { factory.name = api.vulkan.compute.source node.name = vulkan-compute-source object.export = true } }

     { factory = spa-node-factory   args = { factory.name = api.vulkan.compute.filter node.name = vulkan-compute-filter object.export = true } }

​

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

         condition =  { module.x11.bell = true } 

     }

     { name = libpipewire-module-jackdbus-detect

-        args {

+        args = {

             #jack.library     = libjack.so.0

             #jack.server      = null

             #jack.client-name = PipeWire

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

     # If condition is given, the object is created only when the context properties

     # all match the match rules.

     #

-    #{ factory = spa-node-factory   args = { factory.name = videotestsrc node.name = videotestsrc node.description = videotestsrc Spa:Pod:Object:Param:Props:patternType = 1 } }

+    #{ factory = spa-node-factory   args = { factory.name = videotestsrc node.name = videotestsrc node.description = videotestsrc "Spa:Pod:Object:Param:Props:patternType" = 1 } }

     #{ factory = spa-device-factory args = { factory.name = api.jack.device foo=bar } flags =  nofail  }

     #{ factory = spa-device-factory args = { factory.name = api.alsa.enum.udev } }

     #{ factory = spa-node-factory   args = { factory.name = api.alsa.seq.bridge node.name = Internal-MIDI-Bridge } }

​

@@ -71,6 +71,7 @@

    struct spa_hook listener;

    struct spa_list device_list;

+   struct pw_properties *props;

 };

 static struct node *find_node(struct object *obj, uint32_t id)

@@ -266,7 +267,7 @@

    spa_list_remove(&obj->link);

    spa_hook_remove(&obj->listener);

    pw_proxy_destroy(obj->proxy);

-   free(obj->handle);

+   pw_unload_spa_handle(obj->handle);

    free(obj);

 }

@@ -302,7 +303,7 @@

    int res;

    void *iface;

-   handle = pw_context_load_spa_handle(impl->context, SPA_NAME_API_BLUEZ5_ENUM_DBUS, NULL);

+   handle = pw_context_load_spa_handle(impl->context, SPA_NAME_API_BLUEZ5_ENUM_DBUS, &impl->props->dict);

    if (handle == NULL) {

        res = -errno;

        goto out;

@@ -362,6 +363,10 @@

        return -1;

    }

+   if ((impl.props = pw_properties_new(NULL, NULL)) == NULL) {

+       return -1;

+   }

+

    pw_core_add_listener(impl.core,

            &impl.core_listener,

            &core_events, &impl);

​

@@ -228,7 +228,10 @@

   p->add_metavideo = has_video && gst_buffer_pool_config_has_option (config,

       GST_BUFFER_POOL_OPTION_VIDEO_META);

-  gst_buffer_pool_config_set_params (config, caps, p->video_info.size, min_buffers, max_buffers);

+  if (p->video_info.size != 0)

+    size = p->video_info.size;

+

+  gst_buffer_pool_config_set_params (config, caps, size, min_buffers, max_buffers);

   return GST_BUFFER_POOL_CLASS (gst_pipewire_pool_parent_class)->set_config (pool, config);

 }

​

@@ -267,12 +267,12 @@

   port_params1 = spa_pod_builder_add_object (&b,

       SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,

-      SPA_PARAM_META_type, SPA_POD_Int(SPA_META_Header),

+      SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header),

       SPA_PARAM_META_size, SPA_POD_Int(sizeof (struct spa_meta_header)));

   port_params2 = spa_pod_builder_add_object (&b,

       SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,

-      SPA_PARAM_META_type, SPA_POD_Int(SPA_META_VideoCrop),

+      SPA_PARAM_META_type, SPA_POD_Id(SPA_META_VideoCrop),

       SPA_PARAM_META_size, SPA_POD_Int(sizeof (struct spa_meta_region)));

   pw_thread_loop_lock (sink->core->loop);

@@ -576,9 +576,10 @@

     goto start_error;

   if (state == PW_STREAM_STATE_UNCONNECTED) {

-    enum pw_stream_flags flags = 0;

+    enum pw_stream_flags flags;

     uint32_t target_id;

+    flags = PW_STREAM_FLAG_ASYNC;

     if (pwsink->mode != GST_PIPEWIRE_SINK_MODE_PROVIDE)

       flags |= PW_STREAM_FLAG_AUTOCONNECT;

     else

@@ -676,7 +677,11 @@

     config = gst_buffer_pool_get_config (GST_BUFFER_POOL_CAST (pwsink->pool));

     gst_buffer_pool_config_get_params (config, &caps, &size, &min_buffers, &max_buffers);

-    size = (size == 0) ? gst_buffer_get_size (buffer) : size;

+    if (size == 0) {

+      gsize maxsize;

+      gst_buffer_get_sizes (buffer, NULL, &maxsize);

+      size = maxsize;

+    }

     gst_buffer_pool_config_set_params (config, caps, size, min_buffers, max_buffers);

     gst_buffer_pool_set_config (GST_BUFFER_POOL_CAST (pwsink->pool), config);

@@ -702,6 +707,7 @@

     gst_buffer_extract (buffer, 0, info.data, info.maxsize);

     gst_buffer_unmap (b, &info);

     gst_buffer_resize (b, 0, gst_buffer_get_size (buffer));

+    gst_buffer_copy_into(b, buffer, GST_BUFFER_COPY_METADATA, 0, -1);

     buffer = b;

     unref_buffer = TRUE;

​

@@ -892,7 +892,9 @@

   GST_DEBUG_OBJECT (basesrc, "connect capture with path %s, target-object %s",

                     pwsrc->path, pwsrc->target_object);

   pwsrc->negotiated = FALSE;

-  enum pw_stream_flags flags = PW_STREAM_FLAG_DONT_RECONNECT;

+  enum pw_stream_flags flags;

+  flags = PW_STREAM_FLAG_DONT_RECONNECT |

+     PW_STREAM_FLAG_ASYNC;

   if (pwsrc->autoconnect)

     flags |= PW_STREAM_FLAG_AUTOCONNECT;

   pw_stream_connect (pwsrc->stream,

@@ -1186,7 +1188,7 @@

     if (state == PW_STREAM_STATE_ERROR)

       goto streaming_error;

-    if (state != PW_STREAM_STATE_STREAMING)

+    if (state == PW_STREAM_STATE_UNCONNECTED)

       goto streaming_stopped;

     if ((caps = pwsrc->caps) != NULL) {

​

@@ -1002,7 +1002,8 @@

            PW_DIRECTION_OUTPUT,

            PW_ID_ANY,

            PW_STREAM_FLAG_MAP_BUFFERS |

-           PW_STREAM_FLAG_RT_PROCESS,

+           PW_STREAM_FLAG_RT_PROCESS |

+           PW_STREAM_FLAG_ASYNC,

            params, n_params)) < 0) {

        spa_pod_dynamic_builder_clean(&b);

        return res;

@@ -1036,7 +1037,8 @@

            PW_ID_ANY,

            PW_STREAM_FLAG_AUTOCONNECT |

            PW_STREAM_FLAG_MAP_BUFFERS |

-           PW_STREAM_FLAG_RT_PROCESS,

+           PW_STREAM_FLAG_RT_PROCESS |

+           PW_STREAM_FLAG_ASYNC,

            params, n_params)) < 0) {

        spa_pod_dynamic_builder_clean(&b);

        return res;

​

@@ -203,8 +203,8 @@

  * - `bq_notch` a notch filter.

  * - `bq_allpass` an allpass filter.

  * - `bq_raw` a raw biquad filter. You need a config section to specify coefficients

- *         per sample rate. The coefficients of the sample rate closest to the

- *         graph rate are selected:

+ *     per sample rate. The coefficients of the sample rate closest to the

+ *     graph rate are selected:

  *

  *\code{.unparsed}

  * filter.graph = {

@@ -320,6 +320,73 @@

  *

  * It has an input port "In" and an output port "Out".

  *

+ * ### Clamp

+ *

+ * The clamp plugin can be used to clamp samples between min and max values.

+ *

+ * It has an input port "In" and an output port "Out". It also has a "Control"

+ * and "Notify" port for the control values.

+ *

+ * The final result is clamped to the "Min" and "Max" control values.

+ *

+ * ### Linear

+ *

+ * The linear plugin can be used to apply a linear transformation on samples

+ * or control values.

+ *

+ * It has an input port "In" and an output port "Out". It also has a "Control"

+ * and "Notify" port for the control values.

+ *

+ * The control value "Mult" and "Add" are used to configure the linear transform. Each

+ * sample or control value will be calculated as: new = old * Mult + Add.

+ *

+ * ### Reciprocal

+ *

+ * The recip plugin can be used to calculate the reciprocal (1/x) of samples

+ * or control values.

+ *

+ * It has an input port "In" and an output port "Out". It also has a "Control"

+ * and "Notify" port for the control values.

+ *

+ * ### Exp

+ *

+ * The exp plugin can be used to calculate the exponential (base^x) of samples

+ * or control values.

+ *

+ * It has an input port "In" and an output port "Out". It also has a "Control"

+ * and "Notify" port for the control values.

+ *

+ * The control value "Base" is used to calculate base ^ x for each sample.

+ *

+ * ### Log

+ *

+ * The log plugin can be used to calculate the logarithm of samples

+ * or control values.

+ *

+ * It has an input port "In" and an output port "Out". It also has a "Control"

+ * and "Notify" port for the control values.

+ *

+ * The control value "Base", "M1" and "M2" are used to calculate

+ * out = M2 * log2f(fabsf(in * M1)) / log2f(Base) for each sample.

+ *

+ * ### Multiply

+ *

+ * The mult plugin can be used to multiply samples together.

+ *

+ * It has 8 input ports named "In 1" to "In 8" and an output port "Out".

+ *

+ * All input ports samples are multiplied together into the output. Unused input ports

+ * will be ignored and not cause overhead.

+ *

+ * ### Sine

+ *

+ * The sine plugin generates a sine wave.

+ *

+ * It has an output port "Out" and also a control output port "notify".

+ *

+ * "Freq", "Ampl", "Offset" and "Phase" can be used to control the sine wave

+ * frequence, amplitude, offset and phase.

+ *

  * ## SOFA filter

  *

  * There is an optional builtin SOFA filter available.

@@ -391,7 +458,7 @@

  * - \ref PW_KEY_NODE_LINK_GROUP

  * - \ref PW_KEY_NODE_VIRTUAL

  * - \ref PW_KEY_NODE_NAME: See notes below. If not specified, defaults to

- *     'filter-chain-<pid>-<module-id>'.

+ * 'filter-chain-<pid>-<module-id>'.

  *

  * Stream only properties:

  *

@@ -2591,6 +2658,10 @@

            spa_list_for_each(link, &node->output_porti.link_list, output_link)

                link->input->node->n_deps--;

        }

+       for (i = 0; i < desc->n_notify; i++) {

+           spa_list_for_each(link, &node->notify_porti.link_list, output_link)

+               link->input->node->n_deps--;

+       }

        /* collect all control ports on the graph */

        for (i = 0; i < desc->n_control; i++) {

​

@@ -41,6 +41,7 @@

    float gain;

    float b0, b1, b2;

    float a0, a1, a2;

+   float accum;

 };

 static void *builtin_instantiate(const struct fc_descriptor * Descriptor,

@@ -1234,6 +1235,443 @@

    .cleanup = builtin_cleanup,

 };

+/* clamp */

+static void clamp_run(void * Instance, unsigned long SampleCount)

+{

+   struct builtin *impl = Instance;

+   float min = impl->port40, max = impl->port50;

+   float *in = impl->port1, *out = impl->port0;

+   float *ctrl = impl->port3, *notify = impl->port2;

+

+   if (in != NULL && out != NULL) {

+       unsigned long n;

+       for (n = 0; n < SampleCount; n++)

+           outn = SPA_CLAMPF(inn, min, max);

+   }

+   if (ctrl != NULL && notify != NULL)

+       notify0 = SPA_CLAMPF(ctrl0, min, max);

+}

+

+static struct fc_port clamp_ports = {

+   { .index = 0,

+     .name = "Out",

+     .flags = FC_PORT_OUTPUT | FC_PORT_AUDIO,

+   },

+   { .index = 1,

+     .name = "In",

+     .flags = FC_PORT_INPUT | FC_PORT_AUDIO,

+   },

+   { .index = 2,

+     .name = "Notify",

+     .flags = FC_PORT_OUTPUT | FC_PORT_CONTROL,