summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-02-13 17:29:26 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-02-15 07:48:53 +0000
commitc77d8a7b9ee961d50b1555d3e43a4789909ea0ef (patch)
tree07bde01c055dc5c4faa96fe1d579039586dc94ac
parent705a76e8dce924a72153b0fb75880a1eeb65652e (diff)
downloadqtmultimedia-c77d8a7b9ee961d50b1555d3e43a4789909ea0ef.tar.gz
Disambiguate static constants, variables and functions
They cause clashes in CMake Unity (Jumbo) builds. Task-number: QTBUG-109394 Change-Id: I856ed6b5f511299845a49f989ccd74a3e5480e44 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Doris Verria <doris.verria@qt.io> (cherry picked from commit 75bc388bb936890e182e3bf13dd23d557467780f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/multimedia/platform/qplatformmediadevices.cpp34
-rw-r--r--src/multimedia/platform/qplatformmediaintegration.cpp26
-rw-r--r--src/multimedia/pulseaudio/qpulseaudiosink.cpp4
-rw-r--r--src/multimedia/pulseaudio/qpulseaudiosource.cpp6
-rw-r--r--src/multimedia/video/qvideoframeconverter.cpp6
-rw-r--r--src/multimedia/video/qvideowindow.cpp12
-rw-r--r--src/plugins/multimedia/gstreamer/common/qgstsubtitlesink.cpp26
-rw-r--r--src/plugins/multimedia/gstreamer/common/qgstvideorenderersink.cpp24
8 files changed, 69 insertions, 69 deletions
diff --git a/src/multimedia/platform/qplatformmediadevices.cpp b/src/multimedia/platform/qplatformmediadevices.cpp
index 6944e8ca1..03f1af75e 100644
--- a/src/multimedia/platform/qplatformmediadevices.cpp
+++ b/src/multimedia/platform/qplatformmediadevices.cpp
@@ -31,8 +31,8 @@
QT_BEGIN_NAMESPACE
namespace {
-struct Holder {
- ~Holder()
+struct DevicesHolder {
+ ~DevicesHolder()
{
QMutexLocker locker(&mutex);
delete nativeInstance;
@@ -42,36 +42,36 @@ struct Holder {
QBasicMutex mutex;
QPlatformMediaDevices *instance = nullptr;
QPlatformMediaDevices *nativeInstance = nullptr;
-} holder;
+} devicesHolder;
}
QPlatformMediaDevices *QPlatformMediaDevices::instance()
{
- QMutexLocker locker(&holder.mutex);
- if (holder.instance)
- return holder.instance;
+ QMutexLocker locker(&devicesHolder.mutex);
+ if (devicesHolder.instance)
+ return devicesHolder.instance;
#ifdef Q_OS_DARWIN
- holder.nativeInstance = new QDarwinMediaDevices;
+ devicesHolder.nativeInstance = new QDarwinMediaDevices;
#elif defined(Q_OS_WINDOWS)
- holder.nativeInstance = new QWindowsMediaDevices;
+ devicesHolder.nativeInstance = new QWindowsMediaDevices;
#elif defined(Q_OS_ANDROID)
- holder.nativeInstance = new QAndroidMediaDevices;
+ devicesHolder.nativeInstance = new QAndroidMediaDevices;
#elif QT_CONFIG(alsa)
- holder.nativeInstance = new QAlsaMediaDevices;
+ devicesHolder.nativeInstance = new QAlsaMediaDevices;
#elif QT_CONFIG(pulseaudio)
- holder.nativeInstance = new QPulseAudioMediaDevices;
+ devicesHolder.nativeInstance = new QPulseAudioMediaDevices;
#elif defined(Q_OS_QNX)
- holder.nativeInstance = new QQnxMediaDevices;
+ devicesHolder.nativeInstance = new QQnxMediaDevices;
#elif defined(Q_OS_WASM)
- holder.nativeInstance = new QWasmMediaDevices;
+ devicesHolder.nativeInstance = new QWasmMediaDevices;
#else
- holder.nativeInstance = new QPlatformMediaDevices;
+ devicesHolder.nativeInstance = new QPlatformMediaDevices;
#endif
- holder.instance = holder.nativeInstance;
- return holder.instance;
+ devicesHolder.instance = devicesHolder.nativeInstance;
+ return devicesHolder.instance;
}
@@ -80,7 +80,7 @@ QPlatformMediaDevices::QPlatformMediaDevices()
void QPlatformMediaDevices::setDevices(QPlatformMediaDevices *devices)
{
- holder.instance = devices;
+ devicesHolder.instance = devices;
}
QPlatformMediaDevices::~QPlatformMediaDevices() = default;
diff --git a/src/multimedia/platform/qplatformmediaintegration.cpp b/src/multimedia/platform/qplatformmediaintegration.cpp
index b85a74345..75eee37d4 100644
--- a/src/multimedia/platform/qplatformmediaintegration.cpp
+++ b/src/multimedia/platform/qplatformmediaintegration.cpp
@@ -64,8 +64,8 @@ static QString defaultBackend(const QStringList &backends)
QT_BEGIN_NAMESPACE
namespace {
-struct Holder {
- ~Holder()
+struct InstanceHolder {
+ ~InstanceHolder()
{
QMutexLocker locker(&mutex);
instance = nullptr;
@@ -73,15 +73,15 @@ struct Holder {
QBasicMutex mutex;
QPlatformMediaIntegration *instance = nullptr;
QPlatformMediaIntegration *nativeInstance = nullptr;
-} holder;
+} instanceHolder;
}
QPlatformMediaIntegration *QPlatformMediaIntegration::instance()
{
- QMutexLocker locker(&holder.mutex);
- if (holder.instance)
- return holder.instance;
+ QMutexLocker locker(&instanceHolder.mutex);
+ if (instanceHolder.instance)
+ return instanceHolder.instance;
const auto backends = availableBackends();
QString backend = QString::fromUtf8(qgetenv("QT_MEDIA_BACKEND"));
@@ -89,16 +89,16 @@ QPlatformMediaIntegration *QPlatformMediaIntegration::instance()
backend = defaultBackend(backends);
qCDebug(qLcMediaPlugin) << "loading backend" << backend;
- holder.nativeInstance =
+ instanceHolder.nativeInstance =
qLoadPlugin<QPlatformMediaIntegration, QPlatformMediaPlugin>(loader(), backend);
- if (!holder.nativeInstance) {
+ if (!instanceHolder.nativeInstance) {
qWarning() << "could not load multimedia backend" << backend;
- holder.nativeInstance = new QDummyIntegration;
+ instanceHolder.nativeInstance = new QDummyIntegration;
}
- holder.instance = holder.nativeInstance;
- return holder.instance;
+ instanceHolder.instance = instanceHolder.nativeInstance;
+ return instanceHolder.instance;
}
/*
@@ -107,9 +107,9 @@ QPlatformMediaIntegration *QPlatformMediaIntegration::instance()
void QPlatformMediaIntegration::setIntegration(QPlatformMediaIntegration *integration)
{
if (integration)
- holder.instance = integration;
+ instanceHolder.instance = integration;
else
- holder.instance = holder.nativeInstance;
+ instanceHolder.instance = instanceHolder.nativeInstance;
}
QList<QCameraDevice> QPlatformMediaIntegration::videoInputs()
diff --git a/src/multimedia/pulseaudio/qpulseaudiosink.cpp b/src/multimedia/pulseaudio/qpulseaudiosink.cpp
index f12d0f6ed..3ab214216 100644
--- a/src/multimedia/pulseaudio/qpulseaudiosink.cpp
+++ b/src/multimedia/pulseaudio/qpulseaudiosink.cpp
@@ -16,7 +16,7 @@
QT_BEGIN_NAMESPACE
-const int PeriodTimeMs = 20;
+const int SinkPeriodTimeMs = 20;
#define LOW_LATENCY_CATEGORY_NAME "game"
@@ -338,7 +338,7 @@ bool QPulseAudioSink::open()
pa_threaded_mainloop_wait(pulseEngine->mainloop());
const pa_buffer_attr *buffer = pa_stream_get_buffer_attr(m_stream);
- m_periodTime = PeriodTimeMs;
+ m_periodTime = SinkPeriodTimeMs;
m_periodSize = pa_usec_to_bytes(m_periodTime * 1000, &m_spec);
m_bufferSize = buffer->tlength;
m_maxBufferSize = buffer->maxlength;
diff --git a/src/multimedia/pulseaudio/qpulseaudiosource.cpp b/src/multimedia/pulseaudio/qpulseaudiosource.cpp
index 883720ed2..9a4cf85e3 100644
--- a/src/multimedia/pulseaudio/qpulseaudiosource.cpp
+++ b/src/multimedia/pulseaudio/qpulseaudiosource.cpp
@@ -15,7 +15,7 @@
QT_BEGIN_NAMESPACE
-const int PeriodTimeMs = 50;
+const int SourcePeriodTimeMs = 50;
static void inputStreamReadCallback(pa_stream *stream, size_t length, void *userdata)
{
@@ -101,7 +101,7 @@ QPulseAudioSource::QPulseAudioSource(const QByteArray &device, QObject *parent)
, m_bytesAvailable(0)
, m_bufferSize(0)
, m_periodSize(0)
- , m_periodTime(PeriodTimeMs)
+ , m_periodTime(SourcePeriodTimeMs)
, m_stream(nullptr)
, m_device(device)
{
@@ -262,7 +262,7 @@ bool QPulseAudioSource::open()
pa_stream_set_underflow_callback(m_stream, inputStreamUnderflowCallback, this);
pa_stream_set_overflow_callback(m_stream, inputStreamOverflowCallback, this);
- m_periodSize = pa_usec_to_bytes(PeriodTimeMs*1000, &spec);
+ m_periodSize = pa_usec_to_bytes(SourcePeriodTimeMs*1000, &spec);
int flags = 0;
pa_buffer_attr buffer_attr;
diff --git a/src/multimedia/video/qvideoframeconverter.cpp b/src/multimedia/video/qvideoframeconverter.cpp
index 9313312e7..0d0bf3179 100644
--- a/src/multimedia/video/qvideoframeconverter.cpp
+++ b/src/multimedia/video/qvideoframeconverter.cpp
@@ -102,7 +102,7 @@ static bool pixelFormatHasAlpha(QVideoFrameFormat::PixelFormat format)
}
};
-static QShader getShader(const QString &name)
+static QShader vfcGetShader(const QString &name)
{
QShader shader = g_shaderCache.value(name);
if (shader.isValid())
@@ -213,11 +213,11 @@ static bool updateTextures(QRhi *rhi,
graphicsPipeline.reset(rhi->newGraphicsPipeline());
graphicsPipeline->setTopology(QRhiGraphicsPipeline::TriangleStrip);
- QShader vs = getShader(QVideoTextureHelper::vertexShaderFileName(format));
+ QShader vs = vfcGetShader(QVideoTextureHelper::vertexShaderFileName(format));
if (!vs.isValid())
return false;
- QShader fs = getShader(QVideoTextureHelper::fragmentShaderFileName(format));
+ QShader fs = vfcGetShader(QVideoTextureHelper::fragmentShaderFileName(format));
if (!fs.isValid())
return false;
diff --git a/src/multimedia/video/qvideowindow.cpp b/src/multimedia/video/qvideowindow.cpp
index acf7ee639..b3b13945c 100644
--- a/src/multimedia/video/qvideowindow.cpp
+++ b/src/multimedia/video/qvideowindow.cpp
@@ -73,7 +73,7 @@ QVideoWindowPrivate::~QVideoWindowPrivate()
q, &QVideoWindow::setVideoFrame);
}
-static const float g_quad[] = {
+static const float g_vw_quad[] = {
// 4 clockwise rotation of texture vertexes (the second pair)
// Rotation 0
-1.f, -1.f, 0.f, 0.f,
@@ -98,7 +98,7 @@ static const float g_quad[] = {
1.f, 1.f, 0.f, 1.f
};
-static QShader getShader(const QString &name)
+static QShader vwGetShader(const QString &name)
{
QFile f(name);
if (f.open(QIODevice::ReadOnly))
@@ -158,7 +158,7 @@ void QVideoWindowPrivate::initRhi()
m_renderPass.reset(m_swapChain->newCompatibleRenderPassDescriptor());
m_swapChain->setRenderPassDescriptor(m_renderPass.get());
- m_vertexBuf.reset(m_rhi->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::VertexBuffer, sizeof(g_quad)));
+ m_vertexBuf.reset(m_rhi->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::VertexBuffer, sizeof(g_vw_quad)));
m_vertexBuf->create();
m_vertexBufReady = false;
@@ -182,9 +182,9 @@ void QVideoWindowPrivate::setupGraphicsPipeline(QRhiGraphicsPipeline *pipeline,
{
pipeline->setTopology(QRhiGraphicsPipeline::TriangleStrip);
- QShader vs = getShader(QVideoTextureHelper::vertexShaderFileName(fmt));
+ QShader vs = vwGetShader(QVideoTextureHelper::vertexShaderFileName(fmt));
Q_ASSERT(vs.isValid());
- QShader fs = getShader(QVideoTextureHelper::fragmentShaderFileName(fmt, m_swapChain->format()));
+ QShader fs = vwGetShader(QVideoTextureHelper::fragmentShaderFileName(fmt, m_swapChain->format()));
Q_ASSERT(fs.isValid());
pipeline->setShaderStages({
{ QRhiShaderStage::Vertex, vs },
@@ -368,7 +368,7 @@ void QVideoWindowPrivate::render()
if (!m_vertexBufReady) {
m_vertexBufReady = true;
- rub->uploadStaticBuffer(m_vertexBuf.get(), g_quad);
+ rub->uploadStaticBuffer(m_vertexBuf.get(), g_vw_quad);
}
if (m_texturesDirty)
diff --git a/src/plugins/multimedia/gstreamer/common/qgstsubtitlesink.cpp b/src/plugins/multimedia/gstreamer/common/qgstsubtitlesink.cpp
index ce444a29a..c1f517b44 100644
--- a/src/plugins/multimedia/gstreamer/common/qgstsubtitlesink.cpp
+++ b/src/plugins/multimedia/gstreamer/common/qgstsubtitlesink.cpp
@@ -11,14 +11,14 @@
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));
@@ -61,7 +61,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;
@@ -96,41 +96,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::toString(caps);
- return sink_parent_class->set_caps(base, 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";
diff --git a/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink.cpp b/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink.cpp
index d8fbe69e2..d67319fdd 100644
--- a/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink.cpp
+++ b/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink.cpp
@@ -402,8 +402,8 @@ bool QGstVideoRenderer::waitForAsyncEvent(
return condition->wait(&m_mutex, time);
}
-static GstVideoSinkClass *sink_parent_class;
-static thread_local QGstreamerVideoSink *current_sink;
+static GstVideoSinkClass *gvrs_sink_parent_class;
+static thread_local QGstreamerVideoSink *gvrs_current_sink;
#define VO_SINK(s) QGstVideoRendererSink *sink(reinterpret_cast<QGstVideoRendererSink *>(s))
@@ -420,7 +420,7 @@ QGstVideoRendererSink *QGstVideoRendererSink::createSink(QGstreamerVideoSink *si
void QGstVideoRendererSink::setSink(QGstreamerVideoSink *sink)
{
- current_sink = sink;
+ gvrs_current_sink = sink;
}
GType QGstVideoRendererSink::get_type()
@@ -457,7 +457,7 @@ void QGstVideoRendererSink::class_init(gpointer g_class, gpointer class_data)
{
Q_UNUSED(class_data);
- sink_parent_class = reinterpret_cast<GstVideoSinkClass *>(g_type_class_peek_parent(g_class));
+ gvrs_sink_parent_class = reinterpret_cast<GstVideoSinkClass *>(g_type_class_peek_parent(g_class));
GstVideoSinkClass *video_sink_class = reinterpret_cast<GstVideoSinkClass *>(g_class);
video_sink_class->show_frame = QGstVideoRendererSink::show_frame;
@@ -501,11 +501,11 @@ void QGstVideoRendererSink::instance_init(GTypeInstance *instance, gpointer g_cl
Q_UNUSED(g_class);
VO_SINK(instance);
- Q_ASSERT(current_sink);
+ Q_ASSERT(gvrs_current_sink);
- sink->renderer = new QGstVideoRenderer(current_sink);
- sink->renderer->moveToThread(current_sink->thread());
- current_sink = nullptr;
+ sink->renderer = new QGstVideoRenderer(gvrs_current_sink);
+ sink->renderer->moveToThread(gvrs_current_sink->thread());
+ gvrs_current_sink = nullptr;
}
void QGstVideoRendererSink::finalize(GObject *object)
@@ -515,7 +515,7 @@ void QGstVideoRendererSink::finalize(GObject *object)
delete sink->renderer;
// Chain up
- G_OBJECT_CLASS(sink_parent_class)->finalize(object);
+ G_OBJECT_CLASS(gvrs_sink_parent_class)->finalize(object);
}
void QGstVideoRendererSink::handleShowPrerollChange(GObject *o, GParamSpec *p, gpointer d)
@@ -553,7 +553,7 @@ GstStateChangeReturn QGstVideoRendererSink::change_state(
if (transition == GST_STATE_CHANGE_PLAYING_TO_PAUSED && !showPrerollFrame)
sink->renderer->flush();
- return GST_ELEMENT_CLASS(sink_parent_class)->change_state(element, transition);
+ return GST_ELEMENT_CLASS(gvrs_sink_parent_class)->change_state(element, transition);
}
GstCaps *QGstVideoRendererSink::get_caps(GstBaseSink *base, GstCaps *filter)
@@ -619,14 +619,14 @@ gboolean QGstVideoRendererSink::query(GstBaseSink *base, GstQuery *query)
if (sink->renderer->query(query))
return TRUE;
- return GST_BASE_SINK_CLASS(sink_parent_class)->query(base, query);
+ return GST_BASE_SINK_CLASS(gvrs_sink_parent_class)->query(base, query);
}
gboolean QGstVideoRendererSink::event(GstBaseSink *base, GstEvent * event)
{
VO_SINK(base);
sink->renderer->gstEvent(event);
- return GST_BASE_SINK_CLASS(sink_parent_class)->event(base, event);
+ return GST_BASE_SINK_CLASS(gvrs_sink_parent_class)->event(base, event);
}
QT_END_NAMESPACE