diff options
Diffstat (limited to 'src/plugins/multimedia/gstreamer/common/qgstsubtitlesink.cpp')
| -rw-r--r-- | src/plugins/multimedia/gstreamer/common/qgstsubtitlesink.cpp | 111 |
1 files changed, 37 insertions, 74 deletions
diff --git a/src/plugins/multimedia/gstreamer/common/qgstsubtitlesink.cpp b/src/plugins/multimedia/gstreamer/common/qgstsubtitlesink.cpp index d9b76d57f..c6b230d85 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstsubtitlesink.cpp +++ b/src/plugins/multimedia/gstreamer/common/qgstsubtitlesink.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <QDebug> #include <QThread> @@ -43,18 +7,17 @@ #include "qgstreamervideosink_p.h" #include "qgstsubtitlesink_p.h" -#include "qgstutils_p.h" QT_BEGIN_NAMESPACE -static GstBaseSinkClass *sink_parent_class; -static thread_local QGstreamerVideoSink *current_sink; +static GstBaseSinkClass *gst_sink_parent_class; +static thread_local QGstreamerVideoSink *gst_current_sink; #define ST_SINK(s) QGstSubtitleSink *sink(reinterpret_cast<QGstSubtitleSink *>(s)) QGstSubtitleSink *QGstSubtitleSink::createSink(QGstreamerVideoSink *sink) { - current_sink = sink; + gst_current_sink = sink; QGstSubtitleSink *gstSink = reinterpret_cast<QGstSubtitleSink *>( g_object_new(QGstSubtitleSink::get_type(), nullptr)); @@ -65,30 +28,30 @@ QGstSubtitleSink *QGstSubtitleSink::createSink(QGstreamerVideoSink *sink) GType QGstSubtitleSink::get_type() { - static GType type = 0; - - if (type == 0) { - static const GTypeInfo info = - { - sizeof(QGstSubtitleSinkClass), // class_size - base_init, // base_init - nullptr, // base_finalize - class_init, // class_init - nullptr, // class_finalize - nullptr, // class_data - sizeof(QGstSubtitleSink), // instance_size - 0, // n_preallocs - instance_init, // instance_init - nullptr // value_table - }; - - type = g_type_register_static( + static const GTypeInfo info = + { + sizeof(QGstSubtitleSinkClass), // class_size + base_init, // base_init + nullptr, // base_finalize + class_init, // class_init + nullptr, // class_finalize + nullptr, // class_data + sizeof(QGstSubtitleSink), // instance_size + 0, // n_preallocs + instance_init, // instance_init + nullptr // value_table + }; + + static const GType type = []() { + const auto result = g_type_register_static( GST_TYPE_BASE_SINK, "QGstSubtitleSink", &info, GTypeFlags(0)); // Register the sink type to be used in custom piplines. // When surface is ready the sink can be used. - gst_element_register(nullptr, "qtsubtitlesink", GST_RANK_PRIMARY, type); - } + gst_element_register(nullptr, "qtsubtitlesink", GST_RANK_PRIMARY, result); + + return result; + }(); return type; } @@ -97,7 +60,7 @@ void QGstSubtitleSink::class_init(gpointer g_class, gpointer class_data) { Q_UNUSED(class_data); - sink_parent_class = reinterpret_cast<GstBaseSinkClass *>(g_type_class_peek_parent(g_class)); + gst_sink_parent_class = reinterpret_cast<GstBaseSinkClass *>(g_type_class_peek_parent(g_class)); GstBaseSinkClass *base_sink_class = reinterpret_cast<GstBaseSinkClass *>(g_class); base_sink_class->render = QGstSubtitleSink::render; @@ -132,41 +95,41 @@ void QGstSubtitleSink::instance_init(GTypeInstance *instance, gpointer g_class) Q_UNUSED(g_class); ST_SINK(instance); - Q_ASSERT(current_sink); - sink->sink = current_sink; - current_sink = nullptr; + Q_ASSERT(gst_current_sink); + sink->sink = gst_current_sink; + gst_current_sink = nullptr; } void QGstSubtitleSink::finalize(GObject *object) { // Chain up - G_OBJECT_CLASS(sink_parent_class)->finalize(object); + G_OBJECT_CLASS(gst_sink_parent_class)->finalize(object); } GstStateChangeReturn QGstSubtitleSink::change_state(GstElement *element, GstStateChange transition) { - return GST_ELEMENT_CLASS(sink_parent_class)->change_state(element, transition); + return GST_ELEMENT_CLASS(gst_sink_parent_class)->change_state(element, transition); } GstCaps *QGstSubtitleSink::get_caps(GstBaseSink *base, GstCaps *filter) { - return sink_parent_class->get_caps(base, filter); + return gst_sink_parent_class->get_caps(base, filter); } gboolean QGstSubtitleSink::set_caps(GstBaseSink *base, GstCaps *caps) { - qDebug() << "set_caps:" << QGstCaps(caps).toString(); - return sink_parent_class->set_caps(base, caps); + qDebug() << "set_caps:" << caps; + return gst_sink_parent_class->set_caps(base, caps); } gboolean QGstSubtitleSink::propose_allocation(GstBaseSink *base, GstQuery *query) { - return sink_parent_class->propose_allocation(base, query); + return gst_sink_parent_class->propose_allocation(base, query); } GstFlowReturn QGstSubtitleSink::wait_event(GstBaseSink *base, GstEvent *event) { - GstFlowReturn retval = sink_parent_class->wait_event(base, event); + GstFlowReturn retval = gst_sink_parent_class->wait_event(base, event); ST_SINK(base); if (event->type == GST_EVENT_GAP) { // qDebug() << "gap, clearing subtitle"; @@ -182,7 +145,7 @@ GstFlowReturn QGstSubtitleSink::render(GstBaseSink *base, GstBuffer *buffer) GstMapInfo info; QString subtitle; if (gst_memory_map(mem, &info, GST_MAP_READ)) - subtitle = QString::fromUtf8(info.data); + subtitle = QString::fromUtf8(reinterpret_cast<const char *>(info.data)); gst_memory_unmap(mem, &info); // qDebug() << "render" << buffer << subtitle; sink->sink->setSubtitleText(subtitle); |