Skip to content
Snippets Groups Projects
Commit f462eeba authored by Guillaume Roguez's avatar Guillaume Roguez
Browse files

video: missing fixes to renderer

Refs #70057
parent 435cf9e6
No related branches found
No related tags found
No related merge requests found
...@@ -141,9 +141,7 @@ Video::ShmRendererPrivate::renderToBitmap() ...@@ -141,9 +141,7 @@ Video::ShmRendererPrivate::renderToBitmap()
QMutexLocker locker {q_ptr->mutex()}; QMutexLocker locker {q_ptr->mutex()};
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
auto& renderer = static_cast<Video::Renderer*>(q_ptr)->d_ptr; if (!q_ptr->isRendering())
auto& frame = renderer->otherFrame();
if (frame.isEmpty())
return false; return false;
if (!shmLock()) if (!shmLock())
...@@ -170,6 +168,8 @@ Video::ShmRendererPrivate::renderToBitmap() ...@@ -170,6 +168,8 @@ Video::ShmRendererPrivate::renderToBitmap()
return false; return false;
} }
auto& renderer = static_cast<Video::Renderer*>(q_ptr)->d_ptr;
auto& frame = renderer->otherFrame();
if ((unsigned)frame.size() != m_pShmArea->frameSize) if ((unsigned)frame.size() != m_pShmArea->frameSize)
frame.resize(m_pShmArea->frameSize); frame.resize(m_pShmArea->frameSize);
std::copy_n(m_pShmArea->data + m_pShmArea->readOffset, m_pShmArea->frameSize, frame.data()); std::copy_n(m_pShmArea->data + m_pShmArea->readOffset, m_pShmArea->frameSize, frame.data());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment