diff options
Diffstat (limited to 'src/multimedia/platform/android')
14 files changed, 39 insertions, 39 deletions
diff --git a/src/multimedia/platform/android/audio/qopenslesdeviceinfo.cpp b/src/multimedia/platform/android/audio/qandroidaudiodevice.cpp index 7d5240c0b..07cf9c12e 100644 --- a/src/multimedia/platform/android/audio/qopenslesdeviceinfo.cpp +++ b/src/multimedia/platform/android/audio/qandroidaudiodevice.cpp @@ -37,14 +37,14 @@ ** ****************************************************************************/ -#include "qopenslesdeviceinfo_p.h" +#include "qandroidaudiodevice_p.h" #include "qopenslesengine_p.h" QT_BEGIN_NAMESPACE QOpenSLESDeviceInfo::QOpenSLESDeviceInfo(const QByteArray &device, const QString &desc, QAudio::Mode mode) - : QAudioDeviceInfoPrivate(device, mode), + : QAudioDevicePrivate(device, mode), m_engine(QOpenSLESEngine::instance()) { description = desc; diff --git a/src/multimedia/platform/android/audio/qopenslesdeviceinfo_p.h b/src/multimedia/platform/android/audio/qandroidaudiodevice_p.h index 2213544ab..626037f73 100644 --- a/src/multimedia/platform/android/audio/qopenslesdeviceinfo_p.h +++ b/src/multimedia/platform/android/audio/qandroidaudiodevice_p.h @@ -52,13 +52,13 @@ // #include <qaudiosystem_p.h> -#include <private/qaudiodeviceinfo_p.h> +#include <private/qaudiodevice_p.h> QT_BEGIN_NAMESPACE class QOpenSLESEngine; -class QOpenSLESDeviceInfo : public QAudioDeviceInfoPrivate +class QOpenSLESDeviceInfo : public QAudioDevicePrivate { public: QOpenSLESDeviceInfo(const QByteArray &device, const QString &desc, QAudio::Mode mode); diff --git a/src/multimedia/platform/android/audio/qopenslesengine.cpp b/src/multimedia/platform/android/audio/qopenslesengine.cpp index b252b3d7f..3bddea920 100644 --- a/src/multimedia/platform/android/audio/qopenslesengine.cpp +++ b/src/multimedia/platform/android/audio/qopenslesengine.cpp @@ -40,7 +40,7 @@ #include "qopenslesengine_p.h" #include "qandroidaudiosource_p.h" -#include "qopenslesdeviceinfo_p.h" +#include "qandroidaudiodevice_p.h" #include <qdebug.h> @@ -103,9 +103,9 @@ SLDataFormat_PCM QOpenSLESEngine::audioFormatToSLFormatPCM(const QAudioFormat &f } -QList<QAudioDeviceInfo> QOpenSLESEngine::availableDevices(QAudio::Mode mode) +QList<QAudioDevice> QOpenSLESEngine::availableDevices(QAudio::Mode mode) { - QList<QAudioDeviceInfo> devices; + QList<QAudioDevice> devices; QJniObject devs; if (mode == QAudio::AudioInput) { devs = QJniObject::callStaticObjectMethod( diff --git a/src/multimedia/platform/android/audio/qopenslesengine_p.h b/src/multimedia/platform/android/audio/qopenslesengine_p.h index 625045aa8..4427235d7 100644 --- a/src/multimedia/platform/android/audio/qopenslesengine_p.h +++ b/src/multimedia/platform/android/audio/qopenslesengine_p.h @@ -55,7 +55,7 @@ #include <qaudio.h> #include <qlist.h> #include <qaudioformat.h> -#include <qaudiodeviceinfo.h> +#include <qaudiodevice.h> #include <SLES/OpenSLES.h> QT_BEGIN_NAMESPACE @@ -74,7 +74,7 @@ public: static SLDataFormat_PCM audioFormatToSLFormatPCM(const QAudioFormat &format); - static QList<QAudioDeviceInfo> availableDevices(QAudio::Mode mode); + static QList<QAudioDevice> availableDevices(QAudio::Mode mode); QList<int> supportedChannelCounts(QAudio::Mode mode) const; QList<int> supportedSampleRates(QAudio::Mode mode) const; diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp index e355fcd0b..3e3f58b51 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp +++ b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp @@ -42,7 +42,7 @@ #include "qandroidcameravideorenderercontrol_p.h" #include "qandroidcaptureservice_p.h" #include <qmediadevices.h> -#include <qcamerainfo.h> +#include <qcameradevice.h> #include <qtimer.h> #include "qandroidmultimediautils_p.h" @@ -78,7 +78,7 @@ QCamera::Status QAndroidCameraControl::status() const return m_cameraSession->status(); } -void QAndroidCameraControl::setCamera(const QCameraInfo &camera) +void QAndroidCameraControl::setCamera(const QCameraDevice &camera) { int id = 0; auto cameras = QMediaDevices::videoInputs(); diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol_p.h b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol_p.h index a6c1a3c75..56901a637 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol_p.h +++ b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol_p.h @@ -72,7 +72,7 @@ public: QCamera::Status status() const override; - void setCamera(const QCameraInfo &camera) override; + void setCamera(const QCameraDevice &camera) override; void setCaptureSession(QPlatformMediaCaptureSession *session) override; diff --git a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp index 803988f65..1f1229944 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp +++ b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp @@ -52,11 +52,11 @@ #include <qdebug.h> #include <qvideoframe.h> #include <private/qmemoryvideobuffer_p.h> -#include <private/qcamerainfo_p.h> +#include <private/qcameradevice_p.h> QT_BEGIN_NAMESPACE -Q_GLOBAL_STATIC(QList<QCameraInfo>, g_availableCameras) +Q_GLOBAL_STATIC(QList<QCameraDevice>, g_availableCameras) QAndroidCameraSession::QAndroidCameraSession(QObject *parent) : QObject(parent) @@ -141,7 +141,7 @@ void QAndroidCameraSession::updateAvailableCameras() const int numCameras = AndroidCamera::getNumberOfCameras(); for (int i = 0; i < numCameras; ++i) { - QCameraInfoPrivate *info = new QCameraInfoPrivate; + QCameraDevicePrivate *info = new QCameraDevicePrivate; AndroidCamera::getCameraInfo(i, info); if (!info->id.isEmpty()) @@ -149,7 +149,7 @@ void QAndroidCameraSession::updateAvailableCameras() } } -const QList<QCameraInfo> &QAndroidCameraSession::availableCameras() +const QList<QCameraDevice> &QAndroidCameraSession::availableCameras() { if (g_availableCameras->isEmpty()) updateAvailableCameras(); diff --git a/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h b/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h index 9f642ac3d..7caf782e9 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h +++ b/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h @@ -73,7 +73,7 @@ public: explicit QAndroidCameraSession(QObject *parent = 0); ~QAndroidCameraSession(); - static const QList<QCameraInfo> &availableCameras(); + static const QList<QCameraDevice> &availableCameras(); void setSelectedCamera(int cameraId) { m_selectedCamera = cameraId; } AndroidCamera *camera() const { return m_camera; } diff --git a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp index 6a84f324a..cd1e8dde5 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp +++ b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp @@ -47,7 +47,7 @@ #include "qandroidcameravideorenderercontrol_p.h" #include "qandroidcameraimagecapturecontrol_p.h" #include "qmediadevices.h" -#include "qaudiodeviceinfo.h" +#include "qaudiodevice.h" QT_BEGIN_NAMESPACE @@ -162,7 +162,7 @@ void QAndroidCaptureService::setVolume(qreal volume) qWarning("QMediaRecorder::setVolume() is not supported on Android."); } -QAudioDeviceInfo QAndroidCaptureService::audioInput() const +QAudioDevice QAndroidCaptureService::audioInput() const { const auto devices = QMediaDevices::audioInputs(); QByteArray id = m_captureSession->audioInput().toLatin1(); @@ -174,7 +174,7 @@ QAudioDeviceInfo QAndroidCaptureService::audioInput() const return QMediaDevices::defaultAudioInput(); } -bool QAndroidCaptureService::setAudioInput(const QAudioDeviceInfo &info) +bool QAndroidCaptureService::setAudioInput(const QAudioDevice &info) { m_captureSession->setAudioInput(QString::fromLatin1(info.id())); return true; diff --git a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h index b49eb4eef..4d69908d3 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h +++ b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h @@ -84,8 +84,8 @@ public: void setMuted(bool muted) override; qreal volume() const override; void setVolume(qreal volume) override; - QAudioDeviceInfo audioInput() const override; - bool setAudioInput(const QAudioDeviceInfo &id) override; + QAudioDevice audioInput() const override; + bool setAudioInput(const QAudioDevice &id) override; void setVideoPreview(QVideoSink *sink) override; diff --git a/src/multimedia/platform/android/qandroidmediadevices.cpp b/src/multimedia/platform/android/qandroidmediadevices.cpp index 010bb54f1..a0cfee354 100644 --- a/src/multimedia/platform/android/qandroidmediadevices.cpp +++ b/src/multimedia/platform/android/qandroidmediadevices.cpp @@ -39,11 +39,11 @@ #include "qandroidmediadevices_p.h" #include "qmediadevices.h" -#include "qcamerainfo_p.h" +#include "qcameradevice_p.h" #include "private/qandroidaudiosource_p.h" #include "private/qandroidaudiosink_p.h" -#include "private/qopenslesdeviceinfo_p.h" +#include "private/qandroidaudiodevice_p.h" #include "private/qopenslesengine_p.h" #include "private/qplatformmediaintegration_p.h" #include "private/qandroidcamerasession_p.h" @@ -55,27 +55,27 @@ QAndroidMediaDevices::QAndroidMediaDevices() { } -QList<QAudioDeviceInfo> QAndroidMediaDevices::audioInputs() const +QList<QAudioDevice> QAndroidMediaDevices::audioInputs() const { return QOpenSLESEngine::availableDevices(QAudio::AudioInput); } -QList<QAudioDeviceInfo> QAndroidMediaDevices::audioOutputs() const +QList<QAudioDevice> QAndroidMediaDevices::audioOutputs() const { return QOpenSLESEngine::availableDevices(QAudio::AudioOutput); } -QList<QCameraInfo> QAndroidMediaDevices::videoInputs() const +QList<QCameraDevice> QAndroidMediaDevices::videoInputs() const { return QAndroidCameraSession::availableCameras(); } -QPlatformAudioSource *QAndroidMediaDevices::createAudioSource(const QAudioDeviceInfo &deviceInfo) +QPlatformAudioSource *QAndroidMediaDevices::createAudioSource(const QAudioDevice &deviceInfo) { return new QAndroidAudioSource(deviceInfo.id()); } -QPlatformAudioSink *QAndroidMediaDevices::createAudioSink(const QAudioDeviceInfo &deviceInfo) +QPlatformAudioSink *QAndroidMediaDevices::createAudioSink(const QAudioDevice &deviceInfo) { return new QAndroidAudioSink(deviceInfo.id()); } diff --git a/src/multimedia/platform/android/qandroidmediadevices_p.h b/src/multimedia/platform/android/qandroidmediadevices_p.h index 316af3767..d262308dd 100644 --- a/src/multimedia/platform/android/qandroidmediadevices_p.h +++ b/src/multimedia/platform/android/qandroidmediadevices_p.h @@ -63,11 +63,11 @@ class QAndroidMediaDevices : public QPlatformMediaDevices public: QAndroidMediaDevices(); - QList<QAudioDeviceInfo> audioInputs() const override; - QList<QAudioDeviceInfo> audioOutputs() const override; - QList<QCameraInfo> videoInputs() const override; - QPlatformAudioSource *createAudioSource(const QAudioDeviceInfo &deviceInfo) override; - QPlatformAudioSink *createAudioSink(const QAudioDeviceInfo &deviceInfo) override; + QList<QAudioDevice> audioInputs() const override; + QList<QAudioDevice> audioOutputs() const override; + QList<QCameraDevice> videoInputs() const override; + QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo) override; + QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo) override; void forwardAudioOutputsChanged(); void forwardAudioInputsChanged(); diff --git a/src/multimedia/platform/android/wrappers/jni/androidcamera.cpp b/src/multimedia/platform/android/wrappers/jni/androidcamera.cpp index 7800f732b..b26371af6 100644 --- a/src/multimedia/platform/android/wrappers/jni/androidcamera.cpp +++ b/src/multimedia/platform/android/wrappers/jni/androidcamera.cpp @@ -760,7 +760,7 @@ int AndroidCamera::getNumberOfCameras() "getNumberOfCameras"); } -void AndroidCamera::getCameraInfo(int id, QCameraInfoPrivate *info) +void AndroidCamera::getCameraInfo(int id, QCameraDevicePrivate *info) { Q_ASSERT(info); @@ -778,13 +778,13 @@ void AndroidCamera::getCameraInfo(int id, QCameraInfoPrivate *info) case AndroidCamera::CameraFacingBack: info->id = QByteArray("back"); info->description = QStringLiteral("Rear-facing camera"); - info->position = QCameraInfo::BackFace; + info->position = QCameraDevice::BackFace; info->isDefault = true; break; case AndroidCamera::CameraFacingFront: info->id = QByteArray("front"); info->description = QStringLiteral("Front-facing camera"); - info->position = QCameraInfo::FrontFace; + info->position = QCameraDevice::FrontFace; break; default: break; diff --git a/src/multimedia/platform/android/wrappers/jni/androidcamera_p.h b/src/multimedia/platform/android/wrappers/jni/androidcamera_p.h index 889aab2fd..b390f3aba 100644 --- a/src/multimedia/platform/android/wrappers/jni/androidcamera_p.h +++ b/src/multimedia/platform/android/wrappers/jni/androidcamera_p.h @@ -57,7 +57,7 @@ #include <qrect.h> #include <QtMultimedia/qcamera.h> #include <QtCore/qjniobject.h> -#include <private/qcamerainfo_p.h> +#include <private/qcameradevice_p.h> QT_BEGIN_NAMESPACE @@ -203,7 +203,7 @@ public: QJniObject getCameraObject(); static int getNumberOfCameras(); - static void getCameraInfo(int id, QCameraInfoPrivate *info); + static void getCameraInfo(int id, QCameraDevicePrivate *info); static bool requestCameraPermission(); static bool registerNativeMethods(); |