SHA256
1
0
forked from pool/kpipewire6

Compare commits

...

40 Commits

Author SHA256 Message Date
Ana Guerrero
d248ca5eec Accepting request 1226705 from KDE:Frameworks
Plasma 6.2.4, untested (forwarded request 1226674 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/1226705
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kpipewire6?expand=0&rev=17
2024-11-27 21:05:58 +00:00
Christophe Marin
47dc7725c3 Plasma 6.2.4, untested
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=38
2024-11-27 00:22:16 +00:00
Ana Guerrero
9599cbbf97 Accepting request 1221534 from KDE:Frameworks
Plasma 6.2.3 (forwarded request 1221508 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/1221534
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kpipewire6?expand=0&rev=16
2024-11-06 15:50:28 +00:00
Christophe Marin
1c913a045c Plasma 6.2.3
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=36
2024-11-05 17:02:04 +00:00
Ana Guerrero
0eeccb3943 Accepting request 1217177 from KDE:Frameworks
Plasma 6.2.2 (forwarded request 1217086 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/1217177
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kpipewire6?expand=0&rev=15
2024-10-24 13:41:01 +00:00
Christophe Marin
ff03f765f7 Plasma 6.2.2
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=34
2024-10-23 07:42:48 +00:00
Ana Guerrero
21e7611b19 Accepting request 1208314 from KDE:Frameworks
Plasma 6.2.1 (forwarded request 1208221 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/1208314
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kpipewire6?expand=0&rev=14
2024-10-16 21:40:43 +00:00
Christophe Marin
ba79571978 Plasma 6.2.1
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=32
2024-10-16 07:41:13 +00:00
Ana Guerrero
592e0e858d Accepting request 1205905 from KDE:Frameworks
Plasma 6.2.0

OBS-URL: https://build.opensuse.org/request/show/1205905
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kpipewire6?expand=0&rev=13
2024-10-07 19:47:24 +00:00
Christophe Marin
aadfc066f0 Plasma 6.2.0 maybe not final tars. K:F publishing already disabled.
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=30
2024-10-06 09:00:03 +00:00
Ana Guerrero
15cb6841e7 Accepting request 1205538 from KDE:Frameworks
ffmpeg 7.1 compat

OBS-URL: https://build.opensuse.org/request/show/1205538
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kpipewire6?expand=0&rev=12
2024-10-04 15:08:37 +00:00
OBS User buildservice-autocommit
cb7270c6c1 baserev update by copy to link target
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=29
2024-10-04 15:08:37 +00:00
OBS User buildservice-autocommit
428b33bedb Updating link to change in openSUSE:Factory/kpipewire6 revision 12
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=980968eb83ed75efc661b810d5bbb590
2024-10-04 15:08:37 +00:00
Christophe Marin
96ab6d1257 revert now
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=28
2024-10-03 14:12:22 +00:00
Christophe Marin
344cf25798 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=27 2024-10-03 14:08:33 +00:00
Christophe Marin
7be3ea2745 Temporary revert to add ffmpeg 7.1 compat patch
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=26
2024-10-03 14:04:01 +00:00
Christophe Marin
8344aaefd8 Plasma 6.2 beta, try 2
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=25
2024-09-26 10:49:49 +00:00
Ana Guerrero
f66091d941 Accepting request 1200006 from KDE:Frameworks
Plasma 6.1.5. sddm-kcm6 needed a patch change. (forwarded request 1199935 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/1200006
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kpipewire6?expand=0&rev=11
2024-09-11 14:55:00 +00:00
Dominique Leuenberger
e1fac7ccf7 Accepting request 1191932 from KDE:Frameworks
Plasma 6.1.4 (forwarded request 1191908 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/1191932
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kpipewire6?expand=0&rev=10
2024-08-08 08:56:04 +00:00
Christophe Marin
9ab64454b9 Plasma 6.1.4
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=21
2024-08-06 19:17:11 +00:00
Ana Guerrero
2f4578a6a4 Accepting request 1187987 from KDE:Frameworks
Plasma 6.1.3 (forwarded request 1187956 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/1187987
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kpipewire6?expand=0&rev=9
2024-07-17 13:13:03 +00:00
Christophe Marin
d2046b49f6 Plasma 6.1.3
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=19
2024-07-16 17:34:19 +00:00
Ana Guerrero
ac14b5ef89 Accepting request 1184994 from KDE:Frameworks
Plasma 6.1.2 (forwarded request 1184925 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/1184994
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kpipewire6?expand=0&rev=8
2024-07-04 14:20:33 +00:00
Christophe Marin
2108448519 Plasma 6.1.2
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=17
2024-07-03 06:31:30 +00:00
Ana Guerrero
7615c06299 Accepting request 1183365 from KDE:Frameworks
Plasma 6.1.1 (forwarded request 1183337 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/1183365
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kpipewire6?expand=0&rev=7
2024-06-27 13:58:40 +00:00
Christophe Marin
2d79a2592f Plasma 6.1.1
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=15
2024-06-26 11:06:09 +00:00
Ana Guerrero
bb34cddb8c Accepting request 1181116 from KDE:Frameworks
Plasma 6.1

OBS-URL: https://build.opensuse.org/request/show/1181116
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kpipewire6?expand=0&rev=6
2024-06-22 11:21:57 +00:00
Christophe Marin
d0126c3252 Plasma 6.1 maybe final, somewhat tested. KDE:Frameworks already publish disabled.
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=13
2024-06-16 08:35:31 +00:00
Ana Guerrero
b1f223ce6e Accepting request 1176098 from KDE:Frameworks
Plasma 6.0.5(.1) (forwarded request 1176041 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/1176098
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kpipewire6?expand=0&rev=5
2024-05-27 09:45:42 +00:00
Christophe Marin
21637fec71 Plasma 6.0.5(.1)
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=11
2024-05-23 08:32:33 +00:00
Ana Guerrero
1763f43691 Accepting request 1168737 from KDE:Frameworks
Plasma 6.0.4(.1) (forwarded request 1168499 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/1168737
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kpipewire6?expand=0&rev=4
2024-04-18 20:11:18 +00:00
Christophe Marin
f208838bd4 Plasma 6.0.4(.1)
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=9
2024-04-18 07:14:39 +00:00
Ana Guerrero
4071d99d35 Accepting request 1162422 from KDE:Frameworks
Plasma 6.0.3. The release actually builds this time! (After other distros already found major issues...) (forwarded request 1162359 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/1162422
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kpipewire6?expand=0&rev=3
2024-03-28 12:53:41 +00:00
Christophe Marin
e2b19b172b Plasma 6.0.3. The release actually builds this time! (After other distros already found major issues...)
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=7
2024-03-26 22:05:09 +00:00
Ana Guerrero
b9f132ce91 Accepting request 1157696 from KDE:Frameworks
Plasma 6.0.2 + libksysguard5-helper upgrade fix + icon upgrade fix + gtk theme fix (forwarded request 1157674 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/1157696
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kpipewire6?expand=0&rev=2
2024-03-14 16:43:18 +00:00
Christophe Marin
5ba84c4696 Plasma 6.0.2 + libksysguard5-helper upgrade fix + icon upgrade fix + gtk theme fix
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=5
2024-03-13 16:58:29 +00:00
Ana Guerrero
b128ed8958 Accepting request 1155663 from KDE:Frameworks
Plasma 6.0.1

OBS-URL: https://build.opensuse.org/request/show/1155663
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kpipewire6?expand=0&rev=1
2024-03-11 14:28:31 +00:00
cf8dd724ce Plasma 6.0.1 + some provides
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=3
2024-03-06 15:50:23 +00:00
Christophe Marin
c5e8474ce6 Plasma 6.0 for now. Prj already publish disabled.
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=2
2024-02-25 12:05:22 +00:00
Luca Beltrame
71f5f57566 Plasma 6 RC 2. Still untested...
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kpipewire6?expand=0&rev=1
2024-02-07 18:01:32 +00:00
12 changed files with 110 additions and 389 deletions

View File

@ -1,107 +0,0 @@
From a50c28da704fbf8b9e71ec92054f325a33b9765f Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Sat, 6 Jul 2024 16:27:28 +0200
Subject: [PATCH 1/2] Simpler yet more useful handling of
KPIPEWIRE_FORCE_ENCODER
Previously, it always overrode the encoder type and profile.
Now just force a specific encoder by inlining the encoder selection
in the switch cases.
This means it's no longer possible to force a different encoder type
than the application requested, but it's arguably not that useful to
e.g. force VP9 if the application expects H.264 packets.
(cherry picked from commit 0c3f8b4f9de7d4dcd24d952184dabdbda74b4c35)
---
src/pipewireproduce.cpp | 45 +++++++++--------------------------------
1 file changed, 9 insertions(+), 36 deletions(-)
diff --git a/src/pipewireproduce.cpp b/src/pipewireproduce.cpp
index 3452ce9..416bcd3 100644
--- a/src/pipewireproduce.cpp
+++ b/src/pipewireproduce.cpp
@@ -266,46 +266,19 @@ void PipeWireProduce::stateChanged(pw_stream_state state)
std::unique_ptr<Encoder> PipeWireProduce::makeEncoder()
{
- auto encoderType = m_encoderType;
- bool forceSoftware = false;
- bool forceHardware = false;
-
- if (qEnvironmentVariableIsSet("KPIPEWIRE_FORCE_ENCODER")) {
- auto forcedEncoder = qEnvironmentVariable("KPIPEWIRE_FORCE_ENCODER");
- if (forcedEncoder == u"libvpx") {
- qCWarning(PIPEWIRERECORD_LOGGING) << "Forcing VP8 Software encoding";
- encoderType = PipeWireBaseEncodedStream::VP8;
- forceSoftware = true;
- } else if (forcedEncoder == u"libvpx-vp9") {
- qCWarning(PIPEWIRERECORD_LOGGING) << "Forcing VP9 Software encoding";
- encoderType = PipeWireBaseEncodedStream::VP9;
- forceSoftware = true;
- } else if (forcedEncoder == u"libx264") {
- qCWarning(PIPEWIRERECORD_LOGGING) << "Forcing H264 Software encoding, main profile";
- encoderType = PipeWireBaseEncodedStream::H264Main;
- forceSoftware = true;
- } else if (forcedEncoder == u"h264_vaapi") {
- qCWarning(PIPEWIRERECORD_LOGGING) << "Forcing H264 Hardware encoding, main profile";
- encoderType = PipeWireBaseEncodedStream::H264Main;
- forceHardware = true;
- } else if (forcedEncoder == u"libx264_baseline") {
- qCWarning(PIPEWIRERECORD_LOGGING) << "Forcing H264 Software encoding, baseline profile";
- encoderType = PipeWireBaseEncodedStream::H264Baseline;
- forceSoftware = true;
- } else if (forcedEncoder == u"h264_vaapi_baseline") {
- qCWarning(PIPEWIRERECORD_LOGGING) << "Forcing H264 Hardware encoding, baseline profile";
- encoderType = PipeWireBaseEncodedStream::H264Baseline;
- forceHardware = true;
- }
+ auto forcedEncoder = qEnvironmentVariable("KPIPEWIRE_FORCE_ENCODER");
+ if (!forcedEncoder.isNull()) {
+ qCWarning(PIPEWIRERECORD_LOGGING) << "Forcing encoder to" << forcedEncoder;
}
auto size = m_stream->size();
- switch (encoderType) {
+ switch (m_encoderType) {
case PipeWireBaseEncodedStream::H264Baseline:
case PipeWireBaseEncodedStream::H264Main: {
auto profile = m_encoderType == PipeWireBaseEncodedStream::H264Baseline ? Encoder::H264Profile::Baseline : Encoder::H264Profile::Main;
- if (!forceSoftware) {
+
+ if (forcedEncoder.isNull() || forcedEncoder == u"h264_vaapi") {
auto hardwareEncoder = std::make_unique<H264VAAPIEncoder>(profile, this);
hardwareEncoder->setQuality(m_quality);
hardwareEncoder->setEncodingPreference(m_encodingPreference);
@@ -314,7 +287,7 @@ std::unique_ptr<Encoder> PipeWireProduce::makeEncoder()
}
}
- if (!forceHardware) {
+ if (forcedEncoder.isNull() || forcedEncoder == u"libx264") {
auto softwareEncoder = std::make_unique<LibX264Encoder>(profile, this);
softwareEncoder->setQuality(m_quality);
softwareEncoder->setEncodingPreference(m_encodingPreference);
@@ -325,7 +298,7 @@ std::unique_ptr<Encoder> PipeWireProduce::makeEncoder()
break;
}
case PipeWireBaseEncodedStream::VP8: {
- if (!forceHardware) {
+ if (forcedEncoder.isNull() || forcedEncoder == u"libvpx") {
auto encoder = std::make_unique<LibVpxEncoder>(this);
encoder->setQuality(m_quality);
if (encoder->initialize(size)) {
@@ -335,7 +308,7 @@ std::unique_ptr<Encoder> PipeWireProduce::makeEncoder()
break;
}
case PipeWireBaseEncodedStream::VP9: {
- if (!forceHardware) {
+ if (forcedEncoder.isNull() || forcedEncoder == u"libvpx-vp9") {
auto encoder = std::make_unique<LibVpxVp9Encoder>(this);
encoder->setQuality(m_quality);
if (encoder->initialize(size)) {
--
2.45.2

View File

@ -1,223 +0,0 @@
From 43ab595c28e031f38bc92bea4cf475de64021958 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Sat, 6 Jul 2024 16:40:42 +0200
Subject: [PATCH 2/2] Add encoder using libopenh264
On some distributions, libopenh264 is the only encoder available OOTB.
Add support for it and use it as fallback.
BUG: 476187
(cherry picked from commit e17793a3b023f26411001093bb2d5934adf715c7)
---
src/CMakeLists.txt | 1 +
src/libopenh264encoder.cpp | 106 ++++++++++++++++++++++++++++++
src/libopenh264encoder_p.h | 28 ++++++++
src/pipewirebaseencodedstream.cpp | 2 +-
src/pipewireproduce.cpp | 11 ++++
5 files changed, 147 insertions(+), 1 deletion(-)
create mode 100644 src/libopenh264encoder.cpp
create mode 100644 src/libopenh264encoder_p.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e96f52b..3126528 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -135,6 +135,7 @@ add_library(KPipeWireRecord ${kpipewirerecord_SRCS}
encoder.cpp
h264vaapiencoder.cpp
libx264encoder.cpp
+ libopenh264encoder.cpp
libvpxencoder.cpp
libvpxvp9encoder.cpp
)
diff --git a/src/libopenh264encoder.cpp b/src/libopenh264encoder.cpp
new file mode 100644
index 0000000..6d4c6a1
--- /dev/null
+++ b/src/libopenh264encoder.cpp
@@ -0,0 +1,106 @@
+/*
+ SPDX-FileCopyrightText: 2023 Aleix Pol Gonzalez <aleixpol@kde.org>
+ SPDX-FileCopyrightText: 2023 Marco Martin <mart@kde.org>
+ SPDX-FileCopyrightText: 2023 Arjen Hiemstra <ahiemstra@heimr.nl>
+ SPDX-FileCopyrightText: 2024 Fabian Vogt <fabian@ritter-vogt.de>
+
+ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+*/
+
+#include "libopenh264encoder_p.h"
+
+#include <QSize>
+#include <QThread>
+
+extern "C" {
+#include <libavcodec/avcodec.h>
+#include <libavfilter/buffersink.h>
+#include <libavfilter/buffersrc.h>
+#include <libavutil/pixfmt.h>
+}
+
+#include "logging_record.h"
+
+LibOpenH264Encoder::LibOpenH264Encoder(H264Profile profile, PipeWireProduce *produce)
+ : SoftwareEncoder(produce)
+ , m_profile(profile)
+{
+}
+
+bool LibOpenH264Encoder::initialize(const QSize &size)
+{
+ createFilterGraph(size);
+
+ auto codec = avcodec_find_encoder_by_name("libopenh264");
+ if (!codec) {
+ qCWarning(PIPEWIRERECORD_LOGGING) << "libopenh264 codec not found";
+ return false;
+ }
+
+ m_avCodecContext = avcodec_alloc_context3(codec);
+ if (!m_avCodecContext) {
+ qCWarning(PIPEWIRERECORD_LOGGING) << "Could not allocate video codec context";
+ return false;
+ }
+
+ Q_ASSERT(!size.isEmpty());
+ m_avCodecContext->width = size.width();
+ m_avCodecContext->height = size.height();
+ m_avCodecContext->max_b_frames = 0;
+ m_avCodecContext->gop_size = 100;
+ m_avCodecContext->pix_fmt = AV_PIX_FMT_YUV420P;
+ m_avCodecContext->time_base = AVRational{1, 1000};
+
+ if (m_quality) {
+ // "q" here stands for "quantization", but that effectively impacts quality.
+ m_avCodecContext->qmin = m_avCodecContext->qmax = percentageToAbsoluteQuality(m_quality);
+ }
+
+ switch (m_profile) {
+ case H264Profile::Baseline:
+ // libopenh264 only does constrained baseline.
+ // There's a bug in the ffmpeg -> openh264 interface though:
+ // ffmpeg expects CONSTRAINED_BASELINE from the application and
+ // passes that through, but libopenh264 only allows BASELINE.
+ // Until that bug is fixed there'll always be a warning that the
+ // profile is not supported (https://github.com/cisco/openh264/issues/3613)
+ m_avCodecContext->profile = FF_PROFILE_H264_CONSTRAINED_BASELINE;
+ break;
+ case H264Profile::Main:
+ m_avCodecContext->profile = FF_PROFILE_H264_MAIN;
+ break;
+ case H264Profile::High:
+ m_avCodecContext->profile = FF_PROFILE_H264_HIGH;
+ break;
+ }
+
+ AVDictionary *options = nullptr;
+ av_dict_set_int(&options, "threads", qMin(16, QThread::idealThreadCount()), 0);
+ applyEncodingPreference(options);
+
+ if (int result = avcodec_open2(m_avCodecContext, codec, &options); result < 0) {
+ qCWarning(PIPEWIRERECORD_LOGGING) << "Could not open codec" << av_err2str(result);
+ return false;
+ }
+
+ return true;
+}
+
+int LibOpenH264Encoder::percentageToAbsoluteQuality(const std::optional<quint8> &quality)
+{
+ if (!quality) {
+ return -1;
+ }
+
+ // 1-51 (incl.), lower is better
+ return 51 - (m_quality.value() / 100.0) * 50;
+}
+
+void LibOpenH264Encoder::applyEncodingPreference(AVDictionary *options)
+{
+ SoftwareEncoder::applyEncodingPreference(options);
+ // Disable motion estimation, not great while dragging windows but speeds up encoding by an order of magnitude
+ av_dict_set(&options, "flags", "+mv4", 0);
+ // Disable in-loop filtering
+ av_dict_set_int(&options, "loopfilter", 0, 0);
+}
diff --git a/src/libopenh264encoder_p.h b/src/libopenh264encoder_p.h
new file mode 100644
index 0000000..fdacf14
--- /dev/null
+++ b/src/libopenh264encoder_p.h
@@ -0,0 +1,28 @@
+/*
+ SPDX-FileCopyrightText: 2023 Aleix Pol Gonzalez <aleixpol@kde.org>
+ SPDX-FileCopyrightText: 2023 Marco Martin <mart@kde.org>
+ SPDX-FileCopyrightText: 2023 Arjen Hiemstra <ahiemstra@heimr.nl>
+ SPDX-FileCopyrightText: 2024 Fabian Vogt <fabian@ritter-vogt.de>
+
+ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+*/
+
+#include "encoder_p.h"
+
+/**
+ * A software encoder that uses ffmpeg + libopenh264 to encode to H.264.
+ */
+class LibOpenH264Encoder : public SoftwareEncoder
+{
+public:
+ LibOpenH264Encoder(H264Profile profile, PipeWireProduce *produce);
+
+ bool initialize(const QSize &size) override;
+
+protected:
+ int percentageToAbsoluteQuality(const std::optional<quint8> &quality) override;
+ void applyEncodingPreference(AVDictionary *options) override;
+
+private:
+ H264Profile m_profile = H264Profile::Main;
+};
diff --git a/src/pipewirebaseencodedstream.cpp b/src/pipewirebaseencodedstream.cpp
index 553c334..814d8d9 100644
--- a/src/pipewirebaseencodedstream.cpp
+++ b/src/pipewirebaseencodedstream.cpp
@@ -225,7 +225,7 @@ QList<PipeWireBaseEncodedStream::Encoder> PipeWireBaseEncodedStream::suggestedEn
&& avcodec_find_encoder_by_name("h264_vaapi")) {
return false;
} else {
- return !avcodec_find_encoder_by_name("libx264");
+ return !(avcodec_find_encoder_by_name("libx264") || avcodec_find_encoder_by_name("libopenh264"));
}
default:
return true;
diff --git a/src/pipewireproduce.cpp b/src/pipewireproduce.cpp
index 416bcd3..52594e6 100644
--- a/src/pipewireproduce.cpp
+++ b/src/pipewireproduce.cpp
@@ -16,6 +16,7 @@
#include <qstringliteral.h>
#include "h264vaapiencoder_p.h"
+#include "libopenh264encoder_p.h"
#include "libvpxencoder_p.h"
#include "libvpxvp9encoder_p.h"
#include "libx264encoder_p.h"
@@ -295,6 +296,16 @@ std::unique_ptr<Encoder> PipeWireProduce::makeEncoder()
return softwareEncoder;
}
}
+
+ // Try libopenh264 last, it's slower and has less features.
+ if (forcedEncoder.isNull() || forcedEncoder == u"libopenh264") {
+ auto softwareEncoder = std::make_unique<LibOpenH264Encoder>(profile, this);
+ softwareEncoder->setQuality(m_quality);
+ softwareEncoder->setEncodingPreference(m_encodingPreference);
+ if (softwareEncoder->initialize(size)) {
+ return softwareEncoder;
+ }
+ }
break;
}
case PipeWireBaseEncodedStream::VP8: {
--
2.45.2

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eb2217024e3bf3a4777548b9a0bda88ca0b97912d20336b03f5942b28b1baef9
size 148504

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmaWVKcACgkQ11dEg7tX
sY0bnA/9FAl4Ym/986mF3V5rW/z7SACdBUSd/PivMDigDVRedzYuAe2oR87e2paO
UO51vAEGjXZEeNk9X2jUd/nYXda/EtwjWHMxxHsnzgb5kpIvA7vZ+9tE5FCNUbRy
9EWMf2OId/INCsSh6RH6iLmiuoUa7jtdJ2cAvx5AxSGfYxjHj3YAoWk77zDAxhy4
bZzY0+5fgYCcT8xbSUeGiRscXIw/G6Q8boOOqACyeJCD7mESOB4BtziF6RL4r05i
EBMeuutUDTK1//bu6Y4MaEKx1bPrawR6RQeFocW4Pgp2hKiPTRuWMy8e+7OjTvb1
cfQlEqOEVtyWKAD5uSCCif+yCqdFkSXXpo9vNXpKjBnMlyXASFLM7jN8TIm7HcQo
FqPaHstaOaOOQ33om5PjLsSNEzV/MSv2SQ6aA0CbglJxBm5okfLuYb/Vuaid4iPD
LV5eySGagfmI+LS/SGUTbNC499+cFCnWB0XziYbbW0mxQWfBe25Yxk4LXMzSYFIH
WZE3MUgKbPRrRL4/VGdrD2eBGCt7p2xlLEdmTSVJ0AIHfKoaIC8hmDoy3N8L8S7Q
IS9Qf95EASBc0/aDbY7o1JQuKjR8VnDvE8ooBtBnW9sObnDSJhWYpi8fOr1ZhWvW
RKDnX/B6rWkIVqG7rZLUcpXwrnQjAdnO5B3NAwn7Eo7/vt0OFdY=
=9kTE
-----END PGP SIGNATURE-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ab116d56fd8a6b36da6b595f597cf4383d8ed171f8e625dca67b7a4645337134
size 148980

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmayGCUACgkQ11dEg7tX
sY1swQ/8CARXuUAQxMDLs5tkDTk9RZudSLocHQKgAi8JIIWh6uGHcn9fcVfM5nsA
ml/esuTG3eWz3ezqGQqzWLWinSPDvsWnpS6fiBE2aBWIHaFLI5RObtpjYtY0Dfpc
YruJx6WbnHWIzdUN4bls5dPwL0Josg0Uu/gAL46bAHY6+PprHEJnOZkmJAs9GOJE
PAnoWotE+2wrACd0BP+LzXzn/EcfGVx0SmLSiL581zbFWRYyb7H/nFNnkq1HZDMy
V+x2Gg8va6Ft3LKDoLZlil3oEfr76pDv+NQKesaOrGtu4YWcjSBUWmyMErLDjk9k
gd7gQfxAJQ1he6z4ueJc3Zx/aAir8VxXAb1xIluHLlclLqZSIsHZA4Izg7SNqeju
G4eO9h6ap9Ttvz0z8mB0XfvZLpGlXteAkBEZ4iG5skj/r3G97cSu9onLNznMKA7A
P0vT1Px+qye45wz3AZkQMsUkZ332MPTdnazxP7dyK5hHw8p1TtRaP9BwDp/QZisP
DYEJtjGpMDjOlV/bSG5otDcJ/ykvDF1AVSw1iBNKJY1Mcrl1bmmrVl89A+duR2sS
PAGw9ye1euFubA4pUo5hz9DrDKaAOCeWQB2eSZvkHfbVbPbFx/hhsbLRmv8rOvVp
hxeSooNYuCWQNp3CUD6DzBIreIbsiBvmdY+aRvFaUe/o80cEx9g=
=03/q
-----END PGP SIGNATURE-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:25b32cfcaff352f0c4acda5746adffd2e3b28b5ff0648521bde8628ca7145a49
size 149096

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmbgCFcACgkQ11dEg7tX
sY1ypg/+LX5uzdfEqBbZQNtyl7selXiGGlWlwqgB0zbVhLI4KawapP0zU1YTgQtQ
eVjHBF9TdRyN3JgEKeDhAeKxchIau0n7/VNugvLLlyB93vC4Qmg6Dy7szIuiLoIa
tWycxAaPaaF+LLx+WHwYG4ymgWvzkh0+7dYoWn4EBwfrqhqB8ijJexWYawgqEiVh
FdkFiOGPLZ8nbwCkvYFFkxv9cfHmCO4nZpHrfekp8vvSsGY9sngvvjhHc+Uf0eU8
Q7Onyro768isRP+pPsifZwjLS1JvdMIKHt3+gC9/MTLXsc2kyBSNnlVGFT+JAV6A
fdMt3AuuBeVVJPJ11TiawefjR1KCSh8jdeHNsBmszBvpXTuAcC2pbEF22KOwau7W
qBU15RYl1g9DRL/0h0XzTDHjOdi+IQOmui1ZrO1vNrw+uxA+Zo7dPBSbf7ex4E33
AEgzQrDiZgk+DBPC3opIl1W4IB1kf+FTu1azqCT5DFR3S5QEA7vLbidaV8T2VGH9
EE0eZEiGBeKrzj7O8KpclRL2IDuBsBfEQoSiDQU34Pk2Q9Vw9HvL2Au/j/tBzc67
OT//ng3QXjK/rl2iw9Bj6WZfLODiRGE1edQ79nxfJHZpIl+HTubQxDtlDOQ3bYOd
lqQiy0KgupZ19xbH9BnLrgeEzQM0rp4xgr78rEEcJOQIPOc6WAo=
=t2v3
-----END PGP SIGNATURE-----

3
kpipewire-6.2.4.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:76e456206a9f6e922cb10614476a19682f8c27957c5c8998f1d1a0dadb94ca6b
size 149944

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmdFndoACgkQ11dEg7tX
sY2i2Q/7B9VQW4QuVOnU5iRj8jSyXaTir14eqIuwb1ZycNJclrgeYAfkUM7XEQXA
YstoEa48t+h93cxiAiiNltYG1LzZRrsVe+x4+WHI8u14Wfk41Gp7882Qvgp+XVTd
i3GNV+TzmD0zKN+f8yeGqy4tEBJOpL1uLEjr0ORIslwz1lhq0CjBJX1DYz1r8aS/
zcuqrGaZjAYk8QqTasq7Z0vTwDtSaLvkIcyN5guqdqlb0/b83oBXXQ5IFfjOh+ve
1D9zeMaQ/RZxHG97MllKCi5B6Pue3SEjV9RRsjJd9DzlHmr7xVqYN1FqTgmLsfJK
Affe4f6l6B+EmgkUHBM4h3vznPNLk3gK0eSOv1kr9OAl/Fo7mZlqOLA/5otH6t20
2PgK9gXYswscs57+u1vYHN4HfMUSDNuDFcNjbSWLRir6mFCysFN52cQBZnBeiSCH
P8JEMPODpMj0wJY8H73X0uAhBOHcNbdFHaLOPJ58Pquh8if0DS6ri3P4SnYzVPXh
RaZbc2yo+U1nN/lJjkyLprKd9vmXaPdLltmfwkM5/LCDiEmU6h0PjwjXfuMRB/iO
gikyvU39lDda65QK/mHuIGQE7v5491iE8u+WfEtqLbS6+Jsg/OZuyz3hXdM9KHXo
BhlEqT+oTOMUCjYdVVnZq1j+8bGtKOeO3lZIL/+OE9mzVZg0vUo=
=y0hI
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,92 @@
-------------------------------------------------------------------
Tue Nov 26 15:46:00 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 6.2.4:
* New bugfix release
* For more details see https://kde.org/announcements/plasma/6/6.2.4
- Changes since 6.2.3:
* update version for new release
-------------------------------------------------------------------
Tue Nov 5 13:30:18 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 6.2.3:
* New bugfix release
* For more details see https://kde.org/announcements/plasma/6/6.2.3
- Changes since 6.2.2:
* update version for new release
* libx264encoder: Ensure stream size is always a multiple of 2 (kde#485733)
* encoder: Make it possble to override the filter graph used for software encode
-------------------------------------------------------------------
Tue Oct 22 14:07:26 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 6.2.2:
* New bugfix release
* For more details see https://kde.org/announcements/plasma/6/6.2.2
- Changes since 6.2.1:
* update version for new release
-------------------------------------------------------------------
Tue Oct 15 16:53:25 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 6.2.1:
* New bugfix release
* For more details see https://kde.org/announcements/plasma/6/6.2.1
- Changes since 6.2.0:
* PipeWireSourceStream: work around crashes for pipewire < 0.3.49 (kde#492400)
* produce: Flush remaining frames when we are deactivating (kde#471159)
* update version for new release
-------------------------------------------------------------------
Sat Oct 5 10:44:17 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 6.2.0:
* New bugfix release
* For more details see https://kde.org/announcements/plasma/6/6.2.0
- Changes since 6.1.90:
* update version for new release
* h264vaapi: Use the proper getter for getting the hardware context
-------------------------------------------------------------------
Thu Oct 3 14:12:07 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Drop patch, no longer needed:
* 0001-h264vaapi-Use-the-proper-getter-for-getting-the-hard.patch
-------------------------------------------------------------------
Thu Oct 3 14:08:29 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Add ffmpeg 7.1 compatibility patch:
* 0001-h264vaapi-Use-the-proper-getter-for-getting-the-hard.patch
-------------------------------------------------------------------
Tue Sep 17 14:53:30 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 6.1.90:
* New feature release
* For more details see https://kde.org/announcements/plasma/6/6.1.90
- Changes since 6.1.5:
* update version for new release
* sourcestream: Do not process null streams
* Add missing "pipewireencodedstream.h" include
* Generate wayland code with PRIVATE_CODE
* produce: Use a separate condition_variable for passthrough/output thread
* Guard m_stream in setMaxFramerate
* pipewireproduce.cpp: Add guard to m_stream
* sourcestream: make resilient against pipewire restarts
* Fix some copy-and-paste issues in h264vaapi and libx264 encoders
* Add encoder using libopenh264 (kde#476187)
* Simpler yet more useful handling of KPIPEWIRE_FORCE_ENCODER
* produce: Properly cleanup on deactivate in all cases (kde#488687)
* produce: Destroy PipeWireSourceStream on the right thread (kde#489434)
* gitignore: add VS Code dir
* mediamonitortest: start media session and create dummy output to test playback state
* Use only non external only format modifiers
* Drop implicit modifier shortcut
* Use reserve to reserve space in list
* update version for new release
-------------------------------------------------------------------
Tue Sep 10 14:53:47 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -17,7 +17,7 @@
%global kf6_version 6.0.0
%define qt6_version 6.6.0
%define qt6_version 6.7.0
%define _sover 6
%define rname kpipewire
@ -27,7 +27,7 @@
%{!?_plasma6_version: %define _plasma6_version %(echo %{_plasma6_bugfix} | awk -F. '{print $1"."$2}')}
%bcond_without released
Name: kpipewire6
Version: 6.1.5
Version: 6.2.4
Release: 0
Summary: PipeWire integration for KDE Plasma
License: LGPL-2.0-only AND LGPL-3.0-only