summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia')
-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
6 files changed, 44 insertions, 44 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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 11:12:03 +0000