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

plugins/screencast: Specify the effective drm format

Browse source 
Currently, the dmabuf format is hardcoded to DRM_FORMAT_ARGB8888, but
testCreateDmabuf() uses m_drmFormat.

Furthermore, if the shm buffers are used, it's preferred to use a buffer
format that's friendly to QImage and OpenGL, which is DRM_FORMAT_ARGB8888.
This commit is contained in:
Vlad Zahorodnii 2024-05-15 12:37:33 +03:00
parent 54f7079100
commit 7710b44f1d
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -618,7 +618,9 @@ void ScreenCastStream::invalidateCursor()
QList<const spa_pod *> ScreenCastStream::buildFormats(bool fixate, char buffer[2048])
{
const auto format = drmFormatToSpaVideoFormat(m_drmFormat);
const auto dmabufFormat = drmFormatToSpaVideoFormat(m_drmFormat);
const auto shmFormat = drmFormatToSpaVideoFormat(DRM_FORMAT_ARGB8888);
spa_pod_builder podBuilder = SPA_POD_BUILDER_INIT(buffer, 2048);
spa_fraction defFramerate = SPA_FRACTION(0, 1);
spa_fraction minFramerate = SPA_FRACTION(1, 1);
@ -629,12 +631,12 @@ QList<const spa_pod *> ScreenCastStream::buildFormats(bool fixate, char buffer[2
QList<const spa_pod *> params;
params.reserve(fixate + m_hasDmaBuf + 1);
if (fixate) {
params.append(buildFormat(&podBuilder, SPA_VIDEO_FORMAT_BGRA, &resolution, &defFramerate, &minFramerate, &maxFramerate, {m_dmabufParams->modifier}, SPA_POD_PROP_FLAG_MANDATORY));
params.append(buildFormat(&podBuilder, dmabufFormat, &resolution, &defFramerate, &minFramerate, &maxFramerate, {m_dmabufParams->modifier}, SPA_POD_PROP_FLAG_MANDATORY));
}
if (m_hasDmaBuf) {
params.append(buildFormat(&podBuilder, SPA_VIDEO_FORMAT_BGRA, &resolution, &defFramerate, &minFramerate, &maxFramerate, m_modifiers, SPA_POD_PROP_FLAG_MANDATORY | SPA_POD_PROP_FLAG_DONT_FIXATE));
params.append(buildFormat(&podBuilder, dmabufFormat, &resolution, &defFramerate, &minFramerate, &maxFramerate, m_modifiers, SPA_POD_PROP_FLAG_MANDATORY | SPA_POD_PROP_FLAG_DONT_FIXATE));
}
params.append(buildFormat(&podBuilder, format, &resolution, &defFramerate, &minFramerate, &maxFramerate, {}, 0));
params.append(buildFormat(&podBuilder, shmFormat, &resolution, &defFramerate, &minFramerate, &maxFramerate, {}, 0));
return params;
}