From 108dda7a90bd0f0337358b0db47ae55acd16dea6 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Thu, 20 Nov 2014 17:54:18 +0100 Subject: GStreamer: port to 1.0. 0.10 is still used by default. To enable GStreamer 1.0, pass GST_VERSION=1.0 to qmake for qtmultimedia.pro. Contributions from: Andrew den Exter Ilya Smelykh Jim Hodapp Sergio Schvezov Change-Id: I72a46d1170a8794a149bdb5e20767afcc5b7587c Reviewed-by: Andrew den Exter --- src/gsttools/qgstvideobuffer.cpp | 70 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 3 deletions(-) (limited to 'src/gsttools/qgstvideobuffer.cpp') diff --git a/src/gsttools/qgstvideobuffer.cpp b/src/gsttools/qgstvideobuffer.cpp index 18702ec76..1ce07ca12 100644 --- a/src/gsttools/qgstvideobuffer.cpp +++ b/src/gsttools/qgstvideobuffer.cpp @@ -35,21 +35,35 @@ QT_BEGIN_NAMESPACE +#if GST_CHECK_VERSION(1,0,0) +QGstVideoBuffer::QGstVideoBuffer(GstBuffer *buffer, const GstVideoInfo &info) + : QAbstractPlanarVideoBuffer(NoHandle) + , m_videoInfo(info) +#else QGstVideoBuffer::QGstVideoBuffer(GstBuffer *buffer, int bytesPerLine) : QAbstractVideoBuffer(NoHandle) - , m_buffer(buffer) , m_bytesPerLine(bytesPerLine) +#endif + , m_buffer(buffer) , m_mode(NotMapped) { gst_buffer_ref(m_buffer); } +#if GST_CHECK_VERSION(1,0,0) +QGstVideoBuffer::QGstVideoBuffer(GstBuffer *buffer, const GstVideoInfo &info, + QGstVideoBuffer::HandleType handleType, + const QVariant &handle) + : QAbstractPlanarVideoBuffer(handleType) + , m_videoInfo(info) +#else QGstVideoBuffer::QGstVideoBuffer(GstBuffer *buffer, int bytesPerLine, QGstVideoBuffer::HandleType handleType, const QVariant &handle) : QAbstractVideoBuffer(handleType) - , m_buffer(buffer) , m_bytesPerLine(bytesPerLine) +#endif + , m_buffer(buffer) , m_mode(NotMapped) , m_handle(handle) { @@ -58,6 +72,8 @@ QGstVideoBuffer::QGstVideoBuffer(GstBuffer *buffer, int bytesPerLine, QGstVideoBuffer::~QGstVideoBuffer() { + unmap(); + gst_buffer_unref(m_buffer); } @@ -67,12 +83,49 @@ QAbstractVideoBuffer::MapMode QGstVideoBuffer::mapMode() const return m_mode; } +#if GST_CHECK_VERSION(1,0,0) + +int QGstVideoBuffer::map(MapMode mode, int *numBytes, int bytesPerLine[4], uchar *data[4]) +{ + const GstMapFlags flags = GstMapFlags(((mode & ReadOnly) ? GST_MAP_READ : 0) + | ((mode & WriteOnly) ? GST_MAP_WRITE : 0)); + + if (mode == NotMapped || m_mode != NotMapped) { + return 0; + } else if (m_videoInfo.finfo->n_planes == 0) { // Encoded + if (gst_buffer_map(m_buffer, &m_frame.map[0], flags)) { + if (numBytes) + *numBytes = m_frame.map[0].size; + bytesPerLine[0] = -1; + data[0] = static_cast(m_frame.map[0].data); + + m_mode = mode; + + return 1; + } + } else if (gst_video_frame_map(&m_frame, &m_videoInfo, m_buffer, flags)) { + if (numBytes) + *numBytes = m_frame.info.size; + + for (guint i = 0; i < m_frame.info.finfo->n_planes; ++i) { + bytesPerLine[i] = m_frame.info.stride[i]; + data[i] = static_cast(m_frame.data[i]); + } + + m_mode = mode; + + return m_frame.info.finfo->n_planes; + } + return 0; +} + +#else + uchar *QGstVideoBuffer::map(MapMode mode, int *numBytes, int *bytesPerLine) { if (mode != NotMapped && m_mode == NotMapped) { if (numBytes) *numBytes = m_buffer->size; - if (bytesPerLine) *bytesPerLine = m_bytesPerLine; @@ -83,8 +136,19 @@ uchar *QGstVideoBuffer::map(MapMode mode, int *numBytes, int *bytesPerLine) return 0; } } + +#endif + void QGstVideoBuffer::unmap() { +#if GST_CHECK_VERSION(1,0,0) + if (m_mode != NotMapped) { + if (m_videoInfo.finfo->n_planes == 0) + gst_buffer_unmap(m_buffer, &m_frame.map[0]); + else + gst_video_frame_unmap(&m_frame); + } +#endif m_mode = NotMapped; } -- cgit v1.2.3