summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/configure.json19
-rw-r--r--src/multimedia/multimedia.pro1
-rw-r--r--src/multimedia/qmediaopenglhelper_p.h115
-rw-r--r--src/multimedia/video/qvideooutputorientationhandler.cpp4
4 files changed, 1 insertions, 138 deletions
diff --git a/src/multimedia/configure.json b/src/multimedia/configure.json
index e9480dfc5..7f9b5d064 100644
--- a/src/multimedia/configure.json
+++ b/src/multimedia/configure.json
@@ -54,7 +54,7 @@
"test": "gstreamer",
"sources": [
{ "type": "pkgConfig",
- "args": "gstreamer-1.0 gstreamer-base-1.0 gstreamer-audio-1.0 gstreamer-video-1.0 gstreamer-pbutils-1.0" },
+ "args": "gstreamer-1.0 gstreamer-base-1.0 gstreamer-audio-1.0 gstreamer-video-1.0 gstreamer-pbutils-1.0 gstreamer-allocators-1.0" },
{ "libs": "-lgstreamer-1.0 -lgstbase-1.0 -lgstaudio-1.0 -lgstvideo-1.0 -lgstpbutils-1.0 -lglib-2.0 -lgobject-2.0",
"condition": "config.win32 || config.macos" },
{ "libs": "", "condition": "config.android && input.gstreamer != ''" }
@@ -109,18 +109,6 @@
{ "type": "pkgConfig", "args": "gstreamer-gl-1.0" }
]
},
- "gstreamer_imxcommon": {
- "label": "GStreamer i.MX common",
- "export": "gstreamer_imxcommon",
- "test": {
- "include": "gst/allocators/imx/phys_mem_meta.h"
- },
- "use": "gstreamer_1_0",
- "sources": [
- { "type": "pkgConfig",
- "args": "gstimxcommon" }
- ]
- },
"libresourceqt5": {
"label": "libresourceqt5",
"test": "resourcepolicy",
@@ -260,11 +248,6 @@
"condition": "features.opengl && features.gstreamer_1_0 && libs.gstreamer_gl_1_0",
"output": [ "privateFeature" ]
},
- "gstreamer_imxcommon": {
- "label": "GStreamer i.MX common",
- "condition": "(features.gstreamer_1_0 && libs.gstreamer_imxcommon)",
- "output": [ "privateFeature" ]
- },
"gpu_vivante": {
"label": "Vivante GPU",
"condition": "features.gui && features.opengles2 && tests.gpu_vivante",
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index 6efee8040..b783efbe0 100644
--- a/src/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -25,7 +25,6 @@ PRIVATE_HEADERS += \
qmediaresourcepolicy_p.h \
qmediaresourceset_p.h \
qmediastoragelocation_p.h \
- qmediaopenglhelper_p.h \
qmultimediautils_p.h
PUBLIC_HEADERS += \
diff --git a/src/multimedia/qmediaopenglhelper_p.h b/src/multimedia/qmediaopenglhelper_p.h
deleted file mode 100644
index 0a65b9f53..000000000
--- a/src/multimedia/qmediaopenglhelper_p.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** 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$
-**
-****************************************************************************/
-
-#ifndef QMEDIAOPENGLHELPER_P_H
-#define QMEDIAOPENGLHELPER_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtGui/QOpenGLContext>
-
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) && (defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC))
-#include <EGL/egl.h>
-#endif
-
-QT_BEGIN_NAMESPACE
-
-class QMediaOpenGLHelper
-{
-public:
- static bool isANGLE();
-};
-
-inline bool QMediaOpenGLHelper::isANGLE()
-{
-#ifdef Q_OS_WINRT
- return true;
-#else
- bool isANGLE = false;
-
-# if defined(Q_OS_WIN) && (defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC))
- if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES) {
- // Although unlikely, technically LibGLES could mean a non-ANGLE EGL/GLES2 implementation too.
- // Verify that it is indeed ANGLE.
-# ifdef QT_OPENGL_ES_2_ANGLE_STATIC
- // ANGLE linked-in statically.
- isANGLE = true;
-# else
- // Qt configured with either -opengl es2 or -opengl desktop.
-# ifdef QT_DEBUG
- HMODULE eglHandle = LoadLibraryW(L"libEGLd.dll");
-# else
- HMODULE eglHandle = LoadLibraryW(L"libEGL.dll");
-# endif // QT_DEBUG
- if (eglHandle) {
- typedef EGLDisplay (EGLAPIENTRYP EglGetDisplay)(EGLNativeDisplayType display_id);
- typedef EGLBoolean (EGLAPIENTRYP EglInitialize)(EGLDisplay dpy, EGLint *major, EGLint *minor);
- typedef const char * (EGLAPIENTRYP EglQueryString)(EGLDisplay dpy, EGLint name);
- EglGetDisplay eglGetDisplay = (EglGetDisplay) GetProcAddress(eglHandle, "eglGetDisplay");
- EglInitialize eglInitialize = (EglInitialize) GetProcAddress(eglHandle, "eglInitialize");
- EglQueryString eglQueryString = (EglQueryString) GetProcAddress(eglHandle, "eglQueryString");
- if (eglGetDisplay && eglInitialize && eglQueryString) {
- // EGL may not be initialized at this stage.
- EGLDisplay dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY);
- eglInitialize(dpy, 0, 0);
- const char *vendorStr = eglQueryString(dpy, EGL_VERSION);
- isANGLE = vendorStr && strstr(vendorStr, "ANGLE");
- }
- }
-# endif // QT_OPENGL_ES_2_ANGLE_STATIC
-
- }
-# endif // Q_OS_WIN && (QT_OPENGL_ES_2 || QT_OPENGL_DYNAMIC)
-
- return isANGLE;
-#endif // Q_OS_WINRT
-}
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/multimedia/video/qvideooutputorientationhandler.cpp b/src/multimedia/video/qvideooutputorientationhandler.cpp
index dac6eb0ba..e21efb37d 100644
--- a/src/multimedia/video/qvideooutputorientationhandler.cpp
+++ b/src/multimedia/video/qvideooutputorientationhandler.cpp
@@ -50,10 +50,6 @@ QVideoOutputOrientationHandler::QVideoOutputOrientationHandler(QObject *parent)
{
QScreen *screen = QGuiApplication::primaryScreen();
- // we want to be informed about all orientation changes
- screen->setOrientationUpdateMask(Qt::PortraitOrientation|Qt::LandscapeOrientation
- |Qt::InvertedPortraitOrientation|Qt::InvertedLandscapeOrientation);
-
connect(screen, SIGNAL(orientationChanged(Qt::ScreenOrientation)),
this, SLOT(screenOrientationChanged(Qt::ScreenOrientation)));
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 05:49:16 +0000