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

screencasting: Have cursor move frames also send damage information

Browse source 
Otherwise we keep the last use of the buffer's which is clearly wrong.
This commit is contained in:
Aleix Pol 2022-06-28 00:02:56 +02:00 committed by Xaver Hugl
parent 7f73264f66
commit a2913d1e2b
2 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/plugins/screencast/screencaststream.cpp
View file

@ -464,7 +464,30 @@ void ScreenCastStream::recordFrame(const QRegion &damagedRegion)
(spa_meta_cursor *)spa_buffer_find_meta_data(spa_buffer, SPA_META_Cursor, sizeof(spa_meta_cursor))); (spa_meta_cursor *)spa_buffer_find_meta_data(spa_buffer, SPA_META_Cursor, sizeof(spa_meta_cursor)));
} }
if (spa_meta *vdMeta = spa_buffer_find_meta(spa_buffer, SPA_META_VideoDamage)) { addDamage(spa_buffer, damagedRegion | QRect({0, 0}, size));
addHeader(spa_buffer);
tryEnqueue(buffer);
}
void ScreenCastStream::addHeader(spa_buffer *spaBuffer)
{
spa_meta_header *spaHeader = (spa_meta_header *)spa_buffer_find_meta_data(spaBuffer, SPA_META_Header, sizeof(spaHeader));
if (spaHeader) {
spaHeader->flags = 0;
spaHeader->dts_offset = 0;
spaHeader->seq = m_sequential++;
const auto timestamp = m_source->clock();
if (!m_start) {
m_start = timestamp;
}
spaHeader->pts = (timestamp - m_start.value()).count();
}
}
void ScreenCastStream::addDamage(spa_buffer *spaBuffer, const QRegion &damagedRegion)
{
if (spa_meta *vdMeta = spa_buffer_find_meta(spaBuffer, SPA_META_VideoDamage)) {
struct spa_meta_region *r = (spa_meta_region *)spa_meta_first(vdMeta); struct spa_meta_region *r = (spa_meta_region *)spa_meta_first(vdMeta);
// If there's too many rectangles, we just send the bounding rect // If there's too many rectangles, we just send the bounding rect
@ -487,25 +510,6 @@ void ScreenCastStream::recordFrame(const QRegion &damagedRegion)
r->region = SPA_REGION(0, 0, 0, 0); r->region = SPA_REGION(0, 0, 0, 0);
} }
} }
addHeader(spa_buffer);
tryEnqueue(buffer);
}
void ScreenCastStream::addHeader(spa_buffer *spaBuffer)
{
spa_meta_header *spaHeader = (spa_meta_header *)spa_buffer_find_meta_data(spaBuffer, SPA_META_Header, sizeof(spaHeader));
if (spaHeader) {
spaHeader->flags = 0;
spaHeader->dts_offset = 0;
spaHeader->seq = m_sequential++;
const auto timestamp = m_source->clock();
if (!m_start) {
m_start = timestamp;
}
spaHeader->pts = (timestamp - m_start.value()).count();
}
} }
void ScreenCastStream::recordCursor() void ScreenCastStream::recordCursor()
@ -536,6 +540,7 @@ void ScreenCastStream::recordCursor()
sendCursorData(Cursors::self()->currentCursor(), sendCursorData(Cursors::self()->currentCursor(),
(spa_meta_cursor *)spa_buffer_find_meta_data(spa_buffer, SPA_META_Cursor, sizeof(spa_meta_cursor))); (spa_meta_cursor *)spa_buffer_find_meta_data(spa_buffer, SPA_META_Cursor, sizeof(spa_meta_cursor)));
addHeader(spa_buffer); addHeader(spa_buffer);
addDamage(spa_buffer, {});
enqueue(); enqueue();
} }

1
src/plugins/screencast/screencaststream.h
View file

@ -81,6 +81,7 @@ private:
void coreFailed(const QString &errorMessage); void coreFailed(const QString &errorMessage);
void sendCursorData(Cursor *cursor, spa_meta_cursor *spa_cursor); void sendCursorData(Cursor *cursor, spa_meta_cursor *spa_cursor);
void addHeader(spa_buffer *spaBuffer); void addHeader(spa_buffer *spaBuffer);
void addDamage(spa_buffer *spaBuffer, const QRegion &damagedRegion);
void newStreamParams(); void newStreamParams();
void tryEnqueue(pw_buffer *buffer); void tryEnqueue(pw_buffer *buffer);
void enqueue(); void enqueue();