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

screencasting: Make sure we are reporting properly scaled damage values

Browse source 
It should be in stream pixels rather than logical
This commit is contained in:
Aleix Pol 2022-11-02 20:06:00 +01:00
parent ea4741cbcc
commit 6ab6d3124a
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,6 +34,10 @@ public:
{
return m_region;
}
qreal scale() const
{
return m_scale;
}
void updateOutput(Output *output);
private:

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

@ -38,6 +38,23 @@ ScreencastManager::ScreencastManager()
connect(m_screencast, &KWaylandServer::ScreencastV1Interface::regionScreencastRequested, this, &ScreencastManager::streamRegion);
}
static QRegion scaleRegion(const QRegion &_region, qreal scale)
{
if (scale == 1.) {
return _region;
}
QRegion region;
for (auto it = _region.begin(), itEnd = _region.end(); it != itEnd; ++it) {
region += QRect(std::floor(it->x() * scale),
std::floor(it->y() * scale),
std::ceil(it->width() * scale),
std::ceil(it->height() * scale));
}
return region;
}
class WindowStream : public ScreenCastStream
{
public:
@ -136,9 +153,9 @@ void ScreencastManager::streamOutput(KWaylandServer::ScreencastStreamV1Interface
auto stream = new ScreenCastStream(new OutputScreenCastSource(streamOutput), this);
stream->setObjectName(streamOutput->name());
stream->setCursorMode(mode, streamOutput->scale(), streamOutput->geometry());
auto bufferToStream = [stream](const QRegion &damagedRegion) {
auto bufferToStream = [stream, streamOutput](const QRegion &damagedRegion) {
if (!damagedRegion.isEmpty()) {
stream->recordFrame(damagedRegion);
stream->recordFrame(scaleRegion(damagedRegion, streamOutput->scale()));
}
};
connect(stream, &ScreenCastStream::startStreaming, waylandStream, [streamOutput, stream, bufferToStream] {
@ -179,7 +196,7 @@ void ScreencastManager::streamRegion(KWaylandServer::ScreencastStreamV1Interface
const QRect streamRegion = source->region();
const QRegion region = output->pixelSize() != output->modeSize() ? output->geometry() : damagedRegion;
source->updateOutput(output);
stream->recordFrame(region.translated(-streamRegion.topLeft()).intersected(streamRegion));
stream->recordFrame(scaleRegion(region.translated(-streamRegion.topLeft()).intersected(streamRegion), source->scale()));
};
connect(output, &Output::outputChange, stream, bufferToStream);
}