diff options
35 files changed, 230 insertions, 422 deletions
diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp index 8bd0cdfc6..821b6481c 100644 --- a/examples/multimedia/audiorecorder/audiorecorder.cpp +++ b/examples/multimedia/audiorecorder/audiorecorder.cpp @@ -110,8 +110,8 @@ AudioRecorder::AudioRecorder() ui->channelsBox->addItem(QStringLiteral("4"), QVariant(4)); //quality - ui->qualitySlider->setRange(0, int(QMultimedia::VeryHighQuality)); - ui->qualitySlider->setValue(int(QMultimedia::NormalQuality)); + ui->qualitySlider->setRange(0, int(QImageEncoderSettings::VeryHighQuality)); + ui->qualitySlider->setValue(int(QImageEncoderSettings::NormalQuality)); //bitrates: ui->bitrateBox->addItem(tr("Default"), QVariant(0)); @@ -198,10 +198,10 @@ void AudioRecorder::toggleRecord() settings.setAudioSampleRate(ui->sampleRateBox->value()); settings.setAudioBitRate(boxValue(ui->bitrateBox).toInt()); settings.setAudioChannelCount(boxValue(ui->channelsBox).toInt()); - settings.setQuality(QMultimedia::EncodingQuality(ui->qualitySlider->value())); + settings.setQuality(QMediaEncoderSettings::Quality(ui->qualitySlider->value())); settings.setEncodingMode(ui->constantQualityRadioButton->isChecked() ? - QMultimedia::ConstantQualityEncoding : - QMultimedia::ConstantBitRateEncoding); + QMediaEncoderSettings::ConstantQualityEncoding : + QMediaEncoderSettings::ConstantBitRateEncoding); m_audioRecorder->setEncoderSettings(settings); m_audioRecorder->record(); diff --git a/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc index 4e4032bff..4d5bdfa0e 100644 --- a/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc +++ b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc @@ -51,8 +51,8 @@ \l{QAudioRecorder::supportedContainers()}{supportedContainers()}, and \l{QAudioRecorder::supportedAudioSampleRates()}{supportedAudioSampleRates()} methods. The quality slider is setup from 0 (zero) to - \l{QMultimedia::VeryHighQuality} with a default value of - \l{QMultimedia::NormalQuality}, while the bitrates are hardcoded + \l{QMediaEncoderSettings::VeryHighQuality} with a default value of + \l{QMediaEncoderSettings::NormalQuality}, while the bitrates are hardcoded into the list. \section1 Recording Audio @@ -83,10 +83,10 @@ settings.setCodec(boxValue(ui->audioCodecBox).toString()); settings.setSampleRate(boxValue(ui->sampleRateBox).toInt()); settings.setBitRate(boxValue(ui->bitrateBox).toInt()); - settings.setQuality(QMultimedia::EncodingQuality(ui->qualitySlider->value())); + settings.setQuality(QMediaEncoderSettings::EncodingQuality(ui->qualitySlider->value())); settings.setEncodingMode(ui->constantQualityRadioButton->isChecked() ? - QMultimedia::ConstantQualityEncoding : - QMultimedia::ConstantBitRateEncoding); + QMediaEncoderSettings::ConstantQualityEncoding : + QMediaEncoderSettings::ConstantBitRateEncoding); QString container = boxValue(ui->containerBox).toString(); diff --git a/examples/multimediawidgets/camera/imagesettings.cpp b/examples/multimediawidgets/camera/imagesettings.cpp index c8042bb03..a74982854 100644 --- a/examples/multimediawidgets/camera/imagesettings.cpp +++ b/examples/multimediawidgets/camera/imagesettings.cpp @@ -72,7 +72,7 @@ ImageSettings::ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent) ui->imageCodecBox->addItem(QImageEncoderSettings::fileFormatName(f) + ": " + description, QVariant::fromValue(f)); } - ui->imageQualitySlider->setRange(0, int(QMultimedia::VeryHighQuality)); + ui->imageQualitySlider->setRange(0, int(QImageEncoderSettings::VeryHighQuality)); ui->imageResolutionBox->addItem(tr("Default Resolution")); const QList<QSize> supportedResolutions = imagecapture->camera()->cameraInfo().photoResolutions(); @@ -103,7 +103,7 @@ QImageEncoderSettings ImageSettings::imageSettings() const { QImageEncoderSettings settings = imagecapture->encodingSettings(); settings.setFormat(boxValue(ui->imageCodecBox).value<QImageEncoderSettings::FileFormat>()); - settings.setQuality(QMultimedia::EncodingQuality(ui->imageQualitySlider->value())); + settings.setQuality(QImageEncoderSettings::Quality(ui->imageQualitySlider->value())); settings.setResolution(boxValue(ui->imageResolutionBox).toSize()); return settings; diff --git a/examples/multimediawidgets/camera/videosettings.cpp b/examples/multimediawidgets/camera/videosettings.cpp index 3ffb42ed4..8b70b2014 100644 --- a/examples/multimediawidgets/camera/videosettings.cpp +++ b/examples/multimediawidgets/camera/videosettings.cpp @@ -109,7 +109,7 @@ VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent) QVariant::fromValue(format)); } - ui->qualitySlider->setRange(0, int(QMultimedia::VeryHighQuality)); + ui->qualitySlider->setRange(0, int(QImageEncoderSettings::VeryHighQuality)); } VideoSettings::~VideoSettings() @@ -132,7 +132,7 @@ void VideoSettings::changeEvent(QEvent *e) QMediaEncoderSettings VideoSettings::encoderSettings() const { QMediaEncoderSettings settings = mediaRecorder->encoderSettings(); - settings.setQuality(QMultimedia::EncodingQuality(ui->qualitySlider->value())); + settings.setQuality(QMediaEncoderSettings::Quality(ui->qualitySlider->value())); settings.setFormat(boxValue(ui->containerFormatBox).value<QMediaFormat::FileFormat>()); settings.setAudioCodec(boxValue(ui->audioCodecBox).value<QMediaFormat::AudioCodec>()); diff --git a/src/imports/multimedia/qdeclarativecamerarecorder.cpp b/src/imports/multimedia/qdeclarativecamerarecorder.cpp index f1b79d3c6..39d218373 100644 --- a/src/imports/multimedia/qdeclarativecamerarecorder.cpp +++ b/src/imports/multimedia/qdeclarativecamerarecorder.cpp @@ -334,8 +334,8 @@ void QDeclarativeCameraRecorder::setAudioSampleRate(int rate) void QDeclarativeCameraRecorder::setAudioEncodingMode(QDeclarativeCameraRecorder::EncodingMode encodingMode) { m_encoderSettings = m_recorder->encoderSettings(); - if (m_encoderSettings.encodingMode() != QMultimedia::EncodingMode(encodingMode)) { - m_encoderSettings.setEncodingMode(QMultimedia::EncodingMode(encodingMode)); + if (m_encoderSettings.encodingMode() != QMediaEncoderSettings::EncodingMode(encodingMode)) { + m_encoderSettings.setEncodingMode(QMediaEncoderSettings::EncodingMode(encodingMode)); m_recorder->setEncoderSettings(m_encoderSettings); emit audioEncodingModeChanged(encodingMode); } @@ -344,8 +344,8 @@ void QDeclarativeCameraRecorder::setAudioEncodingMode(QDeclarativeCameraRecorder void QDeclarativeCameraRecorder::setVideoEncodingMode(QDeclarativeCameraRecorder::EncodingMode encodingMode) { m_encoderSettings = m_recorder->encoderSettings(); - if (m_encoderSettings.encodingMode() != QMultimedia::EncodingMode(encodingMode)) { - m_encoderSettings.setEncodingMode(QMultimedia::EncodingMode(encodingMode)); + if (m_encoderSettings.encodingMode() != QMediaEncoderSettings::EncodingMode(encodingMode)) { + m_encoderSettings.setEncodingMode(QMediaEncoderSettings::EncodingMode(encodingMode)); m_recorder->setEncoderSettings(m_encoderSettings); emit videoEncodingModeChanged(encodingMode); } diff --git a/src/imports/multimedia/qdeclarativecamerarecorder_p.h b/src/imports/multimedia/qdeclarativecamerarecorder_p.h index 5c62c2639..613d00cb6 100644 --- a/src/imports/multimedia/qdeclarativecamerarecorder_p.h +++ b/src/imports/multimedia/qdeclarativecamerarecorder_p.h @@ -112,9 +112,9 @@ public: enum EncodingMode { - ConstantQualityEncoding = QMultimedia::ConstantQualityEncoding, - ConstantBitRateEncoding = QMultimedia::ConstantBitRateEncoding, - AverageBitRateEncoding = QMultimedia::AverageBitRateEncoding + ConstantQualityEncoding = QMediaEncoderSettings::ConstantQualityEncoding, + ConstantBitRateEncoding = QMediaEncoderSettings::ConstantBitRateEncoding, + AverageBitRateEncoding = QMediaEncoderSettings::AverageBitRateEncoding }; enum Error { diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt index 2a8a4eccc..31e723199 100644 --- a/src/multimedia/CMakeLists.txt +++ b/src/multimedia/CMakeLists.txt @@ -53,7 +53,6 @@ qt_internal_add_module(Multimedia qmediapluginloader.cpp qmediapluginloader_p.h qmediastoragelocation.cpp qmediastoragelocation_p.h qmediatimerange.cpp qmediatimerange.h - qmultimedia.cpp qmultimedia.h qmultimediautils.cpp qmultimediautils_p.h qtmultimediaglobal.h qtmultimediaglobal_p.h recording/qmediaencodersettings.cpp recording/qmediaencodersettings.h diff --git a/src/multimedia/audio/qaudio.h b/src/multimedia/audio/qaudio.h index 3f2b5416d..3b4696dfd 100644 --- a/src/multimedia/audio/qaudio.h +++ b/src/multimedia/audio/qaudio.h @@ -42,7 +42,6 @@ #define QAUDIO_H #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qmultimedia.h> #include <QtCore/qmetatype.h> diff --git a/src/multimedia/audio/qaudiobuffer.h b/src/multimedia/audio/qaudiobuffer.h index 50ec92a43..62571d4da 100644 --- a/src/multimedia/audio/qaudiobuffer.h +++ b/src/multimedia/audio/qaudiobuffer.h @@ -43,7 +43,6 @@ #include <QtCore/qshareddata.h> #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qmultimedia.h> #include <QtMultimedia/qaudio.h> #include <QtMultimedia/qaudioformat.h> diff --git a/src/multimedia/audio/qaudiobuffer_p.h b/src/multimedia/audio/qaudiobuffer_p.h index e770989f2..53f627250 100644 --- a/src/multimedia/audio/qaudiobuffer_p.h +++ b/src/multimedia/audio/qaudiobuffer_p.h @@ -52,7 +52,6 @@ // #include <qtmultimediaglobal.h> -#include <qmultimedia.h> #include "qaudioformat.h" diff --git a/src/multimedia/audio/qaudiodeviceinfo.h b/src/multimedia/audio/qaudiodeviceinfo.h index aaba9ffac..6029d244c 100644 --- a/src/multimedia/audio/qaudiodeviceinfo.h +++ b/src/multimedia/audio/qaudiodeviceinfo.h @@ -48,7 +48,6 @@ #include <QtCore/qlist.h> #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qmultimedia.h> #include <QtMultimedia/qaudio.h> #include <QtMultimedia/qaudioformat.h> diff --git a/src/multimedia/audio/qaudioformat.h b/src/multimedia/audio/qaudioformat.h index 04d6eb560..13a5ea0f2 100644 --- a/src/multimedia/audio/qaudioformat.h +++ b/src/multimedia/audio/qaudioformat.h @@ -45,7 +45,6 @@ #include <QtCore/qshareddata.h> #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qmultimedia.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/audio/qaudioinput.h b/src/multimedia/audio/qaudioinput.h index 1f1b84fb5..df7a52b90 100644 --- a/src/multimedia/audio/qaudioinput.h +++ b/src/multimedia/audio/qaudioinput.h @@ -44,7 +44,6 @@ #include <QtCore/qiodevice.h> #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qmultimedia.h> #include <QtMultimedia/qaudio.h> #include <QtMultimedia/qaudioformat.h> diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/audio/qaudiooutput.h index 8c3c2a831..bcb76487f 100644 --- a/src/multimedia/audio/qaudiooutput.h +++ b/src/multimedia/audio/qaudiooutput.h @@ -44,7 +44,6 @@ #include <QtCore/qiodevice.h> #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qmultimedia.h> #include <QtMultimedia/qaudio.h> #include <QtMultimedia/qaudioformat.h> diff --git a/src/multimedia/audio/qaudiosystem_p.h b/src/multimedia/audio/qaudiosystem_p.h index efc7ade28..41c63ea5a 100644 --- a/src/multimedia/audio/qaudiosystem_p.h +++ b/src/multimedia/audio/qaudiosystem_p.h @@ -52,7 +52,6 @@ // #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qmultimedia.h> #include <QtMultimedia/qaudio.h> #include <QtMultimedia/qaudioformat.h> diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp index 35c5e842f..19a4c84a8 100644 --- a/src/multimedia/camera/qcameraimagecapture.cpp +++ b/src/multimedia/camera/qcameraimagecapture.cpp @@ -194,16 +194,6 @@ bool QCameraImageCapture::isAvailable() const } /*! - Returns the availability of this functionality. -*/ -QMultimedia::AvailabilityStatus QCameraImageCapture::availability() const -{ - if (d_func()->control != nullptr) - return QMultimedia::Available; - return QMultimedia::ServiceMissing; -} - -/*! Returns the current error state. \sa errorString() diff --git a/src/multimedia/camera/qcameraimagecapture.h b/src/multimedia/camera/qcameraimagecapture.h index 1ca4111bc..785ab1d78 100644 --- a/src/multimedia/camera/qcameraimagecapture.h +++ b/src/multimedia/camera/qcameraimagecapture.h @@ -86,7 +86,6 @@ public: ~QCameraImageCapture(); bool isAvailable() const; - QMultimedia::AvailabilityStatus availability() const; QCamera *camera() const; diff --git a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp index a4dc3156d..2f10a5e58 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp +++ b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp @@ -229,9 +229,9 @@ void MediaExample::MediaRecorder() //! [Media recorder] recorder = new QMediaRecorder(camera); - QAudioEncoderSettings audioSettings; - audioSettings.setCodec("audio/amr"); - audioSettings.setQuality(QMultimedia::HighQuality); + QMediaEncoderSettings audioSettings; + audioSettings.setFormat(QMediaEncoderSettings::MP3); + audioSettings.setQuality(QMediaEncoderSettings::HighQuality); recorder->setAudioSettings(audioSettings); @@ -245,9 +245,9 @@ void MediaExample::AudioRecorder() //! [Audio recorder] audioRecorder = new QAudioRecorder; - QAudioEncoderSettings audioSettings; - audioSettings.setCodec("audio/amr"); - audioSettings.setQuality(QMultimedia::HighQuality); + QMediaEncoderSettings audioSettings; + audioSettings.setFormat(QMediaEncoderSettings::MP3); + audioSettings.setQuality(QMediaEncoderSettings::HighQuality); audioRecorder->setEncodingSettings(audioSettings); diff --git a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp index 20be56916..35d8b7c34 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp +++ b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp @@ -518,19 +518,19 @@ void QAndroidCameraSession::applyImageSettings() int jpegQuality = 100; switch (m_requestedImageSettings.quality()) { - case QMultimedia::VeryLowQuality: + case QImageEncoderSettings::VeryLowQuality: jpegQuality = 20; break; - case QMultimedia::LowQuality: + case QImageEncoderSettings::LowQuality: jpegQuality = 40; break; - case QMultimedia::NormalQuality: + case QImageEncoderSettings::NormalQuality: jpegQuality = 60; break; - case QMultimedia::HighQuality: + case QImageEncoderSettings::HighQuality: jpegQuality = 80; break; - case QMultimedia::VeryHighQuality: + case QImageEncoderSettings::VeryHighQuality: jpegQuality = 100; break; } diff --git a/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm b/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm index cf988783a..a8778e459 100644 --- a/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm +++ b/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm @@ -244,22 +244,22 @@ static NSDictionary *avfAudioSettings(const QMediaEncoderSettings &encoderSettin [settings setObject:[NSNumber numberWithInt:codecId] forKey:AVFormatIDKey]; #ifdef Q_OS_OSX - if (encoderSettings.encodingMode() == QMultimedia::ConstantQualityEncoding) { + if (encoderSettings.encodingMode() == QMediaEncoderSettings::ConstantQualityEncoding) { int quality; switch (encoderSettings.quality()) { - case QMultimedia::VeryLowQuality: + case QMediaEncoderSettings::VeryLowQuality: quality = AVAudioQualityMin; break; - case QMultimedia::LowQuality: + case QMediaEncoderSettings::LowQuality: quality = AVAudioQualityLow; break; - case QMultimedia::HighQuality: + case QMediaEncoderSettings::HighQuality: quality = AVAudioQualityHigh; break; - case QMultimedia::VeryHighQuality: + case QMediaEncoderSettings::VeryHighQuality: quality = AVAudioQualityMax; break; - case QMultimedia::NormalQuality: + case QMediaEncoderSettings::NormalQuality: default: quality = AVAudioQualityMedium; break; @@ -417,22 +417,22 @@ NSDictionary *avfVideoSettings(QMediaEncoderSettings &encoderSettings, AVCapture int bitrate = -1; float quality = -1.f; - if (encoderSettings.encodingMode() == QMultimedia::ConstantQualityEncoding) { - if (encoderSettings.quality() != QMultimedia::NormalQuality) { + if (encoderSettings.encodingMode() == QMediaEncoderSettings::ConstantQualityEncoding) { + if (encoderSettings.quality() != QMediaEncoderSettings::NormalQuality) { if (codec != QMediaFormat::VideoCodec::MotionJPEG) { qWarning("ConstantQualityEncoding is not supported for MotionJPEG"); } else { switch (encoderSettings.quality()) { - case QMultimedia::VeryLowQuality: + case QMediaEncoderSettings::VeryLowQuality: quality = 0.f; break; - case QMultimedia::LowQuality: + case QMediaEncoderSettings::LowQuality: quality = 0.25f; break; - case QMultimedia::HighQuality: + case QMediaEncoderSettings::HighQuality: quality = 0.75f; break; - case QMultimedia::VeryHighQuality: + case QMediaEncoderSettings::VeryHighQuality: quality = 1.f; break; default: @@ -441,7 +441,7 @@ NSDictionary *avfVideoSettings(QMediaEncoderSettings &encoderSettings, AVCapture } } } - } else if (encoderSettings.encodingMode() == QMultimedia::AverageBitRateEncoding){ + } else if (encoderSettings.encodingMode() == QMediaEncoderSettings::AverageBitRateEncoding){ if (codec != QMediaFormat::VideoCodec::H264 && codec != QMediaFormat::VideoCodec::H265) qWarning() << "AverageBitRateEncoding is not supported for codec" << QMediaFormat::videoCodecName(codec); else diff --git a/src/multimedia/platform/qnx/camera/bbcamerasession.cpp b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp index 8493a236e..2f1d45672 100644 --- a/src/multimedia/platform/qnx/camera/bbcamerasession.cpp +++ b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp @@ -965,19 +965,19 @@ void BbCameraSession::applyConfiguration() int jpegQuality = 100; switch (m_imageEncoderSettings.quality()) { - case QMultimedia::VeryLowQuality: + case QMediaEncoderSettings::VeryLowQuality: jpegQuality = 20; break; - case QMultimedia::LowQuality: + case QMediaEncoderSettings::LowQuality: jpegQuality = 40; break; - case QMultimedia::NormalQuality: + case QMediaEncoderSettings::NormalQuality: jpegQuality = 60; break; - case QMultimedia::HighQuality: + case QMediaEncoderSettings::HighQuality: jpegQuality = 80; break; - case QMultimedia::VeryHighQuality: + case QMediaEncoderSettings::VeryHighQuality: jpegQuality = 100; break; } diff --git a/src/multimedia/qmediaformat.h b/src/multimedia/qmediaformat.h index 6b3684ab6..3b8b9d9ce 100644 --- a/src/multimedia/qmediaformat.h +++ b/src/multimedia/qmediaformat.h @@ -42,7 +42,6 @@ #include <QtCore/qsharedpointer.h> #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qmultimedia.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/qmediatimerange.h b/src/multimedia/qmediatimerange.h index 97524f24a..2793a6d6d 100644 --- a/src/multimedia/qmediatimerange.h +++ b/src/multimedia/qmediatimerange.h @@ -41,7 +41,6 @@ #define QMEDIATIMERANGE_H #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qmultimedia.h> #include <QtCore/qshareddata.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/qmultimedia.cpp b/src/multimedia/qmultimedia.cpp deleted file mode 100644 index 7308f6389..000000000 --- a/src/multimedia/qmultimedia.cpp +++ /dev/null @@ -1,105 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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$ -** -****************************************************************************/ - -#include "qmultimedia.h" - -QT_BEGIN_NAMESPACE - -/*! - \namespace QMultimedia - \ingroup multimedia-namespaces - \ingroup multimedia - \inmodule QtMultimedia - - \ingroup multimedia - \ingroup multimedia_core - - \brief The QMultimedia namespace contains miscellaneous identifiers used throughout the Qt Multimedia library. - -*/ - -/*! - \enum QMultimedia::SupportEstimate - - Enumerates the levels of support a media service provider may have for a feature. - - \value NotSupported The feature is not supported. - \value MaybeSupported The feature may be supported. - \value ProbablySupported The feature is probably supported. - \value PreferredService The service is the preferred provider of a service. -*/ - -/*! - \enum QMultimedia::EncodingQuality - - Enumerates quality encoding levels. - - \value VeryLowQuality - \value LowQuality - \value NormalQuality - \value HighQuality - \value VeryHighQuality -*/ - -/*! - \enum QMultimedia::EncodingMode - - Enumerates encoding modes. - - \value ConstantQualityEncoding Encoding will aim to have a constant quality, adjusting bitrate to fit. - \value ConstantBitRateEncoding Encoding will use a constant bit rate, adjust quality to fit. - \value AverageBitRateEncoding Encoding will try to keep an average bitrate setting, but will use - more or less as needed. - \value TwoPassEncoding The media will first be processed to determine the characteristics, - and then processed a second time allocating more bits to the areas - that need it. -*/ - -/*! - \enum QMultimedia::AvailabilityStatus - - Enumerates Service status errors. - - \value Available The service is operating correctly. - \value ServiceMissing There is no service available to provide the requested functionality. - \value ResourceError The service could not allocate resources required to function correctly. - \value Busy The service must wait for access to necessary resources. -*/ - -QT_END_NAMESPACE diff --git a/src/multimedia/qmultimedia.h b/src/multimedia/qmultimedia.h deleted file mode 100644 index 535a913e6..000000000 --- a/src/multimedia/qmultimedia.h +++ /dev/null @@ -1,90 +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 QMULTIMEDIA_H -#define QMULTIMEDIA_H - -#include <QtCore/qpair.h> -#include <QtCore/qmetatype.h> -#include <QtCore/qstring.h> - -#include <QtMultimedia/qtmultimediaglobal.h> - -QT_BEGIN_NAMESPACE - -namespace QMultimedia -{ - enum SupportEstimate - { - NotSupported, - MaybeSupported, - ProbablySupported, - PreferredService - }; - - enum EncodingQuality - { - VeryLowQuality, - LowQuality, - NormalQuality, - HighQuality, - VeryHighQuality - }; - - enum EncodingMode - { - ConstantQualityEncoding, - ConstantBitRateEncoding, - AverageBitRateEncoding, - TwoPassEncoding - }; - - enum AvailabilityStatus - { - Available, - ServiceMissing, - Busy, - ResourceError - }; - -} - -QT_END_NAMESPACE - -#endif diff --git a/src/multimedia/qmultimediautils_p.h b/src/multimedia/qmultimediautils_p.h index 771502bdd..c5cdbe935 100644 --- a/src/multimedia/qmultimediautils_p.h +++ b/src/multimedia/qmultimediautils_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtMultimedia/qmultimedia.h> +#include <QtMultimedia/qtmultimediaglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/recording/qmediaencodersettings.cpp b/src/multimedia/recording/qmediaencodersettings.cpp index cc05eecc7..55b9984b8 100644 --- a/src/multimedia/recording/qmediaencodersettings.cpp +++ b/src/multimedia/recording/qmediaencodersettings.cpp @@ -123,8 +123,8 @@ class QMediaEncoderSettingsPrivate : public QSharedData { public: bool isNull = true; - QMultimedia::EncodingMode encodingMode = QMultimedia::ConstantQualityEncoding; - QMultimedia::EncodingQuality quality = QMultimedia::NormalQuality; + QMediaEncoderSettings::EncodingMode encodingMode = QMediaEncoderSettings::ConstantQualityEncoding; + QMediaEncoderSettings::Quality quality = QMediaEncoderSettings::NormalQuality; int audioBitrate = -1; int audioSampleRate = -1; @@ -164,12 +164,39 @@ QMediaEncoderSettings &QMediaEncoderSettings::operator=(const QMediaEncoderSetti QMediaEncoderSettings::~QMediaEncoderSettings() = default; + +/*! + \enum QMediaEncoderSettings::EncodingQuality + + Enumerates quality encoding levels. + + \value VeryLowQuality + \value LowQuality + \value NormalQuality + \value HighQuality + \value VeryHighQuality +*/ + +/*! + \enum QMediaEncoderSettings::EncodingMode + + Enumerates encoding modes. + + \value ConstantQualityEncoding Encoding will aim to have a constant quality, adjusting bitrate to fit. + \value ConstantBitRateEncoding Encoding will use a constant bit rate, adjust quality to fit. + \value AverageBitRateEncoding Encoding will try to keep an average bitrate setting, but will use + more or less as needed. + \value TwoPassEncoding The media will first be processed to determine the characteristics, + and then processed a second time allocating more bits to the areas + that need it. +*/ + /*! Returns the encoding mode. - \sa QMultimedia::EncodingMode + \sa EncodingMode */ -QMultimedia::EncodingMode QMediaEncoderSettings::encodingMode() const +QMediaEncoderSettings::EncodingMode QMediaEncoderSettings::encodingMode() const { return d->encodingMode; } @@ -177,23 +204,23 @@ QMultimedia::EncodingMode QMediaEncoderSettings::encodingMode() const /*! Sets the encoding \a mode setting. - If QMultimedia::ConstantQualityEncoding is set, the quality + If ConstantQualityEncoding is set, the quality encoding parameter is used and bit rates are ignored, otherwise the bitrates are used. - \sa encodingMode(), QMultimedia::EncodingMode + \sa encodingMode(), EncodingMode */ -void QMediaEncoderSettings::setEncodingMode(QMultimedia::EncodingMode mode) +void QMediaEncoderSettings::setEncodingMode(EncodingMode mode) { d->encodingMode = mode; } -QMultimedia::EncodingQuality QMediaEncoderSettings::quality() const +QMediaEncoderSettings::Quality QMediaEncoderSettings::quality() const { return d->quality; } -void QMediaEncoderSettings::setQuality(QMultimedia::EncodingQuality quality) +void QMediaEncoderSettings::setQuality(Quality quality) { d->quality = quality; } @@ -411,27 +438,13 @@ void QMediaEncoderSettings::setAudioSampleRate(int rate) } -class QAudioEncoderSettingsPrivate : public QSharedData -{ -public: - bool isNull = true; - QMultimedia::EncodingMode encodingMode = QMultimedia::ConstantQualityEncoding; - QString codec; - int bitrate = -1; - int sampleRate = -1; - int channels = -1; - QMultimedia::EncodingQuality quality = QMultimedia::NormalQuality; - QVariantMap encodingOptions; -}; - - class QImageEncoderSettingsPrivate : public QSharedData { public: bool isNull = true; QImageEncoderSettings::FileFormat format; QSize resolution; - QMultimedia::EncodingQuality quality = QMultimedia::NormalQuality; + QImageEncoderSettings::Quality quality = QImageEncoderSettings::NormalQuality; QVariantMap encodingOptions; }; @@ -627,10 +640,21 @@ void QImageEncoderSettings::setResolution(int width, int height) } /*! - Returns the image encoding quality. + \enum QImageEncoderSettings::EncodingQuality + + Enumerates quality encoding levels. + + \value VeryLowQuality + \value LowQuality + \value NormalQuality + \value HighQuality + \value VeryHighQuality */ -QMultimedia::EncodingQuality QImageEncoderSettings::quality() const +/*! + Returns the image encoding quality. +*/ +QImageEncoderSettings::Quality QImageEncoderSettings::quality() const { return d->quality; } @@ -638,8 +662,7 @@ QMultimedia::EncodingQuality QImageEncoderSettings::quality() const /*! Sets the image encoding \a quality. */ - -void QImageEncoderSettings::setQuality(QMultimedia::EncodingQuality quality) +void QImageEncoderSettings::setQuality(Quality quality) { d->isNull = false; d->quality = quality; diff --git a/src/multimedia/recording/qmediaencodersettings.h b/src/multimedia/recording/qmediaencodersettings.h index 6e8d35794..c5d6b5b0b 100644 --- a/src/multimedia/recording/qmediaencodersettings.h +++ b/src/multimedia/recording/qmediaencodersettings.h @@ -45,7 +45,6 @@ #include <QtCore/qsize.h> #include <QtCore/qvariant.h> #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qmultimedia.h> #include <QtMultimedia/qmediaformat.h> QT_BEGIN_NAMESPACE @@ -54,17 +53,34 @@ class QMediaEncoderSettingsPrivate; class Q_MULTIMEDIA_EXPORT QMediaEncoderSettings : public QMediaFormat { public: + enum Quality + { + VeryLowQuality, + LowQuality, + NormalQuality, + HighQuality, + VeryHighQuality + }; + + enum EncodingMode + { + ConstantQualityEncoding, + ConstantBitRateEncoding, + AverageBitRateEncoding, + TwoPassEncoding + }; + QMediaEncoderSettings(); QMediaEncoderSettings(FileFormat format); QMediaEncoderSettings(const QMediaEncoderSettings& other); QMediaEncoderSettings& operator=(const QMediaEncoderSettings &other); ~QMediaEncoderSettings(); - QMultimedia::EncodingMode encodingMode() const; - void setEncodingMode(QMultimedia::EncodingMode); + EncodingMode encodingMode() const; + void setEncodingMode(EncodingMode); - QMultimedia::EncodingQuality quality() const; - void setQuality(QMultimedia::EncodingQuality quality); + Quality quality() const; + void setQuality(Quality quality); void resolveFormat(); @@ -95,6 +111,15 @@ class QImageEncoderSettingsPrivate; class Q_MULTIMEDIA_EXPORT QImageEncoderSettings { public: + enum Quality + { + VeryLowQuality, + LowQuality, + NormalQuality, + HighQuality, + VeryHighQuality + }; + enum FileFormat { UnspecifiedFormat, JPEG, @@ -126,8 +151,8 @@ public: void setResolution(const QSize &); void setResolution(int width, int height); - QMultimedia::EncodingQuality quality() const; - void setQuality(QMultimedia::EncodingQuality quality); + Quality quality() const; + void setQuality(Quality quality); QVariant encodingOption(const QString &option) const; QVariantMap encodingOptions() const; diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp index afb2b63c8..6d7091600 100644 --- a/src/multimedia/recording/qmediarecorder.cpp +++ b/src/multimedia/recording/qmediarecorder.cpp @@ -318,18 +318,7 @@ bool QMediaRecorder::setCamera(QCamera *object) */ bool QMediaRecorder::isAvailable() const { - return availability() == QMultimedia::Available; -} - -/*! - Returns the availability of this functionality. -*/ -QMultimedia::AvailabilityStatus QMediaRecorder::availability() const -{ - if (d_func()->control == nullptr) - return QMultimedia::ServiceMissing; - - return QMultimedia::Available; + return d_func()->control != nullptr; } QUrl QMediaRecorder::outputLocation() const diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h index 89bc20fcf..94bc2a18b 100644 --- a/src/multimedia/recording/qmediarecorder.h +++ b/src/multimedia/recording/qmediarecorder.h @@ -42,7 +42,6 @@ #include <QtCore/qobject.h> #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qmultimedia.h> #include <QtMultimedia/qmediaencodersettings.h> #include <QtMultimedia/qmediaenumdebug.h> #include <QtMultimedia/qmediametadata.h> @@ -119,7 +118,6 @@ public: void removePropertyWatch(QByteArray const &name); bool isAvailable() const; - QMultimedia::AvailabilityStatus availability() const; QUrl outputLocation() const; bool setOutputLocation(const QUrl &location); diff --git a/src/multimedia/video/qabstractvideobuffer_p.h b/src/multimedia/video/qabstractvideobuffer_p.h index bc4eee40e..7795b7c11 100644 --- a/src/multimedia/video/qabstractvideobuffer_p.h +++ b/src/multimedia/video/qabstractvideobuffer_p.h @@ -41,7 +41,6 @@ #define QABSTRACTVIDEOBUFFER_H #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qmultimedia.h> #include <QtMultimedia/qvideoframe.h> #include <QtCore/qmetatype.h> diff --git a/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp b/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp index 05b371d83..b599cdbf5 100644 --- a/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp +++ b/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp @@ -83,7 +83,6 @@ void tst_QAudioRecorder::testNullService() QMediaRecorder source; QVERIFY(!source.isAvailable()); - QCOMPARE(source.availability(), QMultimedia::ServiceMissing); QCOMPARE(source.audioInput(), QAudioDeviceInfo()); } @@ -96,7 +95,6 @@ void tst_QAudioRecorder::testNullControl() service->hasControls = false; QVERIFY(!source.isAvailable()); - QCOMPARE(source.availability(), QMultimedia::ServiceMissing); QCOMPARE(source.audioInput(), QAudioDeviceInfo()); @@ -135,7 +133,6 @@ void tst_QAudioRecorder::testAvailability() QMediaRecorder source; QVERIFY(source.isAvailable()); - QCOMPARE(source.availability(), QMultimedia::Available); } QTEST_GUILESS_MAIN(tst_QAudioRecorder) diff --git a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp index 202af42d8..a9a94b7c5 100644 --- a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp @@ -540,9 +540,9 @@ void tst_QCamera::testImageSettings() QVERIFY(settings != QImageEncoderSettings()); settings = QImageEncoderSettings(); - QCOMPARE(settings.quality(), QMultimedia::NormalQuality); - settings.setQuality(QMultimedia::HighQuality); - QCOMPARE(settings.quality(), QMultimedia::HighQuality); + QCOMPARE(settings.quality(), QImageEncoderSettings::NormalQuality); + settings.setQuality(QImageEncoderSettings::HighQuality); + QCOMPARE(settings.quality(), QImageEncoderSettings::HighQuality); QVERIFY(!settings.isNull()); settings = QImageEncoderSettings(); @@ -570,7 +570,7 @@ void tst_QCamera::testImageSettings() settings = QImageEncoderSettings(); QVERIFY(settings.isNull()); QCOMPARE(settings.format(), QImageEncoderSettings::UnspecifiedFormat); - QCOMPARE(settings.quality(), QMultimedia::NormalQuality); + QCOMPARE(settings.quality(), QImageEncoderSettings::NormalQuality); QCOMPARE(settings.resolution(), QSize()); QVERIFY(settings.encodingOptions().isEmpty()); @@ -583,7 +583,7 @@ void tst_QCamera::testImageSettings() QCOMPARE(settings2, settings1); QVERIFY(settings2.isNull()); - settings1.setQuality(QMultimedia::HighQuality); + settings1.setQuality(QImageEncoderSettings::HighQuality); QVERIFY(settings2.isNull()); QVERIFY(!settings1.isNull()); @@ -599,7 +599,7 @@ void tst_QCamera::testImageSettings() QCOMPARE(settings2, settings1); QVERIFY(settings2.isNull()); - settings1.setQuality(QMultimedia::HighQuality); + settings1.setQuality(QImageEncoderSettings::HighQuality); QVERIFY(settings2.isNull()); QVERIFY(!settings1.isNull()); @@ -626,11 +626,11 @@ void tst_QCamera::testImageSettings() QVERIFY(settings1 != settings2); settings1 = QImageEncoderSettings(); - settings1.setQuality(QMultimedia::NormalQuality); + settings1.setQuality(QImageEncoderSettings::NormalQuality); settings2 = QImageEncoderSettings(); - settings2.setQuality(QMultimedia::NormalQuality); + settings2.setQuality(QImageEncoderSettings::NormalQuality); QVERIFY(settings1 == settings2); - settings2.setQuality(QMultimedia::LowQuality); + settings2.setQuality(QImageEncoderSettings::LowQuality); QVERIFY(settings1 != settings2); settings1 = QImageEncoderSettings(); diff --git a/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp b/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp index 2054067cf..6c8fb8456 100644 --- a/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp +++ b/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp @@ -204,11 +204,11 @@ void tst_QCameraImageCapture::encodingSettings() QVERIFY(imageCapture.encodingSettings() == QImageEncoderSettings()); QImageEncoderSettings settings; settings.setFormat(QImageEncoderSettings::JPEG); - settings.setQuality(QMultimedia::NormalQuality); + settings.setQuality(QImageEncoderSettings::NormalQuality); imageCapture.setEncodingSettings(settings); QVERIFY(!imageCapture.encodingSettings().isNull()); QVERIFY(imageCapture.encodingSettings().format() == QImageEncoderSettings::JPEG); - QVERIFY(imageCapture.encodingSettings().quality() == QMultimedia::NormalQuality); + QVERIFY(imageCapture.encodingSettings().quality() == QImageEncoderSettings::NormalQuality); } //MaemoAPI-1830:test errors @@ -222,19 +222,16 @@ void tst_QCameraImageCapture::errors() imageCapture1.capture(QString::fromLatin1("/dev/null")); QVERIFY(imageCapture1.error() == QCameraImageCapture::NotSupportedFeatureError); QVERIFY2(!imageCapture1.errorString().isEmpty(), "Device does not support images capture"); - QVERIFY(imageCapture1.availability() == QMultimedia::ServiceMissing); QCamera camera; QCameraImageCapture imageCapture(&camera); QVERIFY(imageCapture.isAvailable() == true); QVERIFY(imageCapture.error() == QCameraImageCapture::NoError); QVERIFY(imageCapture.errorString().isEmpty()); - QVERIFY(imageCapture.availability() == QMultimedia::Available); imageCapture.capture(); QVERIFY(imageCapture.error() == QCameraImageCapture::NotReadyError); QVERIFY2(!imageCapture.errorString().isEmpty(), "Could not capture in stopped state"); - QVERIFY(imageCapture.availability() == QMultimedia::Available); MockMediaRecorderService::simpleCamera = false; } diff --git a/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp index 122b20560..9374d7f8d 100644 --- a/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp +++ b/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp @@ -144,7 +144,7 @@ void tst_QMediaRecorder::testNullControls() QMediaEncoderSettings settings; settings.setFormat(QMediaFormat::MPEG4); settings.setAudioCodec(QMediaFormat::AudioCodec::AAC); - settings.setQuality(QMultimedia::LowQuality); + settings.setQuality(QMediaEncoderSettings::LowQuality); settings.setVideoCodec(QMediaFormat::VideoCodec::VP9); settings.setVideoResolution(640, 480); @@ -336,18 +336,18 @@ void tst_QMediaRecorder::testEncodingSettings() // QCOMPARE(audioSettings.codec(), QString("audio/x-raw")); // QCOMPARE(audioSettings.bitRate(), 128*1024); // QCOMPARE(audioSettings.sampleRate(), 8000); -// QCOMPARE(audioSettings.quality(), QMultimedia::NormalQuality); +// QCOMPARE(audioSettings.quality(), QMediaEncoderSettings:NormalQuality); // QCOMPARE(audioSettings.channelCount(), -1); -// QCOMPARE(audioSettings.encodingMode(), QMultimedia::ConstantQualityEncoding); +// QCOMPARE(audioSettings.encodingMode(), QMediaEncoderSettings:ConstantQualityEncoding); // QVideoEncoderSettings videoSettings = capture->videoSettings(); // QCOMPARE(videoSettings.codec(), QString()); // QCOMPARE(videoSettings.bitRate(), -1); // QCOMPARE(videoSettings.resolution(), QSize()); // QCOMPARE(videoSettings.frameRate(), 0.0); -// QCOMPARE(videoSettings.quality(), QMultimedia::NormalQuality); -// QCOMPARE(videoSettings.encodingMode(), QMultimedia::ConstantQualityEncoding); +// QCOMPARE(videoSettings.quality(), QMediaEncoderSettings:NormalQuality); +// QCOMPARE(videoSettings.encodingMode(), QMediaEncoderSettings:ConstantQualityEncoding); // QString format = capture->containerFormat(); // QCOMPARE(format, QString()); @@ -355,15 +355,15 @@ void tst_QMediaRecorder::testEncodingSettings() // audioSettings.setCodec("audio/mpeg"); // audioSettings.setSampleRate(44100); // audioSettings.setBitRate(256*1024); -// audioSettings.setQuality(QMultimedia::HighQuality); -// audioSettings.setEncodingMode(QMultimedia::AverageBitRateEncoding); +// audioSettings.setQuality(QMediaEncoderSettings:HighQuality); +// audioSettings.setEncodingMode(QMediaEncoderSettings:AverageBitRateEncoding); // videoSettings.setCodec("video/3gpp"); // videoSettings.setBitRate(800); // videoSettings.setFrameRate(24*1024); // videoSettings.setResolution(QSize(800,600)); -// videoSettings.setQuality(QMultimedia::HighQuality); -// audioSettings.setEncodingMode(QMultimedia::TwoPassEncoding); +// videoSettings.setQuality(QMediaEncoderSettings:HighQuality); +// audioSettings.setEncodingMode(QMediaEncoderSettings:TwoPassEncoding); // format = QString("mov"); @@ -395,9 +395,9 @@ void tst_QMediaRecorder::testAudioSettings() // QVERIFY(!settings.isNull()); // settings = QAudioEncoderSettings(); -// QCOMPARE(settings.quality(), QMultimedia::NormalQuality); -// settings.setQuality(QMultimedia::HighQuality); -// QCOMPARE(settings.quality(), QMultimedia::HighQuality); +// QCOMPARE(settings.quality(), QMediaEncoderSettings:NormalQuality); +// settings.setQuality(QMediaEncoderSettings:HighQuality); +// QCOMPARE(settings.quality(), QMediaEncoderSettings:HighQuality); // QVERIFY(!settings.isNull()); // settings = QAudioEncoderSettings(); @@ -430,7 +430,7 @@ void tst_QMediaRecorder::testAudioSettings() // QVERIFY(settings.isNull()); // QCOMPARE(settings.codec(), QString()); // QCOMPARE(settings.bitRate(), -1); -// QCOMPARE(settings.quality(), QMultimedia::NormalQuality); +// QCOMPARE(settings.quality(), QMediaEncoderSettings:NormalQuality); // QCOMPARE(settings.sampleRate(), -1); // QVERIFY(settings.encodingOptions().isEmpty()); @@ -443,7 +443,7 @@ void tst_QMediaRecorder::testAudioSettings() // QCOMPARE(settings2, settings1); // QVERIFY(settings2.isNull()); -// settings1.setQuality(QMultimedia::HighQuality); +// settings1.setQuality(QMediaEncoderSettings:HighQuality); // QVERIFY(settings2.isNull()); // QVERIFY(!settings1.isNull()); @@ -459,7 +459,7 @@ void tst_QMediaRecorder::testAudioSettings() // QCOMPARE(settings2, settings1); // QVERIFY(settings2.isNull()); -// settings1.setQuality(QMultimedia::HighQuality); +// settings1.setQuality(QMediaEncoderSettings:HighQuality); // QVERIFY(settings2.isNull()); // QVERIFY(!settings1.isNull()); @@ -491,19 +491,19 @@ void tst_QMediaRecorder::testAudioSettings() // QVERIFY(settings1 != settings2); // settings1 = QAudioEncoderSettings(); -// settings1.setEncodingMode(QMultimedia::ConstantBitRateEncoding); +// settings1.setEncodingMode(QMediaEncoderSettings:ConstantBitRateEncoding); // settings2 = QAudioEncoderSettings(); -// settings2.setEncodingMode(QMultimedia::ConstantBitRateEncoding); +// settings2.setEncodingMode(QMediaEncoderSettings:ConstantBitRateEncoding); // QVERIFY(settings1 == settings2); -// settings2.setEncodingMode(QMultimedia::TwoPassEncoding); +// settings2.setEncodingMode(QMediaEncoderSettings:TwoPassEncoding); // QVERIFY(settings1 != settings2); // settings1 = QAudioEncoderSettings(); -// settings1.setQuality(QMultimedia::NormalQuality); +// settings1.setQuality(QMediaEncoderSettings:NormalQuality); // settings2 = QAudioEncoderSettings(); -// settings2.setQuality(QMultimedia::NormalQuality); +// settings2.setQuality(QMediaEncoderSettings:NormalQuality); // QVERIFY(settings1 == settings2); -// settings2.setQuality(QMultimedia::LowQuality); +// settings2.setQuality(QMediaEncoderSettings:LowQuality); // QVERIFY(settings1 != settings2); // settings1 = QAudioEncoderSettings(); @@ -542,9 +542,9 @@ void tst_QMediaRecorder::testVideoSettings() // QVERIFY(!settings.isNull()); // settings = QVideoEncoderSettings(); -// QCOMPARE(settings.quality(), QMultimedia::NormalQuality); -// settings.setQuality(QMultimedia::HighQuality); -// QCOMPARE(settings.quality(), QMultimedia::HighQuality); +// QCOMPARE(settings.quality(), QMediaEncoderSettings:NormalQuality); +// settings.setQuality(QMediaEncoderSettings:HighQuality); +// QCOMPARE(settings.quality(), QMediaEncoderSettings:HighQuality); // QVERIFY(!settings.isNull()); // settings = QVideoEncoderSettings(); @@ -581,7 +581,7 @@ void tst_QMediaRecorder::testVideoSettings() // QVERIFY(settings.isNull()); // QCOMPARE(settings.codec(), QString()); // QCOMPARE(settings.bitRate(), -1); -// QCOMPARE(settings.quality(), QMultimedia::NormalQuality); +// QCOMPARE(settings.quality(), QMediaEncoderSettings:NormalQuality); // QCOMPARE(settings.frameRate(), qreal()); // QCOMPARE(settings.resolution(), QSize()); // QVERIFY(settings.encodingOptions().isEmpty()); @@ -595,7 +595,7 @@ void tst_QMediaRecorder::testVideoSettings() // QCOMPARE(settings2, settings1); // QVERIFY(settings2.isNull()); -// settings1.setQuality(QMultimedia::HighQuality); +// settings1.setQuality(QMediaEncoderSettings:HighQuality); // QVERIFY(settings2.isNull()); // QVERIFY(!settings1.isNull()); @@ -611,7 +611,7 @@ void tst_QMediaRecorder::testVideoSettings() // QCOMPARE(settings2, settings1); // QVERIFY(settings2.isNull()); -// settings1.setQuality(QMultimedia::HighQuality); +// settings1.setQuality(QMediaEncoderSettings:HighQuality); // QVERIFY(settings2.isNull()); // QVERIFY(!settings1.isNull()); @@ -643,19 +643,19 @@ void tst_QMediaRecorder::testVideoSettings() // QVERIFY(settings1 != settings2); // settings1 = QVideoEncoderSettings(); -// settings1.setEncodingMode(QMultimedia::ConstantBitRateEncoding); +// settings1.setEncodingMode(QMediaEncoderSettings:ConstantBitRateEncoding); // settings2 = QVideoEncoderSettings(); -// settings2.setEncodingMode(QMultimedia::ConstantBitRateEncoding); +// settings2.setEncodingMode(QMediaEncoderSettings:ConstantBitRateEncoding); // QVERIFY(settings1 == settings2); -// settings2.setEncodingMode(QMultimedia::TwoPassEncoding); +// settings2.setEncodingMode(QMediaEncoderSettings:TwoPassEncoding); // QVERIFY(settings1 != settings2); // settings1 = QVideoEncoderSettings(); -// settings1.setQuality(QMultimedia::NormalQuality); +// settings1.setQuality(QMediaEncoderSettings:NormalQuality); // settings2 = QVideoEncoderSettings(); -// settings2.setQuality(QMultimedia::NormalQuality); +// settings2.setQuality(QMediaEncoderSettings:NormalQuality); // QVERIFY(settings1 == settings2); -// settings2.setQuality(QMultimedia::LowQuality); +// settings2.setQuality(QMediaEncoderSettings:LowQuality); // QVERIFY(settings1 != settings2); // settings1 = QVideoEncoderSettings(); @@ -690,7 +690,7 @@ void tst_QMediaRecorder::testSettingsApplied() // recorder.setVideoSettings(videoSettings); // QAudioEncoderSettings audioSettings; -// audioSettings.setQuality(QMultimedia::HighQuality); +// audioSettings.setQuality(QMediaEncoderSettings:HighQuality); // recorder.setAudioSettings(audioSettings); // recorder.setContainerFormat("mkv"); @@ -699,7 +699,7 @@ void tst_QMediaRecorder::testSettingsApplied() // QTRY_COMPARE(mock->m_settingAppliedCount, 2); // //encoder settings are applied before recording if changed -// audioSettings.setQuality(QMultimedia::VeryHighQuality); +// audioSettings.setQuality(QMediaEncoderSettings:VeryHighQuality); // recorder.setAudioSettings(audioSettings); // QCOMPARE(mock->m_settingAppliedCount, 2); @@ -742,8 +742,8 @@ void tst_QMediaRecorder::testAudioSettingsCopyConstructor() // audiosettings.setBitRate(128*1000); // audiosettings.setChannelCount(4); // audiosettings.setCodec("audio/x-raw"); -// audiosettings.setEncodingMode(QMultimedia::ConstantBitRateEncoding); -// audiosettings.setQuality(QMultimedia::LowQuality); +// audiosettings.setEncodingMode(QMediaEncoderSettings:ConstantBitRateEncoding); +// audiosettings.setQuality(QMediaEncoderSettings:LowQuality); // audiosettings.setSampleRate(44100); // /* Copy constructor */ @@ -772,16 +772,16 @@ void tst_QMediaRecorder::testAudioSettingsOperatorNotEqual() // audiosettings1.setBitRate(128*1000); // audiosettings1.setChannelCount(4); // audiosettings1.setCodec("audio/x-raw"); -// audiosettings1.setEncodingMode(QMultimedia::ConstantBitRateEncoding); -// audiosettings1.setQuality(QMultimedia::LowQuality); +// audiosettings1.setEncodingMode(QMediaEncoderSettings:ConstantBitRateEncoding); +// audiosettings1.setQuality(QMediaEncoderSettings:LowQuality); // audiosettings1.setSampleRate(44100); // /* setting the desired properties for the AudioEncoder */ // audiosettings2.setBitRate(128*1000); // audiosettings2.setChannelCount(4); // audiosettings2.setCodec("audio/x-raw"); -// audiosettings2.setEncodingMode(QMultimedia::ConstantBitRateEncoding); -// audiosettings2.setQuality(QMultimedia::LowQuality); +// audiosettings2.setEncodingMode(QMediaEncoderSettings:ConstantBitRateEncoding); +// audiosettings2.setQuality(QMediaEncoderSettings:LowQuality); // audiosettings2.setSampleRate(44100); // /* verify the both are equal or not */ @@ -789,7 +789,7 @@ void tst_QMediaRecorder::testAudioSettingsOperatorNotEqual() // /* Modify the settings value for one object */ // audiosettings2.setBitRate(64*1000); -// audiosettings2.setEncodingMode(QMultimedia::ConstantQualityEncoding); +// audiosettings2.setEncodingMode(QMediaEncoderSettings:ConstantQualityEncoding); // /* verify the not equal opertor */ // QVERIFY(audiosettings1 != audiosettings2); @@ -808,8 +808,8 @@ void tst_QMediaRecorder::testAudioSettingsOperatorEqual() // audiosettings1.setBitRate(128*1000); // audiosettings1.setChannelCount(4); // audiosettings1.setCodec("audio/x-raw"); -// audiosettings1.setEncodingMode(QMultimedia::ConstantBitRateEncoding); -// audiosettings1.setQuality(QMultimedia::LowQuality); +// audiosettings1.setEncodingMode(QMediaEncoderSettings:ConstantBitRateEncoding); +// audiosettings1.setQuality(QMediaEncoderSettings:LowQuality); // audiosettings1.setSampleRate(44100); // QAudioEncoderSettings audiosettings2; @@ -819,8 +819,8 @@ void tst_QMediaRecorder::testAudioSettingsOperatorEqual() // audiosettings2.setBitRate(128*1000); // audiosettings2.setChannelCount(4); // audiosettings2.setCodec("audio/x-raw"); -// audiosettings2.setEncodingMode(QMultimedia::ConstantBitRateEncoding); -// audiosettings2.setQuality(QMultimedia::LowQuality); +// audiosettings2.setEncodingMode(QMediaEncoderSettings:ConstantBitRateEncoding); +// audiosettings2.setQuality(QMediaEncoderSettings:LowQuality); // audiosettings2.setSampleRate(44100); // /* verify both the values are same or not */ @@ -840,8 +840,8 @@ void tst_QMediaRecorder::testAudioSettingsOperatorAssign() // audiosettings1.setBitRate(128*1000); // audiosettings1.setChannelCount(4); // audiosettings1.setCodec("audio/x-raw"); -// audiosettings1.setEncodingMode(QMultimedia::ConstantBitRateEncoding); -// audiosettings1.setQuality(QMultimedia::LowQuality); +// audiosettings1.setEncodingMode(QMediaEncoderSettings:ConstantBitRateEncoding); +// audiosettings1.setQuality(QMediaEncoderSettings:LowQuality); // audiosettings1.setSampleRate(44100); // QAudioEncoderSettings audiosettings2; @@ -872,14 +872,12 @@ void tst_QMediaRecorder::testAvailabilityStatus() { QCamera object; QMediaRecorder recorder(&object); - QCOMPARE(recorder.availability(), QMultimedia::ServiceMissing); QCOMPARE(recorder.isAvailable(), false); } { mockIntegration->createCaptureInterface(QMediaRecorder::AudioAndVideo); QCamera object1; QMediaRecorder recorder1(&object1); - QCOMPARE(recorder1.availability(), QMultimedia::Available); QCOMPARE(recorder1.isAvailable(), true); } { @@ -887,7 +885,6 @@ void tst_QMediaRecorder::testAvailabilityStatus() QCamera object1; QMediaRecorder recorder1(&object1); - QCOMPARE(recorder1.availability(), QMultimedia::Available); QCOMPARE(recorder1.isAvailable(), true); } } @@ -946,21 +943,21 @@ void tst_QMediaRecorder::testVideoSettingsQuality() // QVERIFY(settings == QVideoEncoderSettings()); // /* Verify the default value is intialised correctly*/ -// QCOMPARE(settings.quality(), QMultimedia::NormalQuality); +// QCOMPARE(settings.quality(), QMediaEncoderSettings:NormalQuality); // /* Set all types of Quality parameter and Verify if it is set correctly*/ -// settings.setQuality(QMultimedia::HighQuality); -// QCOMPARE(settings.quality(), QMultimedia::HighQuality); +// settings.setQuality(QMediaEncoderSettings:HighQuality); +// QCOMPARE(settings.quality(), QMediaEncoderSettings:HighQuality); // QVERIFY(!settings.isNull()); -// settings.setQuality(QMultimedia::VeryLowQuality); -// QCOMPARE(settings.quality(), QMultimedia::VeryLowQuality); +// settings.setQuality(QMediaEncoderSettings:VeryLowQuality); +// QCOMPARE(settings.quality(), QMediaEncoderSettings:VeryLowQuality); -// settings.setQuality(QMultimedia::LowQuality); -// QCOMPARE(settings.quality(), QMultimedia::LowQuality); +// settings.setQuality(QMediaEncoderSettings:LowQuality); +// QCOMPARE(settings.quality(), QMediaEncoderSettings:LowQuality); -// settings.setQuality(QMultimedia::VeryHighQuality); -// QCOMPARE(settings.quality(), QMultimedia::VeryHighQuality); +// settings.setQuality(QMediaEncoderSettings:VeryHighQuality); +// QCOMPARE(settings.quality(), QMediaEncoderSettings:VeryHighQuality); } /* Test QVideoEncoderSettings encodingMode */ @@ -972,19 +969,19 @@ void tst_QMediaRecorder::testVideoSettingsEncodingMode() // QVERIFY(settings == QVideoEncoderSettings()); // /* Verify the default values are initialised correctly*/ -// QCOMPARE(settings.encodingMode(), QMultimedia::ConstantQualityEncoding); +// QCOMPARE(settings.encodingMode(), QMediaEncoderSettings:ConstantQualityEncoding); // QVERIFY(settings.isNull()); // /* Set each type of encoding mode and Verify if it is set correctly*/ -// settings.setEncodingMode(QMultimedia::ConstantBitRateEncoding); -// QCOMPARE(settings.encodingMode(),QMultimedia::ConstantBitRateEncoding); +// settings.setEncodingMode(QMediaEncoderSettings:ConstantBitRateEncoding); +// QCOMPARE(settings.encodingMode(),QMediaEncoderSettings:ConstantBitRateEncoding); // QVERIFY(!settings.isNull()); -// settings.setEncodingMode(QMultimedia::AverageBitRateEncoding); -// QCOMPARE(settings.encodingMode(), QMultimedia::AverageBitRateEncoding); +// settings.setEncodingMode(QMediaEncoderSettings:AverageBitRateEncoding); +// QCOMPARE(settings.encodingMode(), QMediaEncoderSettings:AverageBitRateEncoding); -// settings.setEncodingMode(QMultimedia::TwoPassEncoding); -// QCOMPARE(settings.encodingMode(), QMultimedia::TwoPassEncoding); +// settings.setEncodingMode(QMediaEncoderSettings:TwoPassEncoding); +// QCOMPARE(settings.encodingMode(), QMediaEncoderSettings:TwoPassEncoding); } /* Test QVideoEncoderSettings copy constructor */ @@ -994,8 +991,8 @@ void tst_QMediaRecorder::testVideoSettingsCopyConstructor() // QVideoEncoderSettings settings1; // settings1.setCodec(QLatin1String("codecName")); // settings1.setBitRate(128000); -// settings1.setQuality(QMultimedia::HighQuality); -// settings1.setEncodingMode(QMultimedia::ConstantBitRateEncoding); +// settings1.setQuality(QMediaEncoderSettings:HighQuality); +// settings1.setEncodingMode(QMediaEncoderSettings:ConstantBitRateEncoding); // settings1.setFrameRate(30000.0/10001); // settings1.setResolution(QSize(320,240)); @@ -1006,10 +1003,10 @@ void tst_QMediaRecorder::testVideoSettingsCopyConstructor() // QCOMPARE(settings2 != settings1, false); // QCOMPARE(settings2.codec(), QLatin1String("codecName")); // QCOMPARE(settings2.bitRate(), 128000); -// QCOMPARE(settings2.encodingMode(), QMultimedia::ConstantBitRateEncoding); +// QCOMPARE(settings2.encodingMode(), QMediaEncoderSettings:ConstantBitRateEncoding); // QVERIFY(qFuzzyCompare(settings2.frameRate(), qreal(30000.0/10001))); // QCOMPARE(settings2.resolution(), QSize(320,240)); -// QCOMPARE(settings2.quality(), QMultimedia::HighQuality); +// QCOMPARE(settings2.quality(), QMediaEncoderSettings:HighQuality); // /* Verify both the instances are equal*/ // QCOMPARE(settings2, settings1); @@ -1028,10 +1025,10 @@ void tst_QMediaRecorder::testVideoSettingsOperatorAssignment() // /* Initialize all the parameters */ // settings1.setCodec(QLatin1String("codecName")); // settings1.setBitRate(128000); -// settings1.setEncodingMode(QMultimedia::ConstantBitRateEncoding); +// settings1.setEncodingMode(QMediaEncoderSettings:ConstantBitRateEncoding); // settings1.setFrameRate(30000.0/10001); // settings1.setResolution(QSize(320,240)); -// settings1.setQuality(QMultimedia::HighQuality); +// settings1.setQuality(QMediaEncoderSettings:HighQuality); // /* Assign one object to other*/ // settings2 = settings1; @@ -1039,10 +1036,10 @@ void tst_QMediaRecorder::testVideoSettingsOperatorAssignment() // QCOMPARE(settings2, settings1); // QCOMPARE(settings2.codec(), QLatin1String("codecName")); // QCOMPARE(settings2.bitRate(), 128000); -// QCOMPARE(settings2.encodingMode(), QMultimedia::ConstantBitRateEncoding); +// QCOMPARE(settings2.encodingMode(), QMediaEncoderSettings:ConstantBitRateEncoding); // QVERIFY(qFuzzyCompare(settings2.frameRate(), qreal(30000.0/10001))); // QCOMPARE(settings2.resolution(), QSize(320,240)); -// QCOMPARE(settings2.quality(), QMultimedia::HighQuality); +// QCOMPARE(settings2.quality(), QMediaEncoderSettings:HighQuality); // QCOMPARE(settings2, settings1); // QVERIFY(!settings2.isNull()); } @@ -1085,23 +1082,23 @@ void tst_QMediaRecorder::testVideoSettingsOperatorNotEqual() // /* Verify EncodingMode with not equal operator*/ // settings1 = QVideoEncoderSettings(); -// settings1.setEncodingMode(QMultimedia::ConstantBitRateEncoding); +// settings1.setEncodingMode(QMediaEncoderSettings:ConstantBitRateEncoding); // settings2 = QVideoEncoderSettings(); -// settings2.setEncodingMode(QMultimedia::ConstantBitRateEncoding); +// settings2.setEncodingMode(QMediaEncoderSettings:ConstantBitRateEncoding); // /* OperatorNotEqual returns false when both objects are equal*/ // QCOMPARE(settings1 != settings2, false); -// settings2.setEncodingMode(QMultimedia::TwoPassEncoding); +// settings2.setEncodingMode(QMediaEncoderSettings:TwoPassEncoding); // /* OperatorNotEqual returns true when both objects are not equal*/ // QVERIFY(settings1 != settings2); // /* Verify Quality with not equal operator*/ // settings1 = QVideoEncoderSettings(); -// settings1.setQuality(QMultimedia::NormalQuality); +// settings1.setQuality(QMediaEncoderSettings:NormalQuality); // settings2 = QVideoEncoderSettings(); -// settings2.setQuality(QMultimedia::NormalQuality); +// settings2.setQuality(QMediaEncoderSettings:NormalQuality); // /* OperatorNotEqual returns false when both objects are equal*/ // QCOMPARE(settings1 != settings2, false); -// settings2.setQuality(QMultimedia::LowQuality); +// settings2.setQuality(QMediaEncoderSettings:LowQuality); // /* OperatorNotEqual returns true when both objects are not equal*/ // QVERIFY(settings1 != settings2); @@ -1156,23 +1153,23 @@ void tst_QMediaRecorder::testVideoSettingsOperatorComparison() // /* Verify EncodingMode with comparison operator*/ // settings1 = QVideoEncoderSettings(); -// settings1.setEncodingMode(QMultimedia::ConstantBitRateEncoding); +// settings1.setEncodingMode(QMediaEncoderSettings:ConstantBitRateEncoding); // settings2 = QVideoEncoderSettings(); -// settings2.setEncodingMode(QMultimedia::ConstantBitRateEncoding); +// settings2.setEncodingMode(QMediaEncoderSettings:ConstantBitRateEncoding); // /* Comparison operator returns true when both objects are equal*/ // QVERIFY(settings1 == settings2); -// settings2.setEncodingMode(QMultimedia::TwoPassEncoding); +// settings2.setEncodingMode(QMediaEncoderSettings:TwoPassEncoding); // /* Comparison operator returns false when both objects are not equal*/ // QCOMPARE(settings1 == settings2, false); // /* Verify Quality with comparison operator*/ // settings1 = QVideoEncoderSettings(); -// settings1.setQuality(QMultimedia::NormalQuality); +// settings1.setQuality(QMediaEncoderSettings:NormalQuality); // settings2 = QVideoEncoderSettings(); -// settings2.setQuality(QMultimedia::NormalQuality); +// settings2.setQuality(QMediaEncoderSettings:NormalQuality); // /* Comparison operator returns true when both objects are equal*/ // QVERIFY(settings1 == settings2); -// settings2.setQuality(QMultimedia::LowQuality); +// settings2.setQuality(QMediaEncoderSettings:LowQuality); // /* Comparison operator returns false when both objects are not equal*/ // QCOMPARE(settings1 == settings2, false); |