[arch-commits] Commit in krfb/repos (3 files)
Antonio Rojas
arojas at archlinux.org
Sun Mar 8 10:42:58 UTC 2020
Date: Sunday, March 8, 2020 @ 10:42:57
Author: arojas
Revision: 377174
archrelease: copy trunk to testing-x86_64
Added:
krfb/repos/testing-x86_64/
krfb/repos/testing-x86_64/PKGBUILD
(from rev 377173, krfb/trunk/PKGBUILD)
krfb/repos/testing-x86_64/krfb-pipewire-0.3.patch
(from rev 377173, krfb/trunk/krfb-pipewire-0.3.patch)
-------------------------+
PKGBUILD | 39 +++
krfb-pipewire-0.3.patch | 551 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 590 insertions(+)
Copied: krfb/repos/testing-x86_64/PKGBUILD (from rev 377173, krfb/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2020-03-08 10:42:57 UTC (rev 377174)
@@ -0,0 +1,39 @@
+# Maintainer: Antonio Rojas <arojas at archlinux,org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=krfb
+pkgver=19.12.3
+pkgrel=3
+pkgdesc='Desktop Sharing'
+url='https://www.kde.org/applications/system/krfb'
+arch=(x86_64)
+license=(LGPL)
+depends=(kdnssd kxmlgui kwallet libvncserver pipewire kcompletion hicolor-icon-theme)
+makedepends=(extra-cmake-modules kdoctools)
+groups=(kde-applications kdenetwork)
+source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+ krfb-pipewire-0.3.patch)
+sha256sums=('cb88997dc7b15b992d1de5c5cabaeccb37122e20823501ac29140875259782ee'
+ 'SKIP'
+ '1ed4a455f294b28b70194e0dd793d3ecb53a9494e94bfde40772921f73ee66c1')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aacid at kde.org>
+ F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+ patch -p1 -i ../krfb-pipewire-0.3.patch # Fix build with pipewire 0.3
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: krfb/repos/testing-x86_64/krfb-pipewire-0.3.patch (from rev 377173, krfb/trunk/krfb-pipewire-0.3.patch)
===================================================================
--- testing-x86_64/krfb-pipewire-0.3.patch (rev 0)
+++ testing-x86_64/krfb-pipewire-0.3.patch 2020-03-08 10:42:57 UTC (rev 377174)
@@ -0,0 +1,551 @@
+From 92c9905f36722c764f19bcc7c2d76e7f8af1ece7 Mon Sep 17 00:00:00 2001
+From: Jan Grulich <jgrulich at redhat.com>
+Date: Mon, 10 Feb 2020 16:24:05 +0100
+Subject: PW framebuffer: support upcoming PipeWire 0.3
+
+Summary: Adds support for slightly different PipeWire API.
+
+Test Plan: Tested with xdg-desktop-portal-kde and new pipewire.
+
+Reviewers: Kanedias
+
+Reviewed By: Kanedias
+
+Differential Revision: https://phabricator.kde.org/D27287
+---
+ cmake/modules/FindPipeWire.cmake | 27 +++-
+ framebuffers/pipewire/pw_framebuffer.cpp | 212 ++++++++++++++++++++++---------
+ framebuffers/pipewire/pw_framebuffer.h | 2 +-
+ 3 files changed, 174 insertions(+), 67 deletions(-)
+
+diff --git a/cmake/modules/FindPipeWire.cmake b/cmake/modules/FindPipeWire.cmake
+index 2410afd..9717ac0 100644
+--- a/cmake/modules/FindPipeWire.cmake
++++ b/cmake/modules/FindPipeWire.cmake
+@@ -32,7 +32,7 @@
+ #=============================================================================
+ # Copyright 2014 Alex Merry <alex.merry at kde.org>
+ # Copyright 2014 Martin Gräßlin <mgraesslin at kde.org>
+-# Copyright 2018 Jan Grulich <jgrulich at redhat.com>
++# Copyright 2018-2020 Jan Grulich <jgrulich at redhat.com>
+ #
+ # Redistribution and use in source and binary forms, with or without
+ # modification, are permitted provided that the following conditions
+@@ -61,9 +61,11 @@
+ # Use pkg-config to get the directories and then use these values
+ # in the FIND_PATH() and FIND_LIBRARY() calls
+ find_package(PkgConfig QUIET)
+-pkg_check_modules(PKG_PipeWire QUIET libpipewire-0.2 libpipewire-0.3)
+
+-set(PipeWire_DEFINITIONS "${PKG_PipeWire_CFLAGS_OTHER}")
++pkg_search_module(PKG_PipeWire QUIET libpipewire-0.3 libpipewire-0.2)
++pkg_search_module(PKG_Spa QUIET libspa-0.2 libspa-0.1)
++
++set(PipeWire_DEFINITIONS "${PKG_PipeWire_CFLAGS}" "${PKG_Spa_CFLAGS}")
+ set(PipeWire_VERSION "${PKG_PipeWire_VERSION}")
+
+ find_path(PipeWire_INCLUDE_DIRS
+@@ -71,13 +73,23 @@ find_path(PipeWire_INCLUDE_DIRS
+ pipewire/pipewire.h
+ HINTS
+ ${PKG_PipeWire_INCLUDE_DIRS}
++ ${PKG_PipeWire_INCLUDE_DIRS}/pipewire-0.3
++)
++
++find_path(Spa_INCLUDE_DIRS
++ NAMES
++ spa/param/props.h
++ HINTS
++ ${PKG_Spa_INCLUDE_DIRS}
++ ${PKG_Spa_INCLUDE_DIRS}/spa-0.2
+ )
+
+ find_library(PipeWire_LIBRARIES
+ NAMES
+- pipewire-0.2 pipewire-0.3
++ pipewire-0.3
++ pipewire-0.2
+ HINTS
+- ${PKG_PipeWire_LIBRARIES_DIRS}
++ ${PKG_PipeWire_LIBRARY_DIRS}
+ )
+
+ include(FindPackageHandleStandardArgs)
+@@ -87,6 +99,7 @@ find_package_handle_standard_args(PipeWire
+ REQUIRED_VARS
+ PipeWire_LIBRARIES
+ PipeWire_INCLUDE_DIRS
++ Spa_INCLUDE_DIRS
+ VERSION_VAR
+ PipeWire_VERSION
+ )
+@@ -96,7 +109,7 @@ if(PipeWire_FOUND AND NOT TARGET PipeWire::PipeWire)
+ set_target_properties(PipeWire::PipeWire PROPERTIES
+ IMPORTED_LOCATION "${PipeWire_LIBRARIES}"
+ INTERFACE_COMPILE_OPTIONS "${PipeWire_DEFINITIONS}"
+- INTERFACE_INCLUDE_DIRECTORIES "${PipeWire_INCLUDE_DIRS}"
++ INTERFACE_INCLUDE_DIRECTORIES "${PipeWire_INCLUDE_DIRS};${Spa_INCLUDE_DIRS}"
+ )
+ endif()
+
+@@ -104,6 +117,6 @@ mark_as_advanced(PipeWire_LIBRARIES PipeWire_INCLUDE_DIRS)
+
+ include(FeatureSummary)
+ set_package_properties(PipeWire PROPERTIES
+- URL "http://www.pipewire.org"
++ URL "https://www.pipewire.org"
+ DESCRIPTION "PipeWire - multimedia processing"
+ )
+diff --git a/framebuffers/pipewire/pw_framebuffer.cpp b/framebuffers/pipewire/pw_framebuffer.cpp
+index 768fd8c..649bc34 100644
+--- a/framebuffers/pipewire/pw_framebuffer.cpp
++++ b/framebuffers/pipewire/pw_framebuffer.cpp
+@@ -26,19 +26,15 @@
+ // pipewire
+ #include <pipewire/version.h>
+
+-#if !PW_CHECK_VERSION(0, 2, 9)
+-#include <spa/support/type-map.h>
+-#include <spa/param/format-utils.h>
+-#include <spa/param/video/format-utils.h>
+-#include <spa/param/video/raw-utils.h>
++#if PW_CHECK_VERSION(0, 2, 90)
++#include <spa/utils/result.h>
+ #endif
++
++#include <spa/param/format-utils.h>
+ #include <spa/param/video/format-utils.h>
+ #include <spa/param/props.h>
+
+-#include <pipewire/factory.h>
+ #include <pipewire/pipewire.h>
+-#include <pipewire/remote.h>
+-#include <pipewire/stream.h>
+
+ #include <limits.h>
+
+@@ -71,7 +67,7 @@ const QDBusArgument &operator >> (const QDBusArgument &arg, PWFrameBuffer::Strea
+ return arg;
+ }
+
+-#if !PW_CHECK_VERSION(0, 2, 9)
++#if !PW_CHECK_VERSION(0, 2, 90)
+ /**
+ * @brief The PwType class - helper class to contain pointers to raw C pipewire media mappings
+ */
+@@ -96,14 +92,19 @@ public:
+ private:
+ friend class PWFrameBuffer;
+
++#if PW_CHECK_VERSION(0, 2, 90)
++ static void onCoreError(void *data, uint32_t id, int seq, int res, const char *message);
++ static void onStreamParamChanged(void *data, uint32_t id, const struct spa_pod *format);
++#else
+ static void onStateChanged(void *data, pw_remote_state old, pw_remote_state state, const char *error);
+- static void onStreamStateChanged(void *data, pw_stream_state old, pw_stream_state state, const char *error_message);
+ static void onStreamFormatChanged(void *data, const struct spa_pod *format);
++#endif
++ static void onStreamStateChanged(void *data, pw_stream_state old, pw_stream_state state, const char *error_message);
+ static void onStreamProcess(void *data);
+
+ void initDbus();
+ void initPw();
+-#if !PW_CHECK_VERSION(0, 2, 9)
++#if !PW_CHECK_VERSION(0, 2, 90)
+ void initializePwTypes();
+ #endif
+
+@@ -114,40 +115,45 @@ private:
+ void handleRemoteDesktopStarted(quint32 &code, QVariantMap &results);
+
+ // pw handling
+- void createReceivingStream();
++ pw_stream *createReceivingStream();
+ void handleFrame(pw_buffer *pwBuffer);
+
+ // link to public interface
+ PWFrameBuffer *q;
+
+ // pipewire stuff
+-#if PW_CHECK_VERSION(0, 2, 9)
++#if PW_CHECK_VERSION(0, 2, 90)
++ struct pw_context *pwContext = nullptr;
+ struct pw_core *pwCore = nullptr;
+- struct pw_loop *pwLoop = nullptr;
+ struct pw_stream *pwStream = nullptr;
+- struct pw_remote *pwRemote = nullptr;
+ struct pw_thread_loop *pwMainLoop = nullptr;
++
++ // wayland-like listeners
++ // ...of events that happen in pipewire server
++ spa_hook coreListener = {};
++ spa_hook streamListener = {};
++
++ // event handlers
++ pw_core_events pwCoreEvents = {};
++ pw_stream_events pwStreamEvents = {};
+ #else
+ pw_core *pwCore = nullptr;
+ pw_loop *pwLoop = nullptr;
++ pw_thread_loop *pwMainLoop = nullptr;
+ pw_stream *pwStream = nullptr;
+ pw_remote *pwRemote = nullptr;
+- pw_thread_loop *pwMainLoop = nullptr;
+ pw_type *pwCoreType = nullptr;
+ PwType *pwType = nullptr;
+-#endif
+
+- uint pwStreamNodeId = 0;
++ spa_hook remoteListener = {};
++ spa_hook streamListener = {};
+
+ // event handlers
+ pw_remote_events pwRemoteEvents = {};
+ pw_stream_events pwStreamEvents = {};
++#endif
+
+- // wayland-like listeners
+- // ...of events that happen in pipewire server
+- spa_hook remoteListener = {};
+- // ...of events that happen with the stream we consume
+- spa_hook streamListener = {};
++ uint pwStreamNodeId = 0;
+
+ // negotiated video format
+ spa_video_info_raw *videoFormat = nullptr;
+@@ -177,6 +183,15 @@ private:
+
+ PWFrameBuffer::Private::Private(PWFrameBuffer *q) : q(q)
+ {
++#if PW_CHECK_VERSION(0, 2, 90)
++ pwCoreEvents.version = PW_VERSION_CORE_EVENTS;
++ pwCoreEvents.error = &onCoreError;
++
++ pwStreamEvents.version = PW_VERSION_STREAM_EVENTS;
++ pwStreamEvents.state_changed = &onStreamStateChanged;
++ pwStreamEvents.param_changed = &onStreamParamChanged;
++ pwStreamEvents.process = &onStreamProcess;
++#else
+ // initialize event handlers, remote end and stream-related
+ pwRemoteEvents.version = PW_VERSION_REMOTE_EVENTS;
+ pwRemoteEvents.state_changed = &onStateChanged;
+@@ -185,6 +200,7 @@ PWFrameBuffer::Private::Private(PWFrameBuffer *q) : q(q)
+ pwStreamEvents.state_changed = &onStreamStateChanged;
+ pwStreamEvents.format_changed = &onStreamFormatChanged;
+ pwStreamEvents.process = &onStreamProcess;
++#endif
+ }
+
+ /**
+@@ -443,25 +459,43 @@ void PWFrameBuffer::Private::initPw() {
+ // init pipewire (required)
+ pw_init(nullptr, nullptr); // args are not used anyways
+
++#if PW_CHECK_VERSION(0, 2, 90)
++ pwMainLoop = pw_thread_loop_new("pipewire-main-loop", nullptr);
++ pwContext = pw_context_new(pw_thread_loop_get_loop(pwMainLoop), nullptr, 0);
++ if (!pwContext) {
++ qWarning() << "Failed to create PipeWire context";
++ return;
++ }
++
++ pwCore = pw_context_connect(pwContext, nullptr, 0);
++ if (!pwCore) {
++ qWarning() << "Failed to connect PipeWire context";
++ return;
++ }
++
++ pw_core_add_listener(pwCore, &coreListener, &pwCoreEvents, this);
++
++ pwStream = createReceivingStream();
++ if (!pwStream) {
++ qWarning() << "Failed to create PipeWire stream";
++ return;
++ }
++#else
+ // initialize our source
+ pwLoop = pw_loop_new(nullptr);
+ pwMainLoop = pw_thread_loop_new(pwLoop, "pipewire-main-loop");
+-
+ // create PipeWire core object (required)
+ pwCore = pw_core_new(pwLoop, nullptr);
+-#if !PW_CHECK_VERSION(0, 2, 9)
+ pwCoreType = pw_core_get_type(pwCore);
+
+- // init type maps
+ initializePwTypes();
+-#endif
+
+ // pw_remote should be initialized before type maps or connection error will happen
+ pwRemote = pw_remote_new(pwCore, nullptr, 0);
+-
+ // init PipeWire remote, add listener to handle events
+ pw_remote_add_listener(pwRemote, &remoteListener, &pwRemoteEvents, this);
+ pw_remote_connect_fd(pwRemote, pipewireFd.fileDescriptor());
++#endif
+
+ if (pw_thread_loop_start(pwMainLoop) < 0) {
+ qWarning() << "Failed to start main PipeWire loop";
+@@ -487,6 +521,18 @@ void PWFrameBuffer::Private::initializePwTypes()
+ }
+ #endif
+
++
++#if PW_CHECK_VERSION(0, 2, 90)
++void PWFrameBuffer::Private::onCoreError(void *data, uint32_t id, int seq, int res, const char *message)
++{
++ Q_UNUSED(data);
++ Q_UNUSED(id);
++ Q_UNUSED(seq);
++ Q_UNUSED(res);
++
++ qInfo() << "core error: " << message;
++}
++#else
+ /**
+ * @brief PWFrameBuffer::Private::onStateChanged - global state tracking for pipewire connection
+ * @param data pointer that you have set in pw_remote_add_listener call's last argument
+@@ -504,13 +550,14 @@ void PWFrameBuffer::Private::onStateChanged(void *data, pw_remote_state /*old*/,
+ qWarning() << "remote error: " << error;
+ break;
+ case PW_REMOTE_STATE_CONNECTED:
+- d->createReceivingStream();
++ d->pwStream = d->createReceivingStream();
+ break;
+ default:
+ qInfo() << "remote state: " << pw_remote_state_as_string(state);
+ break;
+ }
+ }
++#endif
+
+ /**
+ * @brief PWFrameBuffer::Private::onStreamStateChanged - called whenever stream state changes on pipewire server
+@@ -524,6 +571,20 @@ void PWFrameBuffer::Private::onStreamStateChanged(void *data, pw_stream_state /*
+
+ auto *d = static_cast<PWFrameBuffer::Private *>(data);
+
++#if PW_CHECK_VERSION(0, 2, 90)
++ switch (state) {
++ case PW_STREAM_STATE_ERROR:
++ qWarning() << "pipewire stream error: " << error_message;
++ break;
++ case PW_STREAM_STATE_PAUSED:
++ pw_stream_set_active(d->pwStream, true);
++ break;
++ case PW_STREAM_STATE_STREAMING:
++ case PW_STREAM_STATE_UNCONNECTED:
++ case PW_STREAM_STATE_CONNECTING:
++ break;
++ }
++#else
+ switch (state) {
+ case PW_STREAM_STATE_ERROR:
+ qWarning() << "pipewire stream error: " << error_message;
+@@ -534,6 +595,7 @@ void PWFrameBuffer::Private::onStreamStateChanged(void *data, pw_stream_state /*
+ default:
+ break;
+ }
++#endif
+ }
+
+ /**
+@@ -542,24 +604,28 @@ void PWFrameBuffer::Private::onStreamStateChanged(void *data, pw_stream_state /*
+ * @param data pointer that you have set in pw_stream_add_listener call's last argument
+ * @param format format that's being proposed
+ */
+-#if defined(PW_API_PRE_0_2_0)
+-void PWFrameBuffer::Private::onStreamFormatChanged(void *data, struct spa_pod *format)
++#if PW_CHECK_VERSION(0, 2, 90)
++void PWFrameBuffer::Private::onStreamParamChanged(void *data, uint32_t id, const struct spa_pod *format)
+ #else
+ void PWFrameBuffer::Private::onStreamFormatChanged(void *data, const struct spa_pod *format)
+-#endif // defined(PW_API_PRE_0_2_0)
++#endif
+ {
+ qInfo() << "Stream format changed";
+ auto *d = static_cast<PWFrameBuffer::Private *>(data);
+
+ const int bpp = 4;
+
++#if PW_CHECK_VERSION(0, 2, 90)
++ if (!format || id != SPA_PARAM_Format) {
++#else
+ if (!format) {
+ pw_stream_finish_format(d->pwStream, 0, nullptr, 0);
++#endif
+ return;
+ }
+
+ d->videoFormat = new spa_video_info_raw();
+-#if PW_CHECK_VERSION(0, 2, 9)
++#if PW_CHECK_VERSION(0, 2, 90)
+ spa_format_video_raw_parse(format, d->videoFormat);
+ #else
+ spa_format_video_raw_parse(format, d->videoFormat, &d->pwType->format_video);
+@@ -575,17 +641,19 @@ void PWFrameBuffer::Private::onStreamFormatChanged(void *data, const struct spa_
+ // setup buffers and meta header for new format
+ const struct spa_pod *params[2];
+
+-#if PW_CHECK_VERSION(0, 2, 9)
++#if PW_CHECK_VERSION(0, 2, 90)
+ params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
+ SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
+- ":", SPA_PARAM_BUFFERS_size, "i", size,
+- ":", SPA_PARAM_BUFFERS_stride, "i", stride,
+- ":", SPA_PARAM_BUFFERS_buffers, "?ri", SPA_CHOICE_RANGE(8, 1, 32),
+- ":", SPA_PARAM_BUFFERS_align, "i", 16));
++ SPA_PARAM_BUFFERS_size, SPA_POD_Int(size),
++ SPA_PARAM_BUFFERS_stride, SPA_POD_Int(stride),
++ SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(8, 1, 32),
++ SPA_PARAM_BUFFERS_blocks, SPA_POD_Int(1),
++ SPA_PARAM_BUFFERS_align, SPA_POD_Int(16)));
+ params[1] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
+ SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
+- ":", SPA_PARAM_META_type, "I", SPA_META_Header,
+- ":", SPA_PARAM_META_size, "i", sizeof(struct 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))));
++ pw_stream_update_params(d->pwStream, params, 2);
+ #else
+ params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_object(&builder,
+ d->pwCoreType->param.idBuffers, d->pwCoreType->param_buffers.Buffers,
+@@ -597,9 +665,8 @@ void PWFrameBuffer::Private::onStreamFormatChanged(void *data, const struct spa_
+ d->pwCoreType->param.idMeta, d->pwCoreType->param_meta.Meta,
+ ":", d->pwCoreType->param_meta.type, "I", d->pwCoreType->meta.Header,
+ ":", d->pwCoreType->param_meta.size, "i", sizeof(struct spa_meta_header)));
+-#endif
+-
+ pw_stream_finish_format(d->pwStream, 0, params, 2);
++#endif
+ }
+
+ /**
+@@ -647,7 +714,7 @@ void PWFrameBuffer::Private::handleFrame(pw_buffer *pwBuffer)
+ * and copy the framebuffer to the existing image that we track. The state of the stream and configuration
+ * are later handled by the corresponding listener.
+ */
+-void PWFrameBuffer::Private::createReceivingStream()
++pw_stream *PWFrameBuffer::Private::createReceivingStream()
+ {
+ spa_rectangle pwMinScreenBounds = SPA_RECTANGLE(1, 1);
+ spa_rectangle pwMaxScreenBounds = SPA_RECTANGLE(screenGeometry.width, screenGeometry.height);
+@@ -655,22 +722,31 @@ void PWFrameBuffer::Private::createReceivingStream()
+ spa_fraction pwFramerateMin = SPA_FRACTION(0, 1);
+ spa_fraction pwFramerateMax = SPA_FRACTION(60, 1);
+
+- auto reuseProps = pw_properties_new("pipewire.client.reuse", "1", nullptr); // null marks end of varargs
+- pwStream = pw_stream_new(pwRemote, "krfb-fb-consume-stream", reuseProps);
++#if PW_CHECK_VERSION(0, 2, 90)
++ auto stream = pw_stream_new_simple(pw_thread_loop_get_loop(pwMainLoop), "krfb-fb-consume-stream",
++ pw_properties_new(PW_KEY_MEDIA_TYPE, "Video",
++ PW_KEY_MEDIA_CATEGORY, "Capture",
++ PW_KEY_MEDIA_ROLE, "Screen",
++ nullptr),
++ &pwStreamEvents, this);
+
++#else
++ auto reuseProps = pw_properties_new("pipewire.client.reuse", "1", nullptr); // null marks end of varargs
++ auto stream = pw_stream_new(pwRemote, "krfb-fb-consume-stream", reuseProps);
++#endif
+ uint8_t buffer[1024] = {};
+ const spa_pod *params[1];
+ auto builder = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
+
+-#if PW_CHECK_VERSION(0, 2, 9)
++#if PW_CHECK_VERSION(0, 2, 90)
+ params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
+ SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
+- ":", SPA_FORMAT_mediaType, "I", SPA_MEDIA_TYPE_video,
+- ":", SPA_FORMAT_mediaSubtype, "I", SPA_MEDIA_SUBTYPE_raw,
+- ":", SPA_FORMAT_VIDEO_format, "I", SPA_VIDEO_FORMAT_RGBx,
+- ":", SPA_FORMAT_VIDEO_size, "?rR", SPA_CHOICE_RANGE(&pwMaxScreenBounds, &pwMinScreenBounds, &pwMaxScreenBounds),
+- ":", SPA_FORMAT_VIDEO_framerate, "F", &pwFramerateMin,
+- ":", SPA_FORMAT_VIDEO_maxFramerate, "?rF", SPA_CHOICE_RANGE(&pwFramerateMax, &pwFramerateMin, &pwFramerateMax)));
++ SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video),
++ SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw),
++ SPA_FORMAT_VIDEO_format, SPA_POD_Id(SPA_VIDEO_FORMAT_RGBx),
++ SPA_FORMAT_VIDEO_size, SPA_POD_CHOICE_RANGE_Rectangle(&pwMaxScreenBounds, &pwMinScreenBounds, &pwMaxScreenBounds),
++ SPA_FORMAT_VIDEO_framerate, SPA_POD_Fraction(&pwFramerateMin),
++ SPA_FORMAT_VIDEO_maxFramerate, SPA_POD_CHOICE_RANGE_Fraction(&pwFramerateMax, &pwFramerateMin, &pwFramerateMax)));
+ #else
+ params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_object(&builder,
+ pwCoreType->param.idEnumFormat, pwCoreType->spa_format,
+@@ -680,18 +756,20 @@ void PWFrameBuffer::Private::createReceivingStream()
+ ":", pwType->format_video.size, "Rru", &pwMaxScreenBounds, SPA_POD_PROP_MIN_MAX(&pwMinScreenBounds, &pwMaxScreenBounds),
+ ":", pwType->format_video.framerate, "F", &pwFramerateMin,
+ ":", pwType->format_video.max_framerate, "Fru", &pwFramerateMax, 2, &pwFramerateMin, &pwFramerateMax));
++ pw_stream_add_listener(stream, &streamListener, &pwStreamEvents, this);
+ #endif
+
+- pw_stream_add_listener(pwStream, &streamListener, &pwStreamEvents, this);
+ auto flags = static_cast<pw_stream_flags>(PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_INACTIVE | PW_STREAM_FLAG_MAP_BUFFERS);
+-#if PW_CHECK_VERSION(0, 2, 9)
+- if (pw_stream_connect(pwStream, PW_DIRECTION_INPUT, pwStreamNodeId, flags, params, 1) != 0) {
++#if PW_CHECK_VERSION(0, 2, 90)
++ if (pw_stream_connect(stream, PW_DIRECTION_INPUT, PW_ID_ANY, flags, params, 1) != 0) {
+ #else
+- if (pw_stream_connect(pwStream, PW_DIRECTION_INPUT, nullptr, flags, params, 1) != 0) {
++ if (pw_stream_connect(stream, PW_DIRECTION_INPUT, nullptr, flags, params, 1) != 0) {
+ #endif
+ qWarning() << "Could not connect receiving stream";
+ isValid = false;
+ }
++
++ return stream;
+ }
+
+ PWFrameBuffer::Private::~Private()
+@@ -710,20 +788,36 @@ PWFrameBuffer::Private::~Private()
+ pw_stream_destroy(pwStream);
+ }
+
++#if !PW_CHECK_VERSION(0, 2, 90)
+ if (pwRemote) {
+ pw_remote_destroy(pwRemote);
+ }
++#endif
++
++#if PW_CHECK_VERSION(0, 2, 90)
++ if (pwCore) {
++ pw_core_disconnect(pwCore);
++ }
+
+- if (pwCore)
++ if (pwContext) {
++ pw_context_destroy(pwContext);
++ }
++#else
++ if (pwCore) {
+ pw_core_destroy(pwCore);
++ }
++#endif
+
+ if (pwMainLoop) {
+ pw_thread_loop_destroy(pwMainLoop);
+ }
+
++#if !PW_CHECK_VERSION(0, 2, 90)
+ if (pwLoop) {
++ pw_loop_leave(pwLoop);
+ pw_loop_destroy(pwLoop);
+ }
++#endif
+ }
+
+ PWFrameBuffer::PWFrameBuffer(WId winid, QObject *parent)
+diff --git a/framebuffers/pipewire/pw_framebuffer.h b/framebuffers/pipewire/pw_framebuffer.h
+index 8b4e03b..d3acd57 100644
+--- a/framebuffers/pipewire/pw_framebuffer.h
++++ b/framebuffers/pipewire/pw_framebuffer.h
+@@ -1,6 +1,6 @@
+ /* This file is part of the KDE project
+ Copyright (C) 2018 Oleg Chernovskiy <kanedias at xaker.ru>
+- Copyright (C) 2018 Jan Grulich <jgrulich at redhat.com>
++ Copyright (C) 2018-2020 Jan Grulich <jgrulich at redhat.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+--
+cgit v1.1
+
More information about the arch-commits
mailing list