summaryrefslogtreecommitdiffstats
path: root/src/multimedia/video/qvideoframe.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-03-24 21:37:55 +0100
committerLars Knoll <lars.knoll@qt.io>2021-04-07 12:24:44 +0000
commit9e90ac3ce400df30217de98f0eb4e08f75e06cdf (patch)
treedf5844843df9785c69d970e2976a8762b1f165ef /src/multimedia/video/qvideoframe.cpp
parent3769db3e753bcb4bb8cd76d71a1ab148cb3fccbb (diff)
More work to enable HW decoding for Qt Quick
Request GL textures from the pipeline for now. Some initial code to also use the texture upload meta functionality in gstreamer, but that will require some more work so we don't make the GL context current in the wrong thread. The gstreamer VAAPI elements on AMD hardware (or in general...) seem to have some bugs. Converting a VASurface to a GL texture using the texture upload meta doesn't create an ARGB texture as promised, but does write some YUV data into the texture. And trying to map a SW buffer received from the VAAPI decoders fails. Change-Id: I9b629eb84f3f32adc23ae2e2fd1cd3e42e6afbc0 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/video/qvideoframe.cpp')
-rw-r--r--src/multimedia/video/qvideoframe.cpp16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp
index 375f19930..2fa5f9f88 100644
--- a/src/multimedia/video/qvideoframe.cpp
+++ b/src/multimedia/video/qvideoframe.cpp
@@ -808,21 +808,13 @@ int QVideoFrame::planeCount() const
return d->format.nPlanes();
}
-quint64 QVideoFrame::textureHandle(int plane)
-{
- return d->buffer->textureHandle(plane);
-}
-
/*!
- Returns a type specific handle to a video frame's buffer.
-
- For an OpenGL texture this would be the texture ID.
-
- \sa QAbstractVideoBuffer::handle()
+ \internal
+ Returns a texture id to the video frame's buffers.
*/
-QVariant QVideoFrame::handle() const
+quint64 QVideoFrame::textureHandle(int plane)
{
- return d->buffer != nullptr ? d->buffer->handle() : QVariant();
+ return d->buffer->textureHandle(plane);
}
/*!