yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plugins/screencast: Rename PipeWireStream to ScreenCastStream

Browse source 
This change renames the PipeWireStream class to ScreenCastStream to make
naming consistent.
This commit is contained in:
Vlad Zahorodnii 2021-11-16 09:51:01 +02:00
parent 5d5780c770
commit af4c37c095
5 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/screencast/CMakeLists.txt
View file

@ -3,9 +3,9 @@ set(screencast_SOURCES
main.cpp
outputscreencastsource.cpp
pipewirecore.cpp
pipewirestream.cpp
screencastmanager.cpp
screencastsource.cpp
screencaststream.cpp
windowscreencastsource.cpp
)

24
src/plugins/screencast/screencastmanager.cpp
View file

@ -14,7 +14,7 @@
#include "effects.h"
#include "kwingltexture.h"
#include "outputscreencastsource.h"
#include "pipewirestream.h"
#include "screencaststream.h"
#include "platform.h"
#include "scene.h"
#include "wayland_server.h"
@ -39,18 +39,18 @@ ScreencastManager::ScreencastManager(QObject *parent)
connect(m_screencast, &KWaylandServer::ScreencastV1Interface::virtualOutputScreencastRequested, this, &ScreencastManager::streamVirtualOutput);
}
class WindowStream : public PipeWireStream
class WindowStream : public ScreenCastStream
{
public:
WindowStream(Toplevel *toplevel, QObject *parent)
: PipeWireStream(new WindowScreenCastSource(toplevel), parent)
: ScreenCastStream(new WindowScreenCastSource(toplevel), parent)
, m_toplevel(toplevel)
{
if (AbstractClient *client = qobject_cast<AbstractClient *>(toplevel)) {
setObjectName(client->desktopFileName());
}
connect(this, &PipeWireStream::startStreaming, this, &WindowStream::startFeeding);
connect(this, &PipeWireStream::stopStreaming, this, &WindowStream::stopFeeding);
connect(this, &ScreenCastStream::startStreaming, this, &WindowStream::startFeeding);
connect(this, &ScreenCastStream::stopStreaming, this, &WindowStream::stopFeeding);
}
private:
@ -124,7 +124,7 @@ void ScreencastManager::streamOutput(KWaylandServer::ScreencastStreamV1Interface
return;
}
auto stream = new PipeWireStream(new OutputScreenCastSource(streamOutput), this);
auto stream = new ScreenCastStream(new OutputScreenCastSource(streamOutput), this);
stream->setObjectName(streamOutput->name());
stream->setCursorMode(mode, streamOutput->scale(), streamOutput->geometry());
auto bufferToStream = [streamOutput, stream] (const QRegion &damagedRegion) {
@ -136,25 +136,25 @@ void ScreencastManager::streamOutput(KWaylandServer::ScreencastStreamV1Interface
const QRegion region = streamOutput->pixelSize() != streamOutput->modeSize() ? frame : damagedRegion.translated(-streamOutput->geometry().topLeft()).intersected(frame);
stream->recordFrame(region);
};
connect(stream, &PipeWireStream::startStreaming, waylandStream, [streamOutput, stream, bufferToStream] {
connect(stream, &ScreenCastStream::startStreaming, waylandStream, [streamOutput, stream, bufferToStream] {
Compositor::self()->scene()->addRepaint(streamOutput->geometry());
streamOutput->recordingStarted();
connect(streamOutput, &AbstractWaylandOutput::outputChange, stream, bufferToStream);
});
connect(stream, &PipeWireStream::stopStreaming, waylandStream, [streamOutput]{
connect(stream, &ScreenCastStream::stopStreaming, waylandStream, [streamOutput]{
streamOutput->recordingStopped();
});
integrateStreams(waylandStream, stream);
}
void ScreencastManager::integrateStreams(KWaylandServer::ScreencastStreamV1Interface *waylandStream, PipeWireStream *stream)
void ScreencastManager::integrateStreams(KWaylandServer::ScreencastStreamV1Interface *waylandStream, ScreenCastStream *stream)
{
connect(waylandStream, &KWaylandServer::ScreencastStreamV1Interface::finished, stream, &PipeWireStream::stop);
connect(stream, &PipeWireStream::stopStreaming, waylandStream, [stream, waylandStream] {
connect(waylandStream, &KWaylandServer::ScreencastStreamV1Interface::finished, stream, &ScreenCastStream::stop);
connect(stream, &ScreenCastStream::stopStreaming, waylandStream, [stream, waylandStream] {
waylandStream->sendClosed();
stream->deleteLater();
});
connect(stream, &PipeWireStream::streamReady, stream, [waylandStream] (uint nodeid) {
connect(stream, &ScreenCastStream::streamReady, stream, [waylandStream] (uint nodeid) {
waylandStream->sendCreated(nodeid);
});
if (!stream->init()) {

4
src/plugins/screencast/screencastmanager.h
View file

@ -15,7 +15,7 @@
namespace KWin
{
class AbstractWaylandOutput;
class PipeWireStream;
class ScreenCastStream;
class ScreencastManager : public Plugin
{
@ -37,7 +37,7 @@ private:
double scale,
KWaylandServer::ScreencastV1Interface::CursorMode mode);
void integrateStreams(KWaylandServer::ScreencastStreamV1Interface *waylandStream, PipeWireStream *stream);
void integrateStreams(KWaylandServer::ScreencastStreamV1Interface *waylandStream, ScreenCastStream *stream);
KWaylandServer::ScreencastV1Interface *m_screencast;
};

64
src/plugins/screencast/pipewirestream.cpp → src/plugins/screencast/screencaststream.cpp
View file

@ -6,7 +6,7 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "pipewirestream.h"
#include "screencaststream.h"
#include "cursor.h"
#include "dmabuftexture.h"
#include "eglnativefence.h"
@ -36,9 +36,9 @@
namespace KWin
{
void PipeWireStream::onStreamStateChanged(void *data, pw_stream_state old, pw_stream_state state, const char *error_message)
void ScreenCastStream::onStreamStateChanged(void *data, pw_stream_state old, pw_stream_state state, const char *error_message)
{
PipeWireStream *pw = static_cast<PipeWireStream*>(data);
ScreenCastStream *pw = static_cast<ScreenCastStream*>(data);
qCDebug(KWIN_SCREENCAST) << "state changed"<< pw_stream_state_as_string(old) << " -> " << pw_stream_state_as_string(state) << error_message;
switch (state) {
@ -69,7 +69,7 @@ void PipeWireStream::onStreamStateChanged(void *data, pw_stream_state old, pw_st
sizeof(struct spa_meta_bitmap) + w * h * CURSOR_BPP)
static const int videoDamageRegionCount = 16;
void PipeWireStream::newStreamParams()
void ScreenCastStream::newStreamParams()
{
const int bpp = videoFormat.format == SPA_VIDEO_FORMAT_RGB || videoFormat.format == SPA_VIDEO_FORMAT_BGR ? 3 : 4;
auto stride = SPA_ROUND_UP_N (m_resolution.width() * bpp, 4);
@ -114,13 +114,13 @@ void PipeWireStream::newStreamParams()
pw_stream_update_params(pwStream, params, 3);
}
void PipeWireStream::onStreamParamChanged(void *data, uint32_t id, const struct spa_pod *format)
void ScreenCastStream::onStreamParamChanged(void *data, uint32_t id, const struct spa_pod *format)
{
if (!format || id != SPA_PARAM_Format) {
return;
}
PipeWireStream *pw = static_cast<PipeWireStream *>(data);
ScreenCastStream *pw = static_cast<ScreenCastStream *>(data);
spa_format_video_raw_parse (format, &pw->videoFormat);
// TODO[explicit_modifiers]: check if modifier list or single modifier,
// make test allocation, fixate format, ...
@ -130,10 +130,10 @@ void PipeWireStream::onStreamParamChanged(void *data, uint32_t id, const struct
pw->newStreamParams();
}
void PipeWireStream::onStreamAddBuffer(void *data, pw_buffer *buffer)
void ScreenCastStream::onStreamAddBuffer(void *data, pw_buffer *buffer)
{
QSharedPointer<DmaBufTexture> dmabuf;
PipeWireStream *stream = static_cast<PipeWireStream *>(data);
ScreenCastStream *stream = static_cast<ScreenCastStream *>(data);
struct spa_data *spa_data = buffer->buffer->datas;
spa_data->mapoffset = 0;
@ -190,9 +190,9 @@ void PipeWireStream::onStreamAddBuffer(void *data, pw_buffer *buffer)
}
}
void PipeWireStream::onStreamRemoveBuffer(void *data, pw_buffer *buffer)
void ScreenCastStream::onStreamRemoveBuffer(void *data, pw_buffer *buffer)
{
PipeWireStream *stream = static_cast<PipeWireStream *>(data);
ScreenCastStream *stream = static_cast<ScreenCastStream *>(data);
stream->m_dmabufDataForPwBuffer.remove(buffer);
struct spa_buffer *spa_buffer = buffer->buffer;
@ -203,21 +203,21 @@ void PipeWireStream::onStreamRemoveBuffer(void *data, pw_buffer *buffer)
}
}
PipeWireStream::PipeWireStream(ScreenCastSource *source, QObject *parent)
ScreenCastStream::ScreenCastStream(ScreenCastSource *source, QObject *parent)
: QObject(parent)
, m_source(source)
, m_resolution(source->textureSize())
{
connect(source, &ScreenCastSource::closed, this, &PipeWireStream::stopStreaming);
connect(source, &ScreenCastSource::closed, this, &ScreenCastStream::stopStreaming);
pwStreamEvents.version = PW_VERSION_STREAM_EVENTS;
pwStreamEvents.add_buffer = &PipeWireStream::onStreamAddBuffer;
pwStreamEvents.remove_buffer = &PipeWireStream::onStreamRemoveBuffer;
pwStreamEvents.state_changed = &PipeWireStream::onStreamStateChanged;
pwStreamEvents.param_changed = &PipeWireStream::onStreamParamChanged;
pwStreamEvents.add_buffer = &ScreenCastStream::onStreamAddBuffer;
pwStreamEvents.remove_buffer = &ScreenCastStream::onStreamRemoveBuffer;
pwStreamEvents.state_changed = &ScreenCastStream::onStreamStateChanged;
pwStreamEvents.param_changed = &ScreenCastStream::onStreamParamChanged;
}
PipeWireStream::~PipeWireStream()
ScreenCastStream::~ScreenCastStream()
{
m_stopped = true;
if (pwStream) {
@ -225,7 +225,7 @@ PipeWireStream::~PipeWireStream()
}
}
bool PipeWireStream::init()
bool ScreenCastStream::init()
{
pwCore = PipeWireCore::self();
if (!pwCore->m_error.isEmpty()) {
@ -233,7 +233,7 @@ bool PipeWireStream::init()
return false;
}
connect(pwCore.data(), &PipeWireCore::pipewireFailed, this, &PipeWireStream::coreFailed);
connect(pwCore.data(), &PipeWireCore::pipewireFailed, this, &ScreenCastStream::coreFailed);
if (!createStream()) {
qCWarning(KWIN_SCREENCAST) << "Failed to create PipeWire stream";
@ -244,7 +244,7 @@ bool PipeWireStream::init()
return true;
}
uint PipeWireStream::framerate()
uint ScreenCastStream::framerate()
{
if (pwStream) {
return videoFormat.max_framerate.num / videoFormat.max_framerate.denom;
@ -253,12 +253,12 @@ uint PipeWireStream::framerate()
return 0;
}
uint PipeWireStream::nodeId()
uint ScreenCastStream::nodeId()
{
return pwNodeId;
}
bool PipeWireStream::createStream()
bool ScreenCastStream::createStream()
{
const QByteArray objname = "kwin-screencast-" + objectName().toUtf8();
pwStream = pw_stream_new(pwCore->pwCore, objname, nullptr);
@ -309,19 +309,19 @@ bool PipeWireStream::createStream()
return true;
}
void PipeWireStream::coreFailed(const QString &errorMessage)
void ScreenCastStream::coreFailed(const QString &errorMessage)
{
m_error = errorMessage;
Q_EMIT stopStreaming();
}
void PipeWireStream::stop()
void ScreenCastStream::stop()
{
m_stopped = true;
delete this;
}
void PipeWireStream::recordFrame(const QRegion &damagedRegion)
void ScreenCastStream::recordFrame(const QRegion &damagedRegion)
{
Q_ASSERT(!m_stopped);
@ -458,7 +458,7 @@ void PipeWireStream::recordFrame(const QRegion &damagedRegion)
tryEnqueue(buffer);
}
void PipeWireStream::tryEnqueue(pw_buffer *buffer)
void ScreenCastStream::tryEnqueue(pw_buffer *buffer)
{
m_pendingBuffer = buffer;
@ -476,7 +476,7 @@ void PipeWireStream::tryEnqueue(pw_buffer *buffer)
} else {
m_pendingNotifier = new QSocketNotifier(m_pendingFence->fileDescriptor(),
QSocketNotifier::Read, this);
connect(m_pendingNotifier, &QSocketNotifier::activated, this, &PipeWireStream::enqueue);
connect(m_pendingNotifier, &QSocketNotifier::activated, this, &ScreenCastStream::enqueue);
}
} else {
// The compositing backend doesn't support native fences. We don't have any other choice
@ -486,7 +486,7 @@ void PipeWireStream::tryEnqueue(pw_buffer *buffer)
}
}
void PipeWireStream::enqueue()
void ScreenCastStream::enqueue()
{
Q_ASSERT_X(m_pendingBuffer, "enqueue", "pending buffer must be valid");
@ -500,7 +500,7 @@ void PipeWireStream::enqueue()
m_pendingNotifier = nullptr;
}
spa_pod *PipeWireStream::buildFormat(struct spa_pod_builder *b, enum spa_video_format format, struct spa_rectangle *resolution,
spa_pod *ScreenCastStream::buildFormat(struct spa_pod_builder *b, enum spa_video_format format, struct spa_rectangle *resolution,
struct spa_fraction *defaultFramerate, struct spa_fraction *minFramerate, struct spa_fraction *maxFramerate,
uint64_t *modifiers, int modifierCount)
{
@ -551,13 +551,13 @@ spa_pod *PipeWireStream::buildFormat(struct spa_pod_builder *b, enum spa_video_f
return (spa_pod*)spa_pod_builder_pop(b, &f[0]);
}
QRect PipeWireStream::cursorGeometry(Cursor *cursor) const
QRect ScreenCastStream::cursorGeometry(Cursor *cursor) const
{
const auto position = (cursor->pos() - m_cursor.viewport.topLeft() - cursor->hotspot()) * m_cursor.scale;
return QRect{position, m_cursor.texture->size()};
}
void PipeWireStream::sendCursorData(Cursor *cursor, spa_meta_cursor *spa_meta_cursor)
void ScreenCastStream::sendCursorData(Cursor *cursor, spa_meta_cursor *spa_meta_cursor)
{
if (!cursor || !spa_meta_cursor || !m_cursor.viewport.contains(cursor->pos())) {
return;
@ -602,7 +602,7 @@ void PipeWireStream::sendCursorData(Cursor *cursor, spa_meta_cursor *spa_meta_cu
painter.drawImage(QPoint(), image);
}
void PipeWireStream::setCursorMode(KWaylandServer::ScreencastV1Interface::CursorMode mode, qreal scale, const QRect &viewport)
void ScreenCastStream::setCursorMode(KWaylandServer::ScreencastV1Interface::CursorMode mode, qreal scale, const QRect &viewport)
{
m_cursor.mode = mode;
m_cursor.scale = scale;

6
src/plugins/screencast/pipewirestream.h → src/plugins/screencast/screencaststream.h
View file

@ -34,12 +34,12 @@ class GLTexture;
class PipeWireCore;
class ScreenCastSource;
class KWIN_EXPORT PipeWireStream : public QObject
class KWIN_EXPORT ScreenCastStream : public QObject
{
Q_OBJECT
public:
explicit PipeWireStream(ScreenCastSource *source, QObject *parent);
~PipeWireStream();
explicit ScreenCastStream(ScreenCastSource *source, QObject *parent);
~ScreenCastStream();
bool init();
uint framerate();