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

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

+Mon Nov 21 11:36:55 UTC 2022 - Bjørn Lie <zaitor@opensuse.org>

+

+- Update to version 0.3.60

+

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

 Sat Oct 15 16:39:17 UTC 2022 - Bjørn Lie <zaitor@opensuse.org>

 - Update to version 0.3.59

​

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

 %define soversion 0_2

 Name:           pipewire-aptx

-Version:        0.3.59

+Version:        0.3.60

 Release:        0

 Summary:        PipeWire Bluetooth aptX codec plugin

 License:        MIT

​

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

 .fedora:

   variables:

     # Update this tag when you want to trigger a rebuild

-    FDO_DISTRIBUTION_TAG: '2022-03-05.0'

+    FDO_DISTRIBUTION_TAG: '2022-11-07.0'

     FDO_DISTRIBUTION_VERSION: '35'

     FDO_DISTRIBUTION_PACKAGES: >-

       alsa-lib-devel

@@ -52,6 +52,7 @@

       libv4l-devel

       libva-devel

       libX11-devel

+      ModemManager-devel

       openssl-devel

       pulseaudio-libs-devel

       python3-docutils

@@ -68,6 +69,7 @@

       python3-pip

       pulseaudio-utils

       openal-soft

+      readline-devel

     FDO_DISTRIBUTION_EXEC: >-

       pip3 install meson

@@ -105,7 +107,7 @@

 .alpine:

   variables:

     # Update this tag when you want to trigger a rebuild

-    FDO_DISTRIBUTION_TAG: '2022-01-28.2'

+    FDO_DISTRIBUTION_TAG: '2022-09-07.0'

     FDO_DISTRIBUTION_VERSION: '3.15'

     FDO_DISTRIBUTION_PACKAGES: >-

       alsa-lib-dev

@@ -128,6 +130,7 @@

       libusb-dev

       libx11-dev

       meson

+      modemmanager-dev

       ncurses-dev

       pulseaudio-dev

       readline-dev

@@ -176,7 +179,6 @@

     - ninja $NINJA_ARGS -C "$BUILD_DIR"

     - ninja $NINJA_ARGS -C "$BUILD_DIR" test

     - ninja $NINJA_ARGS -C "$BUILD_DIR" install

-    - ./check_missing_headers.sh

   artifacts:

     name: pipewire-$CI_COMMIT_SHA

     when: always

@@ -223,6 +225,8 @@

     - .fdo.distribution-image@ubuntu

     - .build

   stage: build

+  variables:

+    MESON_OPTIONS: "-Dsession-managers="

 .build_on_fedora:

   extends:

@@ -248,6 +252,7 @@

         -Dvulkan=enabled

         -Dsdl2=enabled

         -Dsndfile=enabled

+        -Dsession-managers=

   artifacts:

     name: pipewire-$CI_COMMIT_SHA

     when: always

@@ -262,6 +267,8 @@

     - .fdo.distribution-image@alpine

     - .build

   stage: build

+  variables:

+    MESON_OPTIONS: "-Dsession-managers="

 # build with all auto() options enabled

 build_all:

@@ -270,7 +277,14 @@

   variables:

     # Fedora doesn't have libfreeaptx, lc3plus, lc3, or roc

     # libcamera has no stable API, so let's not chase that target

-    MESON_OPTIONS: "-Dauto_features=enabled -Dbluez5-codec-aptx=disabled -Dbluez5-codec-lc3plus=disabled -Dbluez5-codec-lc3=disabled -Droc=disabled -Dlibcamera=disabled"

+    MESON_OPTIONS: >-

+        -Dauto_features=enabled

+        -Dbluez5-codec-aptx=disabled

+        -Dbluez5-codec-lc3plus=disabled

+        -Dbluez5-codec-lc3=disabled

+        -Droc=disabled

+        -Dlibcamera=disabled

+        -Dsession-managers=

   parallel:

     matrix:

       - CC: gcc, clang

@@ -280,7 +294,7 @@

   extends:

     - .build_on_fedora

   variables:

-    MESON_OPTIONS: ""

+    MESON_OPTIONS: "-Dsession-managers="

   parallel:

     matrix:

       - CC: gcc, clang

@@ -296,7 +310,7 @@

         MESON_OPTION_VALUE: enabled, disabled

   script:

     - echo "Building with -D$MESON_OPTION=$MESON_OPTION_VALUE"

-    - meson "$BUILD_DIR" . --prefix="$PREFIX" "-D$MESON_OPTION=$MESON_OPTION_VALUE"

+    - meson "$BUILD_DIR" . --prefix="$PREFIX" "-D$MESON_OPTION=$MESON_OPTION_VALUE" -Dsession-managers=

     - ninja $NINJA_ARGS -C "$BUILD_DIR"

     - ninja $NINJA_ARGS -C "$BUILD_DIR" test

@@ -307,7 +321,7 @@

   extends:

     - .build_on_fedora

   variables:

-    MESON_OPTIONS: "-Dtest=enabled -Dbuildtype=release -Db_ndebug=true"

+    MESON_OPTIONS: "-Dtest=enabled -Dbuildtype=release -Db_ndebug=true -Dsession-managers="

   parallel:

     matrix:

       - CC: gcc, clang

@@ -363,6 +377,8 @@

     - echo "Building with meson options $MESON_OPTIONS"

     - meson "$BUILD_DIR" . --prefix="$PREFIX" $MESON_OPTIONS

     - meson test -C "$BUILD_DIR" --setup=valgrind

+  variables:

+    MESON_OPTIONS: "-Dsession-managers="

 build_with_coverity:

   extends:

@@ -383,6 +399,7 @@

         -Dvulkan=enabled

         -Dsdl2=enabled

         -Dsndfile=enabled

+        -Dsession-managers=

     - cov-configure --config coverity_conf.xml

         --comptype gcc --compiler cc --template

         --xml-option=append_arg@C:--ppp_translator

@@ -432,6 +449,18 @@

           git grep -q -e "\\\subpage $page" || (echo "\\page $page is missing \\subpage entry in doc/pipewire-modules.dox" && false)

       done

+check_missing_headers:

+  extends:

+    - .fedora

+    - .not_coverity

+    - .fdo.distribution-image@fedora

+  stage: analysis

+  dependencies:

+    - build_on_fedora

+  script:

+    - export PREFIX=`find -name prefix-*`

+    - ./.gitlab/ci/check_missing_headers.sh

+

 pages:

   extends:

     - .not_coverity

​

+(directory)

​

(renamed from check_missing_headers.sh)

​

@@ -1,3 +1,151 @@

+# PipeWire 0.3.60 (2022-11-10)

+

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

+0.3.x releases.

+

+## Highlights

+  - The filter-chain now handles errors better and has fixes for many

+    crasher bugs.

+  - A new RTP module was added with a sender and receiver. It uses SAP

+    to announce and consume RTP streams and is compatible with the

+    PulseAudio RTP modules.

+  - Many small bluetooth improvements and fixes.

+  - The alsa plugin will now only start playback when there is data. This

+    results in better sync and lower latency between capture and playback.

+  - The v4l2 and libcamera plugins have seen a lot of improvements. They

+    support control properties now. Also pw-v4l2 has seen many improvements

+    and mostly passes the v4l2-compliance test now.

+  - Many more bugfixes and improvements.

+

+

+## PipeWire

+  - Code cleanups, compiler warning fixes.

+  - Add some extra checks to avoid scheduling an inactive node.

+  - Rework the sequence of events to start and stop nodes.

+  - Improve param enumeration.

+  - An option was added to give priority to the Buffer params of the

+    consumer. This makes it possible to use the default values of the

+    consumer (instead of the producer) when capturing from a source.

+  - The graph rate selection was improved to pick a rate closest to the

+    requested one (instead of picking the default).

+

+## Modules

+  - Fix some crashes in filter-chain. (#2737)

+  - X11 Bell module will now be loaded by default when available.

+  - A new RTP module was added with a sender and receiver. It uses SAP

+    to announce and consume RTP streams and is compatible with the

+    PulseAudio RTP modules.

+  - Improve RAOP compatibility.

+  - The echo-cancel module now uses the resampler prefill option to align

+    input and output samples without buffering. Better latency control

+    when starting and stopping has been implemented.

+  - The pulse tunnel will now write aligned samples to pulseaudio even

+    when the ringbuffer wraps around. This fixes playback issues with

+    multichannel sinks.

+  - Add a delay option to module-loopback using a ringbuffer.

+  - Implement echo-cancel params.

+  - The filter-chain module has better error reporting.

+  - The LADSPA search path was extended with some more common paths.

+  - The echo-canceler input can now also be a monitor of a sink. This

+    improves compatibility with some proton games that expect a real

+    sink instead of a virtual one.

+

+## Tools

+  - Better error reporting in pw-link.

+  - pw-top now also shows IEC958 passthrough formats and JPEG/H264 video

+    formats.

+  - pw-top refreshes the screen faster.

+  - pw-top now prints the state of the node and shows less info for

+    inactive nodes.

+  - pw-dump now uses the new seq field in the spa_param_info to discard

+    old param updates and avoid duplicate params in the output.

+

+## Bluetooth

+  - Add ModemManager support in the native backend.

+  - Clean up GetManagedObjects handling.

+  - Handle QoS from the endpoints in the codec.

+  - Increase the socket buffer to have more control over the rate and QoS.

+  - Simplify the packet flushing code.

+  - Stop processing nodes before destroying them.

+  - Fix timers when a source switches drivers.

+  - Codecs can now share endpoints. This reduces the amount of endpoints and

+    avoids problems with devices that can't handle a large amount of

+    codec endpoints.

+  - Report batery status to UPower for HFP AG.

+  - Fix bitpool increase.

+

+## SPA

+  - The audioresampler now avoids clicks and pops between activating and

+    deactivating the adaptive resampler when used by the stream API.

+  - Use default locale to parse float parameters.

+  - The upmix functions now have SSE optimizations.

+  - Avoid recalculating the complete channelmix setup when only the

+    volume changes.

+  - The alsa plugin will now only start playback when there is data. This

+    results in better sync and lower latency between capture and playback.

+  - The ALSA MIDI sequencer will now pull data from the graph even when it

+    did not output anything. Fixes some graph stalls with the sequencer in

+    some cases. (#2775)

+  - v4l2 and libcamera sources now recycle buffers when nothing is consuming

+    them. This avoids stalling the graph.

+  - libcamera now suggests a more appropriate frame size than the smallest

+    poster frame.

+  - Improve state changes in audioconvert. (#2764)

+  - A new seq field was added to spa_param_info to keep track of pending

+    param updates.

+  - Support speaker output only on RealTek ALC4080. (#2744)

+  - The v4l2 source now supports setting controls.

+  - The libcamera plugin now supports enumerating and setting controls.

+  - A new unit test for 6.1 channel mapping was added. (#2809) More debug

+    info was added to audioconvert for the channel matrix.

+  - Audioconvert will now also upmix a rear-center channel when needed.

+

+## pulse-server

+  - Add support for the RTP send and recv modules with the new native

+    RTP module.

+  - Add option to set latency for pulse-tunnel streams and

+    module-zeroconf-discover.

+  - The socket will now be given the same permissions as what pulseaudio

+    did (0777).

+  - Implement module-loopback latency_msec correctly with the new delay

+    parameter.

+  - sysfs.path is now filled with the same data as pulseaudio.

+  - The manager now uses the new seq field in the spa_param_info.

+  - Fix a bug where in some cases the read pointer would get out of sync

+    and cause too large requests. (#2799)

+

+## ALSA

+  - The alsa plugin now reuses the stream in prepare which results in

+    better performance.

+  - Some deadlocks have been fixed in the ALSA plugin.

+  - The ALSA plugin reports more accurate timing information in some cases.

+

+## V4l2

+  - The v4l2 compatibility layer has received a lot of updates.

+  - Improved node names and format enumeration.

+  - Support for multiple /dev/videoX devices, each mapped to a unique

+    PipeWire node.

+  - Passes the v4l2-compliance test now with both the v4l2 and libcamera

+    backend in PipeWire.

+  - Improved mmap support for inline buffer memory. This makes it possible to

+    consume PipeWire streams.

+  - Negotiation works more reliably now.

+

+## JACK

+  - Implement jack_acquire_real_time_scheduling() and

+    jack_drop_real_time_scheduling() by keeping the thread utils in a global

+    state.

+  - Fix jack_client_thread_id() to return NULL when the client is not active,

+    just like jack1 and jack2.

+  - An option was added to let the jack_set_buffer_size() function update the

+    global metadata. A quirk was added so that jack_bufsize uses this new feature

+    to make the buffer size settings persistent and global, just like jack.

+  - jack_port_register() and jack_port_unregister() can be called on an

+    active client so make this thread safe. (#2652)

+

+

+Older versions:

+

 # PipeWire 0.3.59 (2022-09-30)

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

@@ -72,9 +220,6 @@

   - PIPEWIRE_ALSA can now be used as an environment variable to restrict the

     plugin formats and buffer size.

-Older versions:

-

-

 # PipeWire 0.3.58 (2022-09-15)

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

​

@@ -73,6 +73,8 @@

 - \subpage page_module_raop_discover

 - \subpage page_module_roc_sink

 - \subpage page_module_roc_source

+- \subpage page_module_rtp_sink

+- \subpage page_module_rtp_source

 - \subpage page_module_rt

 - \subpage page_module_session_manager

 - \subpage page_module_x11_bell

​

@@ -27,13 +27,15 @@

 The columns presented are as follows:

 S

-  Measurement status.

-  ! representing inactive - no connections

-

-  Blank representing active

+  Node status.

+    E = ERROR

+    C = CREATING

+    S = SUSPENDED

+    I = IDLE

+    R = RUNNING

 ID

-  The ID of the pipewire node/device, as found in *pw-dump*

+  The ID of the pipewire node/device, as found in *pw-dump* and *pw-cli*

 QUANT

   The current quantum (for drivers) and the suggested quantum for follower

@@ -135,6 +137,8 @@

   For raw audio formats, the layout is <sampleformat> <channels> <samplerate>.

+  For IEC958 passthrough audio formats, the layout is IEC958 <codec> <samplerate>.

+

   For DSD formats, the layout is <dsd-rate> <channels>.

   For Video formats, the layout is <pixelformat> <width>x<height>.

​

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

 project('pipewire', 'c' ,

-  version : '0.3.59',

+  version : '0.3.60',

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

   meson_version : '>= 0.59.0',

   default_options :  'warning_level=3',

@@ -67,6 +67,7 @@

 common_flags = 

   '-fvisibility=hidden',

+  '-fno-strict-aliasing',

   '-Werror=suggest-attribute=format',

   '-Wsign-compare',

   '-Wpointer-arith',

@@ -97,7 +98,7 @@

 if have_cpp

   cxx = meson.get_compiler('cpp')

-  cxx_flags = common_flags

+  cxx_flags = common_flags +  '-Wno-c99-designator' 

   add_project_arguments(cxx.get_supported_arguments(cxx_flags), language: 'cpp')

 endif

@@ -259,10 +260,10 @@

 sdl_dep = dependency('sdl2', required : get_option('sdl2'))

 summary({'SDL2 (video examples)': sdl_dep.found()}, bool_yn: true, section: 'Misc dependencies')

 drm_dep = dependency('libdrm', required : false)

-readline_dep = dependency('readline', required : false)

+readline_dep = dependency('readline', required : get_option('readline'))

 if not readline_dep.found()

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

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

 endif

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

​

@@ -92,6 +92,10 @@

        description: 'Enable HFP in native backend in bluez5 spa plugin',

        type: 'feature',

        value: 'enabled')

+option('bluez5-backend-native-mm',

+       description: 'Enable ModemManager in native backend in bluez5 spa plugin',

+       type: 'feature',

+       value: 'disabled')

 option('bluez5-backend-ofono',

        description: 'Enable oFono HFP backend in bluez5 spa plugin (no dependency on oFono)',

        type: 'feature',

@@ -228,7 +232,7 @@

 option('session-managers',

        description : 'Session managers to build (can be  for none or an absolute path)',

        type : 'array',

-       value : 'media-session')

+       value : 'wireplumber')

 option('raop',

        description: 'Enable module for Remote Audio Output Protocol',

        type: 'feature',

@@ -261,3 +265,7 @@

        description: 'Enable Flatpak support',

        type: 'feature',

        value: 'enabled')

+option('readline',

+       description: 'Enable code that depends on libreadline',

+       type: 'feature',

+       value: 'auto')

​

@@ -123,7 +123,9 @@

    struct spa_hook stream_listener;

    int64_t delay;

-   uint64_t now;

+   uint64_t transfered;

+   uint64_t buffered;

+   int64_t now;

    uintptr_t seq;

    struct spa_audio_info_raw format;

@@ -163,21 +165,15 @@

 static int update_active(snd_pcm_ioplug_t *io)

 {

    snd_pcm_pipewire_t *pw = io->private_data;

-   bool active;

-

-   active = check_active(io);

-

-   if (pw->active != active) {

-       uint64_t val;

+   pw->active = check_active(io);

+   uint64_t val;

-       pw->active = active;

+   if (pw->active || pw->error < 0)

+       spa_system_eventfd_write(pw->system, io->poll_fd, 1);

+   else

+       spa_system_eventfd_read(pw->system, io->poll_fd, &val);

-       if (active)

-           spa_system_eventfd_write(pw->system, io->poll_fd, 1);

-       else

-           spa_system_eventfd_read(pw->system, io->poll_fd, &val);

-   }

-   return active;

+   return pw->active;

 }

 static void snd_pcm_pipewire_free(snd_pcm_pipewire_t *pw)

@@ -233,8 +229,10 @@

        return pw->error;

    *revents = pfds0.revents & ~(POLLIN | POLLOUT);

-   if (pfds0.revents & POLLIN && check_active(io))

+   if (pfds0.revents & POLLIN && check_active(io)) {

        *revents |= (io->stream == SND_PCM_STREAM_PLAYBACK) ? POLLOUT : POLLIN;

+       update_active(io);

+   }

    return 0;

 }

@@ -266,7 +264,7 @@

    do {

        seq1 = SEQ_READ(pw->seq);

-       delay = pw->delay;

+       delay = pw->delay + pw->transfered;

        now = pw->now;

        if (io->stream == SND_PCM_STREAM_PLAYBACK)

            avail = snd_pcm_ioplug_hw_avail(io, pw->hw_ptr, io->appl_ptr);

@@ -450,9 +448,8 @@

    pw_stream_get_time_n(pw->stream, &pwt, sizeof(pwt));

    delay = pwt.delay;

-   if (pwt.rate.num != 0) {

+   if (pwt.rate.num != 0)

        delay = delay * io->rate * pwt.rate.num / pwt.rate.denom;

-   }

    before = hw_avail = snd_pcm_ioplug_hw_avail(io, pw->hw_ptr, io->appl_ptr);

@@ -467,12 +464,20 @@

    SEQ_WRITE(pw->seq);

+   if (pw->now != pwt.now) {

+       pw->transfered = pw->buffered;

+       pw->buffered = 0;

+   }

+

    xfer = snd_pcm_pipewire_process(pw, b, &hw_avail, want);

    pw->delay = delay;

    /* the buffer is now queued in the stream and consumed */

    if (io->stream == SND_PCM_STREAM_PLAYBACK)

-       pw->delay += xfer;

+       pw->transfered += xfer;

+

+   /* more then requested data transfered, use them in next iteration */

+   pw->buffered = (want == 0 || pw->transfered < want) ?  0 : (pw->transfered % want);

    pw->now = pwt.now;

    SEQ_WRITE(pw->seq);

@@ -563,11 +568,6 @@

        goto done;

    pw->hw_params_changed = false;

-   if (pw->stream != NULL) {

-       pw_stream_destroy(pw->stream);

-       pw->stream = NULL;

-   }

-

    props = pw_properties_new(NULL, NULL);

    if (props == NULL)

        goto error;

@@ -593,13 +593,20 @@

        pw_properties_get(props, PW_KEY_MEDIA_ROLE) == NULL)

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

+   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_params(pw->stream, params, 1);

+       goto done;

+   }

+

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

    if (pw->stream == NULL)

        goto error;

    pw_stream_add_listener(pw->stream, &pw->stream_listener, &stream_events, pw);

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

    pw->error = 0;

    pw_stream_connect(pw->stream,

@@ -867,10 +874,9 @@

 static enum snd_pcm_chmap_position channel_to_chmap(enum spa_audio_channel channel)

 {

-   uint32_t i;

-   for (i = 0; i < SPA_N_ELEMENTS(chmap_info); i++)

-       if (chmap_infoi.channel == channel)

-           return chmap_infoi.pos;

+   SPA_FOR_EACH_ELEMENT_VAR(chmap_info, info)

+       if (info->channel == channel)

+           return info->pos;

    return SND_CHMAP_UNKNOWN;

 }

​

@@ -1,18 +1,18 @@

 /*

     Copyright (C) 2013 Paul Davis

-    

+

     This program is free software; you can redistribute it and/or modify

     it under the terms of the GNU Lesser General Public License as published by

     the Free Software Foundation; either version 2.1 of the License, or

     (at your option) any later version.

-    

+

     This program is distributed in the hope that it will be useful,

     but WITHOUT ANY WARRANTY; without even the implied warranty of

     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

     GNU Lesser General Public License for more details.

-    

+

     You should have received a copy of the GNU Lesser General Public License

-    along with this program; if not, write to the Free Software 

+    along with this program; if not, write to the Free Software

     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 */

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

 #define JACK_UUID_STRING_SIZE (JACK_UUID_SIZE+1) /* includes trailing null */

 #define JACK_UUID_EMPTY_INITIALIZER 0

-extern jack_uuid_t jack_client_uuid_generate ();

+extern jack_uuid_t jack_client_uuid_generate (void);

 extern jack_uuid_t jack_port_uuid_generate (uint32_t port_id);

 extern uint32_t jack_uuid_to_index (jack_uuid_t);

​

@@ -98,6 +98,7 @@

    pthread_mutex_t lock;

    struct pw_array descriptions;

    struct spa_list free_objects;

+   struct spa_thread_utils *thread_utils;

 };

 static struct globals globals;

@@ -311,6 +312,7 @@

         struct spa_hook proxy_listener;

    struct metadata *metadata;

+   struct metadata *settings;

    uint32_t node_id;

    uint32_t serial;

@@ -401,6 +403,7 @@

    int self_connect_mode;

    int rt_max;

    unsigned int fix_midi_events:1;

+   unsigned int global_buffer_size:1;

    jack_position_t jack_position;

    jack_transport_state_t jack_state;

@@ -610,13 +613,9 @@

 {

    struct mix *m;

-   if (!p->valid)

-       return;

-

    spa_list_consume(m, &p->mix, port_link)

        free_mix(c, m);

-   p->valid = false;

    pw_map_remove(&c->portsp->direction, p->port_id);

    free_object(c, p->object);

    pw_properties_free(p->props);

@@ -1056,7 +1055,7 @@

    struct buffer *b;

    struct spa_data *d;

-   if (frames == 0)

+   if (frames == 0 || !p->valid)

        return NULL;

    if (SPA_UNLIKELY((mix = p->global_mix) == NULL))

@@ -2576,11 +2575,18 @@

    return spa_thread_utils_acquire_rt(c->context.old_thread_utils, thread, priority);

 }

+static int impl_drop_rt(void *object, struct spa_thread *thread)

+{

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

+   return spa_thread_utils_drop_rt(c->context.old_thread_utils, thread);

+}

+

 static struct spa_thread_utils_methods thread_utils_impl = {

    SPA_VERSION_THREAD_UTILS_METHODS,

    .create = impl_create,

    .join = impl_join,

    .acquire_rt = impl_acquire_rt,

+   .drop_rt = impl_drop_rt,

 };

 static jack_port_type_id_t string_to_type(const char *port_type)

@@ -2721,6 +2727,24 @@

    .destroy = metadata_proxy_destroy,

 };

+static void settings_proxy_removed(void *data)

+{

+   struct client *c = data;

+   pw_proxy_destroy((struct pw_proxy*)c->settings->proxy);

+}

+

+static void settings_proxy_destroy(void *data)

+{

+   struct client *c = data;

+   spa_hook_remove(&c->settings->proxy_listener);

+   c->settings = NULL;

+}

+

+static const struct pw_proxy_events settings_proxy_events = {

+   PW_VERSION_PROXY_EVENTS,

+   .removed = settings_proxy_removed,

+   .destroy = settings_proxy_destroy,

+};

 static void proxy_removed(void *data)

 {

    struct object *o = data;

@@ -3033,24 +3057,34 @@

        if (c->metadata != NULL)

            goto exit;

-       if ((str = spa_dict_lookup(props, PW_KEY_METADATA_NAME)) != NULL &&

-           !spa_streq(str, "default"))

+       if ((str = spa_dict_lookup(props, PW_KEY_METADATA_NAME)) == NULL)

            goto exit;

-       proxy = pw_registry_bind(c->registry,

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

-

-       c->metadata = pw_proxy_get_user_data(proxy);

-       c->metadata->proxy = (struct pw_metadata*)proxy;

-       c->metadata->default_audio_sink0 = '\0';

-       c->metadata->default_audio_source0 = '\0';

-

-       pw_proxy_add_listener(proxy,

-               &c->metadata->proxy_listener,

-               &metadata_proxy_events, c);

-       pw_metadata_add_listener(proxy,

-               &c->metadata->listener,

-               &metadata_events, c);

+       if (spa_streq(str, "default")) {

+           proxy = pw_registry_bind(c->registry,

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

+

+           c->metadata = pw_proxy_get_user_data(proxy);

+           c->metadata->proxy = (struct pw_metadata*)proxy;

+           c->metadata->default_audio_sink0 = '\0';

+           c->metadata->default_audio_source0 = '\0';

+

+           pw_proxy_add_listener(proxy,

+                   &c->metadata->proxy_listener,

+                   &metadata_proxy_events, c);

+           pw_metadata_add_listener(proxy,

+                   &c->metadata->listener,

+                   &metadata_events, c);

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

+           proxy = pw_registry_bind(c->registry,

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

+

+           c->settings = pw_proxy_get_user_data(proxy);

+           c->settings->proxy = (struct pw_metadata*)proxy;

+           pw_proxy_add_listener(proxy,

+                   &c->settings->proxy_listener,

+                   &settings_proxy_events, c);

+       }

        goto exit;

    }

    else {

@@ -3303,6 +3337,8 @@

    if (client->context.old_thread_utils == NULL)

        client->context.old_thread_utils = pw_thread_utils_get();

+   globals.thread_utils = client->context.old_thread_utils;

+

    client->context.thread_utils.iface = SPA_INTERFACE_INIT(

            SPA_TYPE_INTERFACE_ThreadUtils,

            SPA_VERSION_THREAD_UTILS,

@@ -3411,6 +3447,7 @@

    client->locked_process = pw_properties_get_bool(client->props, "jack.locked-process", true);

    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->self_connect_mode = SELF_CONNECT_ALLOW;

    if ((str = pw_properties_get(client->props, "jack.self-connect-mode")) != NULL) {

@@ -3509,10 +3546,11 @@

        pw_proxy_destroy((struct pw_proxy*)c->registry);

    }

    if (c->metadata && c->metadata->proxy) {

-       spa_hook_remove(&c->metadata->listener);

-       spa_hook_remove(&c->metadata->proxy_listener);

        pw_proxy_destroy((struct pw_proxy*)c->metadata->proxy);

    }

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

+       pw_proxy_destroy((struct pw_proxy*)c->settings->proxy);

+   }

    if (c->core) {

        spa_hook_remove(&c->core_listener);

@@ -3773,14 +3811,10 @@

 jack_native_thread_t jack_client_thread_id (jack_client_t *client)

 {

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

-   void *thr;

    spa_return_val_if_fail(c != NULL, (pthread_t){0});

-   thr = pw_data_loop_get_thread(c->loop);

-   if (thr == NULL)

-       return pthread_self();

-   return (pthread_t) thr;

+   return (jack_native_thread_t)pw_data_loop_get_thread(c->loop);

 }

 SPA_EXPORT

@@ -4137,15 +4171,22 @@

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

    pw_thread_loop_lock(c->context.loop);

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

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

+       char val256;

+       snprintf(val, sizeof(val), "%u", nframes == 1 ? 0: nframes);

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

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

+   } else {

​

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

 #include <pipewire/pipewire.h>

 SPA_EXPORT

-jack_uuid_t jack_client_uuid_generate ()

+jack_uuid_t jack_client_uuid_generate (void)

 {

    static uint32_t uuid_cnt = 0;

    jack_uuid_t uuid = 0x2; /* JackUUIDClient */;

​

@@ -57,6 +57,7 @@

 #define DEFAULT_CARD       "PipeWire Camera"

 #define DEFAULT_BUS_INFO   "PipeWire"

+#define MAX_DEV        32

 struct file_map {

    void *addr;

    struct file *file;

@@ -64,6 +65,8 @@

 struct fd_map {

    int fd;

+#define FD_MAP_DUP (1<<0)

+   uint32_t flags;

    struct file *file;

 };

@@ -73,6 +76,7 @@

    pthread_mutex_t lock;

    struct pw_array fd_maps;

    struct pw_array file_maps;

+   uint32_t dev_mapMAX_DEV;

 };

 static struct globals globals;

@@ -93,6 +97,9 @@

 struct file {

    int ref;

+   uint32_t dev_id;

+   uint32_t serial;

+

    struct pw_properties *props;

    struct pw_thread_loop *loop;

    struct pw_loop *l;

@@ -114,23 +121,27 @@

    struct pw_stream *stream;

    struct spa_hook stream_listener;

+   enum v4l2_priority priority;

+

    struct v4l2_format v4l2_format;

    uint32_t reqbufs;

+   int reqbufs_fd;

    struct buffer buffersMAX_BUFFERS;

    uint32_t n_buffers;

    uint32_t size;

+   uint32_t sequence;

+

    struct pw_array buffer_maps;

    uint32_t last_fourcc;

    unsigned int running:1;

+   unsigned int closed:1;

    int fd;

 };

-#define MAX_PARAMS 32

-

 struct global_info {

    const char *type;

    uint32_t version;

@@ -156,8 +167,8 @@

    int changed;

    void *info;

+   struct spa_list pending_list;

    struct spa_list param_list;

-   int param_seqMAX_PARAMS;

    union {

        struct {

@@ -173,6 +184,7 @@

 struct param {

    struct spa_list link;

    uint32_t id;

+   int32_t seq;

    struct spa_pod *param;

 };

@@ -192,7 +204,7 @@

 }

 static struct param *add_param(struct spa_list *params,

-       int seq, int *param_seq, uint32_t id, const struct spa_pod *param)

+       int seq, uint32_t id, const struct spa_pod *param)

 {

    struct param *p;

@@ -204,24 +216,12 @@

        id = SPA_POD_OBJECT_ID(param);

    }

-   if (id >= MAX_PARAMS) {

-       pw_log_error("too big param id %d", id);

-       errno = EINVAL;

-       return NULL;

-   }

-

-   if (seq != param_seqid) {

-       pw_log_debug("ignoring param %d, seq:%d != current_seq:%d",

-               id, seq, param_seqid);

-       errno = EBUSY;

-       return NULL;

-   }

-

    p = malloc(sizeof(*p) + (param != NULL ? SPA_POD_SIZE(param) : 0));

    if (p == NULL)

        return NULL;

    p->id = id;

+   p->seq = seq;

    if (param != NULL) {

        p->param = SPA_PTROFF(p, sizeof(*p), struct spa_pod);

        memcpy(p->param, param, SPA_POD_SIZE(param));

@@ -234,6 +234,39 @@

    return p;

 }

+static void update_params(struct file *file)

+{

+   struct param *p, *t;

+   struct global *node;

+   struct pw_node_info *info;

+   uint32_t i;

+

+   if ((node = file->node) == NULL)

+       return;

+   if ((info = node->info) == NULL)

+       return;

+

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

+       spa_list_for_each_safe(p, t, &node->pending_list, link) {

+           if (p->id == info->paramsi.id &&

+               p->seq != info->paramsi.seq &&

+               p->param != NULL) {

+               spa_list_remove(&p->link);

+               free(p);

+           }

+       }

+   }

+

+   spa_list_consume(p, &node->pending_list, link) {

+       spa_list_remove(&p->link);

+       if (p->param == NULL) {

+           clear_params(&node->param_list, p->id);

+           free(p);

+       } else {

+           spa_list_append(&node->param_list, &p->link);

+       }

+   }

+}

 #define ATOMIC_DEC(s)                   __atomic_sub_fetch(&(s), 1, __ATOMIC_SEQ_CST)

 #define ATOMIC_INC(s)                   __atomic_add_fetch(&(s), 1, __ATOMIC_SEQ_CST)

@@ -247,6 +280,8 @@

    file->ref = 1;

    file->fd = -1;

+   file->reqbufs_fd = -1;

+   file->priority = V4L2_PRIORITY_DEFAULT;

    spa_list_init(&file->globals);

    pw_array_init(&file->buffer_maps, sizeof(struct buffer_map) * MAX_BUFFERS);

    return file;

@@ -254,6 +289,8 @@

 static void free_file(struct file *file)

 {

+   pw_log_info("file:%d", file->fd);

+

    if (file->loop)

        pw_thread_loop_stop(file->loop);

@@ -282,49 +319,99 @@

 static void unref_file(struct file *file)

 {

+   pw_log_debug("file:%d ref:%d", file->fd, file->ref);

    if (ATOMIC_DEC(file->ref) <= 0)

        free_file(file);

 }

-static int add_fd_map(int fd, struct file *file)

+static int add_fd_map(int fd, struct file *file, uint32_t flags)

 {

    struct fd_map *map;

    pthread_mutex_lock(&globals.lock);

    map = pw_array_add(&globals.fd_maps, sizeof(*map));

    if (map != NULL) {

        map->fd = fd;

+       map->flags = flags;

        map->file = file;

        ATOMIC_INC(file->ref);

+       pw_log_debug("fd:%d -> file:%d ref:%d", fd, file->fd, file->ref);

    }

    pthread_mutex_unlock(&globals.lock);

    return 0;

​

@@ -54,10 +54,16 @@

 shift $(( OPTIND - 1 ))

+if  "$PW_UNINSTALLED" = 1  ; then

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

+else

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

+fi

+

 if  "$LD_PRELOAD" = ""  ; then

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

+   LD_PRELOAD="$PW_V4L2_LD_PRELOAD"

 else

-   LD_PRELOAD="$LD_PRELOAD "'@LIBV4L2_PATH@/libpw-v4l2.so'

+   LD_PRELOAD="$LD_PRELOAD $PW_V4L2_LD_PRELOAD"

 fi

 export LD_PRELOAD

​

@@ -8,10 +8,10 @@

 msgid ""

 msgstr ""

 "Project-Id-Version: pipewire.master-tx\n"

-"Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pipewire/pipewire/"

-"issues/new\n"

-"POT-Creation-Date: 2021-04-18 16:54+0800\n"

-"PO-Revision-Date: 2021-10-12 14:18+0200\n"

+"Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pipewire/pipewire/-/"

+"issues\n"

+"POT-Creation-Date: 2022-09-15 15:26+0000\n"

+"PO-Revision-Date: 2022-10-21 16:44+0200\n"

 "Last-Translator: Daniel Rusek <mail@asciiwolf.com>\n"

 "Language-Team: čeština <gnome-cs-list@gnome.org>\n"

 "Language: cs\n"

@@ -19,9 +19,9 @@

 "Content-Type: text/plain; charset=UTF-8\n"

 "Content-Transfer-Encoding: 8bit\n"

 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"

-"X-Generator: Poedit 3.0\n"

+"X-Generator: Poedit 3.1.1\n"

-#: src/daemon/pipewire.c:43

+#: src/daemon/pipewire.c:46

 #, c-format

 msgid ""

 "%s options\n"

@@ -42,36 +42,52 @@

 msgid "Start the PipeWire Media System"

 msgstr "Spustit multimediální systém PipeWire"

-#: src/examples/media-session/alsa-monitor.c:526

-#: spa/plugins/alsa/acp/compat.c:187

-msgid "Built-in Audio"

-msgstr "Vnitřní zvukový systém"

+#: src/modules/module-protocol-pulse/modules/module-tunnel-sink.c:180

+#: src/modules/module-protocol-pulse/modules/module-tunnel-source.c:180

+#, c-format

+msgid "Tunnel to %s/%s"

+msgstr "Tunel do %s/%s"

-#: src/examples/media-session/alsa-monitor.c:530

-#: spa/plugins/alsa/acp/compat.c:192

-msgid "Modem"

-msgstr "Modem"

+#: src/modules/module-fallback-sink.c:51

+#| msgid "Game Output"

+msgid "Dummy Output"

+msgstr "Předstíraný výstup"

-#: src/examples/media-session/alsa-monitor.c:539

+#: src/modules/module-pulse-tunnel.c:662

+#, c-format

+msgid "Tunnel for %s@%s"

+msgstr "Tunel pro %s@%s"

+

+#: src/modules/module-zeroconf-discover.c:332

 msgid "Unknown device"

 msgstr "Neznámé zařízení"

-#: src/tools/pw-cat.c:991

+#: src/modules/module-zeroconf-discover.c:344

+#, c-format

+msgid "%s on %s@%s"

+msgstr "%s na %s@%s"

+

+#: src/modules/module-zeroconf-discover.c:348

+#, c-format

+msgid "%s on %s"

+msgstr "%s na %s"

+

+#: src/tools/pw-cat.c:784

 #, c-format

 msgid ""

-"%s options <file>\n"

+"%s options <file>|-\n"

 "  -h, --help                            Show this help\n"

 "      --version                         Show version\n"

 "  -v, --verbose                         Enable verbose operations\n"

 "\n"

 msgstr ""

-"%s volby <soubor>\n"

+"%s volby <soubor>|-\n"

 "  -h, --help                            Zobrazit tuto nápovědu\n"

 "      --version                         Zobrazit verzi\n"

 "  -v, --verbose                         Povolit podrobné operace\n"

 "\n"

-#: src/tools/pw-cat.c:998

+#: src/tools/pw-cat.c:791

 #, c-format

 msgid ""

 "  -R, --remote                          Remote daemon name\n"

@@ -85,7 +101,7 @@

 "                                          or direct samples (256)\n"

 "                                          the rate is the one of the source "

 "file\n"

-"      --list-targets                    List available targets for --target\n"

+"  -P  --properties                      Set node properties\n"

 "\n"

 msgstr ""

 "  -R, --remote                          Název vzdáleného démonu\n"

@@ -102,10 +118,10 @@

 "                                          nebo přímé vzorky (256)\n"

 "                                          frekvence je stejná jako u "

 "zdrojového souboru\n"

-"      --list-targets                    Zobrazit dostupné cíle pro --target\n"

+"  -P  --properties                      Nastavit vlastnosti uzlu\n"

 "\n"

-#: src/tools/pw-cat.c:1016

+#: src/tools/pw-cat.c:809

 #, c-format

 msgid ""

 "      --rate                            Sample rate (req. for rec) (default "

@@ -141,19 +157,21 @@

 "je %d)\n"

 "\n"

-#: src/tools/pw-cat.c:1033

+#: src/tools/pw-cat.c:826