diff options
Diffstat (limited to 'tests/auto')
9 files changed, 150 insertions, 690 deletions
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index 428c06dcb..75e06a4a4 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -60,8 +60,8 @@ public slots: void cleanupTestCase(); private slots: - void testCameraInfo(); - void testCtorWithCameraInfo(); + void testCameraDevice(); + void testCtorWithCameraDevice(); void testCtorWithPosition(); void testCameraStates(); @@ -88,7 +88,7 @@ void tst_QCameraBackend::cleanupTestCase() { } -void tst_QCameraBackend::testCameraInfo() +void tst_QCameraBackend::testCameraDevice() { const QList<QCameraDevice> cameras = QMediaDevices::videoInputs(); if (cameras.isEmpty()) { @@ -104,13 +104,13 @@ void tst_QCameraBackend::testCameraInfo() } } -void tst_QCameraBackend::testCtorWithCameraInfo() +void tst_QCameraBackend::testCtorWithCameraDevice() { { - // loading an invalid CameraInfo should fail + // loading an invalid CameraDevice should fail QCamera camera(QCameraDevice{}); QCOMPARE(camera.error(), QCamera::CameraError); - QVERIFY(camera.cameraInfo().isNull()); + QVERIFY(camera.cameraDevice().isNull()); } if (noCamera) @@ -120,13 +120,13 @@ void tst_QCameraBackend::testCtorWithCameraInfo() QCameraDevice info = QMediaDevices::defaultVideoInput(); QCamera camera(info); QCOMPARE(camera.error(), QCamera::NoError); - QCOMPARE(camera.cameraInfo(), info); + QCOMPARE(camera.cameraDevice(), info); } { QCameraDevice info = QMediaDevices::videoInputs().first(); QCamera camera(info); QCOMPARE(camera.error(), QCamera::NoError); - QCOMPARE(camera.cameraInfo(), info); + QCOMPARE(camera.cameraDevice(), info); } } @@ -157,7 +157,7 @@ void tst_QCameraBackend::testCameraStates() { QMediaCaptureSession session; QCamera camera; - camera.setCameraInfo(QCameraDevice()); + camera.setCameraDevice(QCameraDevice()); QCameraImageCapture imageCapture; session.setCamera(&camera); session.setImageCapture(&imageCapture); @@ -175,7 +175,7 @@ void tst_QCameraBackend::testCameraStates() if (noCamera) QSKIP("No camera available"); - camera.setCameraInfo(QMediaDevices::defaultVideoInput()); + camera.setCameraDevice(QMediaDevices::defaultVideoInput()); QCOMPARE(camera.error(), QCamera::NoError); camera.start(); @@ -461,9 +461,7 @@ void tst_QCameraBackend::testVideoRecording() QSignalSpy recorderErrorSignal(&recorder, SIGNAL(errorOccurred(Error, const QString &))); QSignalSpy recorderStatusSignal(&recorder, SIGNAL(statusChanged(Status))); - QMediaEncoderSettings videoSettings; - videoSettings.setVideoResolution(320, 240); - recorder.setEncoderSettings(videoSettings); + recorder.setVideoResolution(320, 240); QCOMPARE(recorder.status(), QMediaRecorder::StoppedStatus); diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp index 0a4897c25..d58c33ab6 100644 --- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp +++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp @@ -1080,7 +1080,7 @@ void tst_QMediaPlayerBackend::playFromBuffer() QFile file(localVideoFile.toLocalFile()); if (!file.open(QIODevice::ReadOnly)) QSKIP("Could not open file"); - player.setSource(localVideoFile, &file); + player.setSourceDevice(&file, localVideoFile); player.play(); QTRY_VERIFY(player.position() >= 1000); QVERIFY2(surface.m_totalFrames >= 25, qPrintable(QString("Expected >= 25, got %1").arg(surface.m_totalFrames))); diff --git a/tests/auto/unit/mockbackend/qmockaudiooutput.h b/tests/auto/unit/mockbackend/qmockaudiooutput.h index 02245a7a3..30cc46604 100644 --- a/tests/auto/unit/mockbackend/qmockaudiooutput.h +++ b/tests/auto/unit/mockbackend/qmockaudiooutput.h @@ -58,16 +58,6 @@ class QMockAudioOutput : public QPlatformAudioOutput { public: QMockAudioOutput(QAudioOutput *qq) : QPlatformAudioOutput(qq) {} - - virtual QList<QAudio::Role> supportedAudioRoles() const { - if (!hasAudioRole) - return {}; - return QList<QAudio::Role>() << QAudio::MusicRole - << QAudio::AlarmRole - << QAudio::NotificationRole; - } - - bool hasAudioRole = true; }; QT_END_NAMESPACE diff --git a/tests/auto/unit/mockbackend/qmockcamera.h b/tests/auto/unit/mockbackend/qmockcamera.h index ac0329c68..f10c972f9 100644 --- a/tests/auto/unit/mockbackend/qmockcamera.h +++ b/tests/auto/unit/mockbackend/qmockcamera.h @@ -56,8 +56,8 @@ public: if (!simpleCamera) { minIsoChanged(100); maxIsoChanged(800); - minShutterSpeedChanged(.001f); - maxShutterSpeedChanged(1.f); + minExposureTimeChanged(.001f); + maxExposureTimeChanged(1.f); exposureCompensationRangeChanged(-2, 2); maximumZoomFactorChanged(4.); setFlashMode(QCamera::FlashAuto); diff --git a/tests/auto/unit/multimedia/qcamera/CMakeLists.txt b/tests/auto/unit/multimedia/qcamera/CMakeLists.txt index c1de3d65f..6a78fd572 100644 --- a/tests/auto/unit/multimedia/qcamera/CMakeLists.txt +++ b/tests/auto/unit/multimedia/qcamera/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qcamera Test: ##################################################################### -qt_internal_add_test(tst_qmultimediacamera +qt_internal_add_test(tst_qcamera SOURCES tst_qcamera.cpp INCLUDE_DIRECTORIES diff --git a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp index 5e227f64a..2137ac4ca 100644 --- a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp @@ -173,8 +173,8 @@ void tst_QCamera::testSimpleCameraExposure() QCOMPARE(camera.isoSensitivity(), -1); QVERIFY(camera.exposureTime() < 0); - QCOMPARE(camera.minimumShutterSpeed(), -1.); - QCOMPARE(camera.maximumShutterSpeed(), -1.); + QCOMPARE(camera.minimumExposureTime(), -1.); + QCOMPARE(camera.maximumExposureTime(), -1.); camera.setAutoExposureTime(); QVERIFY(camera.exposureTime() < 0); camera.setManualExposureTime(1/128.0); @@ -384,22 +384,22 @@ void tst_QCamera::testCameraExposure() camera.setAutoIsoSensitivity(); QCOMPARE(camera.isoSensitivity(), 100); - qreal minShutterSpeed = camera.minimumShutterSpeed(); - qreal maxShutterSpeed = camera.maximumShutterSpeed(); - QVERIFY(minShutterSpeed > 0); - QVERIFY(maxShutterSpeed > 0); - QVERIFY(camera.exposureTime() >= minShutterSpeed); - QVERIFY(camera.exposureTime() <= maxShutterSpeed); + qreal minExposureTime = camera.minimumExposureTime(); + qreal maxExposureTime = camera.maximumExposureTime(); + QVERIFY(minExposureTime > 0); + QVERIFY(maxExposureTime > 0); + QVERIFY(camera.exposureTime() >= minExposureTime); + QVERIFY(camera.exposureTime() <= maxExposureTime); camera.setAutoExposureTime(); - QVERIFY(camera.exposureTime() >= minShutterSpeed); - QVERIFY(camera.exposureTime() <= maxShutterSpeed); + QVERIFY(camera.exposureTime() >= minExposureTime); + QVERIFY(camera.exposureTime() <= maxExposureTime); camera.setManualExposureTime(0); - QCOMPARE(camera.exposureTime(), minShutterSpeed); + QCOMPARE(camera.exposureTime(), minExposureTime); camera.setManualExposureTime(10000); - QCOMPARE(camera.exposureTime(), maxShutterSpeed); + QCOMPARE(camera.exposureTime(), maxExposureTime); camera.setAutoExposureTime(); } @@ -577,36 +577,36 @@ void tst_QCamera::testConstructor() QCamera camera; QCOMPARE(camera.isAvailable(), true); QCOMPARE(camera.error(), QCamera::NoError); - QCOMPARE(camera.cameraInfo(), defaultCamera); + QCOMPARE(camera.cameraDevice(), defaultCamera); } { QCamera camera(QCameraDevice::FrontFace); QCOMPARE(camera.isAvailable(), true); QCOMPARE(camera.error(), QCamera::NoError); - QCOMPARE(camera.cameraInfo(), frontCamera); + QCOMPARE(camera.cameraDevice(), frontCamera); } { QCamera camera(QMediaDevices::defaultVideoInput()); QCOMPARE(camera.isAvailable(), true); QCOMPARE(camera.error(), QCamera::NoError); - QCOMPARE(camera.cameraInfo(), defaultCamera); + QCOMPARE(camera.cameraDevice(), defaultCamera); } { - QCameraDevice cameraInfo = QMediaDevices::videoInputs().at(0); - QCamera camera(cameraInfo); + QCameraDevice cameraDevice = QMediaDevices::videoInputs().at(0); + QCamera camera(cameraDevice); QCOMPARE(camera.isAvailable(), true); QCOMPARE(camera.error(), QCamera::NoError); - QCOMPARE(camera.cameraInfo(), cameraInfo); + QCOMPARE(camera.cameraDevice(), cameraDevice); } { QCamera camera(QCameraDevice::BackFace); QCOMPARE(camera.isAvailable(), true); QCOMPARE(camera.error(), QCamera::NoError); - QCOMPARE(camera.cameraInfo(), backCamera); + QCOMPARE(camera.cameraDevice(), backCamera); } { @@ -614,7 +614,7 @@ void tst_QCamera::testConstructor() QCamera camera(QCameraDevice::UnspecifiedPosition); QCOMPARE(camera.isAvailable(), true); QCOMPARE(camera.error(), QCamera::NoError); - QCOMPARE(camera.cameraInfo(), defaultCamera); + QCOMPARE(camera.cameraDevice(), defaultCamera); } } @@ -822,14 +822,14 @@ void tst_QCamera::testSignalShutterSpeedChanged() QCamera camera; session.setCamera(&camera); - QSignalSpy spySignalShutterSpeedChanged(&camera, SIGNAL(exposureTimeChanged(qreal))); + QSignalSpy spySignalExposureTimeChanged(&camera, SIGNAL(exposureTimeChanged(float))); - QVERIFY(spySignalShutterSpeedChanged.count() ==0); + QVERIFY(spySignalExposureTimeChanged.count() ==0); camera.setManualExposureTime(2.0);//set the ManualShutterSpeed to 2.0 QTest::qWait(100); - QVERIFY(spySignalShutterSpeedChanged.count() ==1); + QVERIFY(spySignalExposureTimeChanged.count() ==1); } void tst_QCamera::testSignalFlashReady() diff --git a/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp b/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp index 458c77efa..c8f93330f 100644 --- a/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp +++ b/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp @@ -74,7 +74,7 @@ void tst_QCameraDevice::constructor() { // default camera QCamera camera; - QCameraDevice info(camera.cameraInfo()); + QCameraDevice info(camera.cameraDevice()); QVERIFY(!info.isNull()); QCOMPARE(info.id(), QStringLiteral("default")); QCOMPARE(info.description(), QStringLiteral("defaultCamera")); @@ -90,7 +90,7 @@ void tst_QCameraDevice::constructor() QVERIFY(!info.isNull()); QCamera camera(info); - QCOMPARE(info, camera.cameraInfo()); + QCOMPARE(info, camera.cameraDevice()); QVERIFY(!info.isNull()); QCOMPARE(info.id(), QStringLiteral("back")); QCOMPARE(info.description(), QStringLiteral("backCamera")); @@ -113,7 +113,7 @@ void tst_QCameraDevice::defaultCamera() QCOMPARE(info.position(), QCameraDevice::UnspecifiedPosition); QCamera camera(info); - QCOMPARE(camera.cameraInfo(), info); + QCOMPARE(camera.cameraDevice(), info); } void tst_QCameraDevice::availableCameras() @@ -152,13 +152,13 @@ void tst_QCameraDevice::equality_operators() { QCamera camera(defaultCamera); - QVERIFY(camera.cameraInfo() == defaultCamera); - QVERIFY(camera.cameraInfo() == cameras.at(0)); + QVERIFY(camera.cameraDevice() == defaultCamera); + QVERIFY(camera.cameraDevice() == cameras.at(0)); } { QCamera camera(cameras.at(1)); - QVERIFY(camera.cameraInfo() == cameras.at(1)); + QVERIFY(camera.cameraDevice() == cameras.at(1)); } } diff --git a/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp index 9e3c30466..28e7f5baf 100644 --- a/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp +++ b/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp @@ -118,7 +118,6 @@ private slots: void testDestructor(); void testQrc_data(); void testQrc(); - void testAudioRole(); private: void setupCommonTestData(); @@ -251,9 +250,9 @@ void tst_QMediaPlayer::testMedia() QCOMPARE(player->source(), mediaContent); QBuffer stream; - player->setSource(mediaContent, &stream); + player->setSourceDevice(&stream, mediaContent); QCOMPARE(player->source(), mediaContent); - QCOMPARE(player->sourceStream(), &stream); + QCOMPARE(player->sourceDevice(), &stream); } void tst_QMediaPlayer::testDuration_data() @@ -790,42 +789,5 @@ void tst_QMediaPlayer::testQrc() QCOMPARE(bool(mockPlayer->mediaStream()), backendHasStream); } -void tst_QMediaPlayer::testAudioRole() -{ - auto *mockAudioOutput = static_cast<QMockAudioOutput *>(mockPlayer->m_audioOutput); - { - mockAudioOutput->hasAudioRole = false; - - QCOMPARE(audioOutput->audioRole(), QAudio::UnknownRole); - QVERIFY(audioOutput->supportedAudioRoles().isEmpty()); - - QSignalSpy spy(audioOutput, SIGNAL(audioRoleChanged(QAudio::Role))); - audioOutput->setAudioRole(QAudio::MusicRole); - QCOMPARE(audioOutput->audioRole(), QAudio::UnknownRole); - QCOMPARE(spy.count(), 0); - } - - { - mockPlayer->reset(); - mockAudioOutput->hasAudioRole = true; - QSignalSpy spy(audioOutput, SIGNAL(audioRoleChanged(QAudio::Role))); - - QCOMPARE(audioOutput->audioRole(), QAudio::UnknownRole); - QVERIFY(!audioOutput->supportedAudioRoles().isEmpty()); - - audioOutput->setAudioRole(QAudio::MusicRole); - QCOMPARE(audioOutput->audioRole(), QAudio::MusicRole); - QCOMPARE(spy.count(), 1); - QCOMPARE(qvariant_cast<QAudio::Role>(spy.last().value(0)), QAudio::MusicRole); - - spy.clear(); - - audioOutput->setProperty("audioRole", QVariant::fromValue(QAudio::AlarmRole)); - QCOMPARE(qvariant_cast<QAudio::Role>(audioOutput->property("audioRole")), QAudio::AlarmRole); - QCOMPARE(spy.count(), 1); - QCOMPARE(qvariant_cast<QAudio::Role>(spy.last().value(0)), QAudio::AlarmRole); - } -} - QTEST_GUILESS_MAIN(tst_QMediaPlayer) #include "tst_qmediaplayer.moc" diff --git a/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp index ba80f9951..5529f470f 100644 --- a/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp +++ b/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp @@ -64,20 +64,11 @@ private slots: void metaData(); - void testAudioSettingsCopyConstructor(); - void testAudioSettingsOperatorNotEqual(); - void testAudioSettingsOperatorEqual(); - void testAudioSettingsOperatorAssign(); - void testIsAvailable(); void testEnum(); void testVideoSettingsQuality(); void testVideoSettingsEncodingMode(); - void testVideoSettingsCopyConstructor(); - void testVideoSettingsOperatorAssignment(); - void testVideoSettingsOperatorNotEqual(); - void testVideoSettingsOperatorComparison(); private: QMockIntegration *mockIntegration = nullptr; @@ -144,19 +135,17 @@ void tst_QMediaRecorder::testNullControls() QCOMPARE(recorder.outputLocation(), QUrl()); QCOMPARE(recorder.actualLocation(), QUrl()); - QMediaEncoderSettings settings; - settings.setFileFormat(QMediaFormat::MPEG4); - settings.setAudioCodec(QMediaFormat::AudioCodec::AAC); - settings.setQuality(QMediaEncoderSettings::LowQuality); - - settings.setVideoCodec(QMediaFormat::VideoCodec::VP9); - settings.setVideoResolution(640, 480); + QMediaFormat format; + format.setFileFormat(QMediaFormat::MPEG4); + format.setAudioCodec(QMediaFormat::AudioCodec::AAC); + format.setVideoCodec(QMediaFormat::VideoCodec::VP9); + recorder.setMediaFormat(format); + recorder.setQuality(QMediaRecorder::LowQuality); + recorder.setVideoResolution(640, 480); - recorder.setEncoderSettings(settings); - - QCOMPARE(recorder.encoderSettings().audioCodec(), QMediaFormat::AudioCodec::AAC); - QCOMPARE(recorder.encoderSettings().videoCodec(), QMediaFormat::VideoCodec::VP9); - QCOMPARE(recorder.encoderSettings().fileFormat(), QMediaFormat::MPEG4); + QCOMPARE(recorder.mediaFormat().audioCodec(), QMediaFormat::AudioCodec::AAC); + QCOMPARE(recorder.mediaFormat().videoCodec(), QMediaFormat::VideoCodec::VP9); + QCOMPARE(recorder.mediaFormat().fileFormat(), QMediaFormat::MPEG4); QSignalSpy spy(&recorder, SIGNAL(recorderStateChanged(RecorderState))); @@ -286,252 +275,97 @@ void tst_QMediaRecorder::testRecord() void tst_QMediaRecorder::testEncodingSettings() { - QMediaEncoderSettings settings = encoder->encoderSettings(); - QCOMPARE(settings.fileFormat(), QMediaFormat::UnspecifiedFormat); - QCOMPARE(settings.audioCodec(), QMediaFormat::AudioCodec::Unspecified); - QCOMPARE(settings.videoCodec(), QMediaFormat::VideoCodec::Unspecified); - QCOMPARE(settings.quality(), QMediaEncoderSettings::NormalQuality); - QCOMPARE(settings.encodingMode(), QMediaEncoderSettings::ConstantQualityEncoding); - - settings.setAudioCodec(QMediaFormat::AudioCodec::MP3); - settings.setAudioSampleRate(44100); - settings.setAudioBitRate(256*1024); - settings.setQuality(QMediaEncoderSettings::HighQuality); - settings.setEncodingMode(QMediaEncoderSettings::AverageBitRateEncoding); - - settings.setVideoCodec(QMediaFormat::VideoCodec::H264); - settings.setVideoBitRate(800); - settings.setVideoFrameRate(24*1024); - settings.setVideoResolution(QSize(800,600)); - - encoder->setEncoderSettings(settings); - - QCOMPARE(encoder->encoderSettings(), settings); + QMediaFormat format = encoder->mediaFormat(); + QCOMPARE(format.fileFormat(), QMediaFormat::UnspecifiedFormat); + QCOMPARE(format.audioCodec(), QMediaFormat::AudioCodec::Unspecified); + QCOMPARE(format.videoCodec(), QMediaFormat::VideoCodec::Unspecified); + QCOMPARE(encoder->quality(), QMediaRecorder::NormalQuality); + QCOMPARE(encoder->encodingMode(), QMediaRecorder::ConstantQualityEncoding); + + format.setAudioCodec(QMediaFormat::AudioCodec::MP3); + encoder->setAudioSampleRate(44100); + encoder->setAudioBitRate(256*1024); + encoder->setQuality(QMediaRecorder::HighQuality); + encoder->setEncodingMode(QMediaRecorder::AverageBitRateEncoding); + + format.setVideoCodec(QMediaFormat::VideoCodec::H264); + encoder->setVideoBitRate(800); + encoder->setVideoFrameRate(24*1024); + encoder->setVideoResolution(QSize(800,600)); + encoder->setMediaFormat(format); + + QCOMPARE(encoder->mediaFormat().audioCodec(), QMediaFormat::AudioCodec::MP3); + QCOMPARE(encoder->audioSampleRate(), 44100); + QCOMPARE(encoder->audioBitRate(), 256*1024); + QCOMPARE(encoder->quality(), QMediaRecorder::HighQuality); + QCOMPARE(encoder->encodingMode(), QMediaRecorder::AverageBitRateEncoding); + + QCOMPARE(encoder->mediaFormat().videoCodec(), QMediaFormat::VideoCodec::H264); + QCOMPARE(encoder->videoBitRate(), 800); + QCOMPARE(encoder->videoFrameRate(), 24*1024); + QCOMPARE(encoder->videoResolution(), QSize(800,600)); } void tst_QMediaRecorder::testAudioSettings() { - QMediaEncoderSettings settings; - QVERIFY(settings == QMediaEncoderSettings()); - - QCOMPARE(settings.fileFormat(), QMediaFormat::UnspecifiedFormat); - QCOMPARE(settings.audioBitRate(), -1); - QCOMPARE(settings.quality(), QMediaEncoderSettings::NormalQuality); - QCOMPARE(settings.audioSampleRate(), -1); - - settings.setFileFormat(QMediaFormat::AAC); - QCOMPARE(settings.fileFormat(), QMediaFormat::AAC); - QVERIFY(settings != QMediaEncoderSettings()); - - settings = QMediaEncoderSettings(); - QCOMPARE(settings.audioBitRate(), -1); - settings.setAudioBitRate(128000); - QCOMPARE(settings.audioBitRate(), 128000); - - settings = QMediaEncoderSettings(); - QCOMPARE(settings.quality(), QMediaEncoderSettings::NormalQuality); - settings.setQuality(QMediaEncoderSettings::HighQuality); - QCOMPARE(settings.quality(), QMediaEncoderSettings::HighQuality); - - settings = QMediaEncoderSettings(); - QCOMPARE(settings.audioSampleRate(), -1); - settings.setAudioSampleRate(44100); - QCOMPARE(settings.audioSampleRate(), 44100); - - settings = QMediaEncoderSettings(); - QCOMPARE(settings.audioChannelCount(), -1); - settings.setAudioChannelCount(2); - QCOMPARE(settings.audioChannelCount(), 2); - - settings = QMediaEncoderSettings(); - - { - QMediaEncoderSettings settings1; - QMediaEncoderSettings settings2; - QCOMPARE(settings2, settings1); + QMediaRecorder recorder; - settings2 = settings1; - QCOMPARE(settings2, settings1); + QCOMPARE(recorder.mediaFormat(), QMediaFormat()); + QCOMPARE(recorder.mediaFormat().fileFormat(), QMediaFormat::UnspecifiedFormat); + QCOMPARE(recorder.audioBitRate(), -1); + QCOMPARE(recorder.quality(), QMediaRecorder::NormalQuality); + QCOMPARE(recorder.audioSampleRate(), -1); - settings1.setQuality(QMediaEncoderSettings::HighQuality); + QMediaFormat format; + format.setFileFormat(QMediaFormat::AAC); + recorder.setMediaFormat(format); + QCOMPARE(recorder.mediaFormat(), format); - QVERIFY(settings1 != settings2); - } + recorder.setAudioBitRate(128000); + QCOMPARE(recorder.audioBitRate(), 128000); - { - QMediaEncoderSettings settings1; - QMediaEncoderSettings settings2(settings1); - QCOMPARE(settings2, settings1); + recorder.setQuality(QMediaRecorder::HighQuality); + QCOMPARE(recorder.quality(), QMediaRecorder::HighQuality); - settings2 = settings1; - QCOMPARE(settings2, settings1); + recorder.setAudioSampleRate(44100); + QCOMPARE(recorder.audioSampleRate(), 44100); - settings1.setQuality(QMediaEncoderSettings::HighQuality); - - QVERIFY(settings1 != settings2); - } - - QMediaEncoderSettings settings1; - settings1.setAudioBitRate(1); - QMediaEncoderSettings settings2; - settings2.setAudioBitRate(1); - QVERIFY(settings1 == settings2); - settings2.setAudioBitRate(2); - QVERIFY(settings1 != settings2); - - settings1 = QMediaEncoderSettings(); - settings1.setAudioChannelCount(1); - settings2 = QMediaEncoderSettings(); - settings2.setAudioChannelCount(1); - QVERIFY(settings1 == settings2); - settings2.setAudioChannelCount(2); - QVERIFY(settings1 != settings2); - - settings1 = QMediaEncoderSettings(); - settings1.setAudioCodec(QMediaFormat::AudioCodec::MP3); - settings2 = QMediaEncoderSettings(); - settings2.setAudioCodec(QMediaFormat::AudioCodec::MP3); - QVERIFY(settings1 == settings2); - settings2.setAudioCodec(QMediaFormat::AudioCodec::FLAC); - QVERIFY(settings1 != settings2); - - settings1 = QMediaEncoderSettings(); - settings1.setEncodingMode(QMediaEncoderSettings::ConstantBitRateEncoding); - settings2 = QMediaEncoderSettings(); - settings2.setEncodingMode(QMediaEncoderSettings::ConstantBitRateEncoding); - QVERIFY(settings1 == settings2); - settings2.setEncodingMode(QMediaEncoderSettings::AverageBitRateEncoding); - QVERIFY(settings1 != settings2); - - settings1 = QMediaEncoderSettings(); - settings1.setQuality(QMediaEncoderSettings::NormalQuality); - settings2 = QMediaEncoderSettings(); - settings2.setQuality(QMediaEncoderSettings::NormalQuality); - QVERIFY(settings1 == settings2); - settings2.setQuality(QMediaEncoderSettings::LowQuality); - QVERIFY(settings1 != settings2); - - settings1 = QMediaEncoderSettings(); - settings1.setAudioSampleRate(1); - settings2 = QMediaEncoderSettings(); - settings2.setAudioSampleRate(1); - QVERIFY(settings1 == settings2); - settings2.setAudioSampleRate(2); - QVERIFY(settings1 != settings2); + QCOMPARE(recorder.audioChannelCount(), -1); + recorder.setAudioChannelCount(2); + QCOMPARE(recorder.audioChannelCount(), 2); } void tst_QMediaRecorder::testVideoSettings() { - QMediaEncoderSettings settings; - QVERIFY(settings == QMediaEncoderSettings()); - - QCOMPARE(settings.videoCodec(), QMediaFormat::VideoCodec::Unspecified); - settings.setVideoCodec(QMediaFormat::VideoCodec::H265); - QCOMPARE(settings.videoCodec(), QMediaFormat::VideoCodec::H265); - QVERIFY(settings != QMediaEncoderSettings()); - - settings = QMediaEncoderSettings(); - QCOMPARE(settings.videoBitRate(), -1); - settings.setVideoBitRate(128000); - QCOMPARE(settings.videoBitRate(), 128000); - - settings = QMediaEncoderSettings(); - QCOMPARE(settings.quality(), QMediaEncoderSettings::NormalQuality); - settings.setQuality(QMediaEncoderSettings::HighQuality); - QCOMPARE(settings.quality(), QMediaEncoderSettings::HighQuality); - - settings = QMediaEncoderSettings(); - QCOMPARE(settings.videoFrameRate(), -1); - settings.setVideoFrameRate(60); - QVERIFY(qFuzzyCompare(settings.videoFrameRate(), qreal(60))); - settings.setVideoFrameRate(24.0); - QVERIFY(qFuzzyCompare(settings.videoFrameRate(), qreal(24.0))); - - settings = QMediaEncoderSettings(); - QCOMPARE(settings.videoResolution(), QSize()); - settings.setVideoResolution(QSize(320,240)); - QCOMPARE(settings.videoResolution(), QSize(320,240)); - settings.setVideoResolution(800,600); - QCOMPARE(settings.videoResolution(), QSize(800,600)); - - settings = QMediaEncoderSettings(); - QCOMPARE(settings.videoCodec(), QMediaFormat::VideoCodec::Unspecified); - QCOMPARE(settings.videoBitRate(), -1); - QCOMPARE(settings.quality(), QMediaEncoderSettings::NormalQuality); - QCOMPARE(settings.videoFrameRate(), -1); - QCOMPARE(settings.videoResolution(), QSize()); - - { - QMediaEncoderSettings settings1; - QMediaEncoderSettings settings2; - QCOMPARE(settings2, settings1); - - settings2 = settings1; - QCOMPARE(settings2, settings1); - - settings1.setQuality(QMediaEncoderSettings::HighQuality); - QVERIFY(settings1 != settings2); - } - - { - QMediaEncoderSettings settings1; - QMediaEncoderSettings settings2(settings1); - QCOMPARE(settings2, settings1); - - settings2 = settings1; - QCOMPARE(settings2, settings1); - - settings1.setQuality(QMediaEncoderSettings::HighQuality); - QVERIFY(settings1 != settings2); - } + QMediaRecorder recorder; - QMediaEncoderSettings settings1; - settings1.setVideoBitRate(1); - QMediaEncoderSettings settings2; - settings2.setVideoBitRate(1); - QVERIFY(settings1 == settings2); - settings2.setVideoBitRate(2); - QVERIFY(settings1 != settings2); - - settings1 = QMediaEncoderSettings(); - settings1.setVideoResolution(800,600); - settings2 = QMediaEncoderSettings(); - settings2.setVideoResolution(QSize(800,600)); - QVERIFY(settings1 == settings2); - settings2.setVideoResolution(QSize(400,300)); - QVERIFY(settings1 != settings2); - - settings1 = QMediaEncoderSettings(); - settings1.setVideoCodec(QMediaFormat::VideoCodec::H265); - settings2 = QMediaEncoderSettings(); - settings2.setVideoCodec(QMediaFormat::VideoCodec::H265); - QVERIFY(settings1 == settings2); - settings2.setVideoCodec(QMediaFormat::VideoCodec::AV1); - QVERIFY(settings1 != settings2); - - settings1 = QMediaEncoderSettings(); - settings1.setEncodingMode(QMediaEncoderSettings::ConstantBitRateEncoding); - settings2 = QMediaEncoderSettings(); - settings2.setEncodingMode(QMediaEncoderSettings::ConstantBitRateEncoding); - QVERIFY(settings1 == settings2); - settings2.setEncodingMode(QMediaEncoderSettings::AverageBitRateEncoding); - QVERIFY(settings1 != settings2); - - settings1 = QMediaEncoderSettings(); - settings1.setQuality(QMediaEncoderSettings::NormalQuality); - settings2 = QMediaEncoderSettings(); - settings2.setQuality(QMediaEncoderSettings::NormalQuality); - QVERIFY(settings1 == settings2); - settings2.setQuality(QMediaEncoderSettings::LowQuality); - QVERIFY(settings1 != settings2); - - settings1 = QMediaEncoderSettings(); - settings1.setVideoFrameRate(1); - settings2 = QMediaEncoderSettings(); - settings2.setVideoFrameRate(1); - QVERIFY(settings1 == settings2); - settings2.setVideoFrameRate(2); - QVERIFY(settings1 != settings2); + QCOMPARE(recorder.mediaFormat(), QMediaFormat()); + QCOMPARE(recorder.mediaFormat().videoCodec(), QMediaFormat::VideoCodec::Unspecified); + QMediaFormat format; + format.setVideoCodec(QMediaFormat::VideoCodec::H265); + recorder.setMediaFormat(format); + QCOMPARE(recorder.mediaFormat(), format); + QCOMPARE(recorder.mediaFormat().videoCodec(), QMediaFormat::VideoCodec::H265); + + QCOMPARE(recorder.videoBitRate(), -1); + recorder.setVideoBitRate(128000); + QCOMPARE(recorder.videoBitRate(), 128000); + + QCOMPARE(recorder.quality(), QMediaRecorder::NormalQuality); + recorder.setQuality(QMediaRecorder::HighQuality); + QCOMPARE(recorder.quality(), QMediaRecorder::HighQuality); + + QCOMPARE(recorder.videoFrameRate(), -1); + recorder.setVideoFrameRate(60); + QVERIFY(qFuzzyCompare(recorder.videoFrameRate(), qreal(60))); + recorder.setVideoFrameRate(24.0); + QVERIFY(qFuzzyCompare(recorder.videoFrameRate(), qreal(24.0))); + + QCOMPARE(recorder.videoResolution(), QSize()); + recorder.setVideoResolution(QSize(320,240)); + QCOMPARE(recorder.videoResolution(), QSize(320,240)); + recorder.setVideoResolution(800,600); + QCOMPARE(recorder.videoResolution(), QSize(800,600)); } void tst_QMediaRecorder::testSettingsApplied() @@ -546,16 +380,13 @@ void tst_QMediaRecorder::testSettingsApplied() QCOMPARE(mock->m_settingAppliedCount, 0); QTRY_COMPARE(mock->m_settingAppliedCount, 1); - QMediaEncoderSettings settings; - settings.setVideoResolution(640,480); - encoder.setEncoderSettings(settings); + encoder.setVideoResolution(640,480); QCOMPARE(mock->m_settingAppliedCount, 1); QTRY_COMPARE(mock->m_settingAppliedCount, 2); //encoder settings are applied before recording if changed - settings.setQuality(QMediaEncoderSettings::VeryHighQuality); - encoder.setEncoderSettings(settings); + encoder.setQuality(QMediaRecorder::VeryHighQuality); QCOMPARE(mock->m_settingAppliedCount, 2); encoder.record(); @@ -581,122 +412,6 @@ void tst_QMediaRecorder::metaData() QCOMPARE(recorder.metaData().value(QMediaMetaData::Author).toString(), QString::fromUtf8("John Doe")); } -void tst_QMediaRecorder::testAudioSettingsCopyConstructor() -{ - /* create an object for AudioEncodersettings */ - QMediaEncoderSettings audiosettings; - - /* setting the desired properties for the AudioEncoder */ - audiosettings.setAudioBitRate(128*1000); - audiosettings.setAudioChannelCount(4); - audiosettings.setAudioCodec(QMediaFormat::AudioCodec::ALAC); - audiosettings.setEncodingMode(QMediaEncoderSettings::ConstantBitRateEncoding); - audiosettings.setQuality(QMediaEncoderSettings::LowQuality); - audiosettings.setAudioSampleRate(44100); - - /* Copy constructor */ - QMediaEncoderSettings other(audiosettings); - - /* Verifying whether data is copied properly or not */ - QVERIFY(other.audioBitRate() == audiosettings.audioBitRate()); - QVERIFY(other.audioSampleRate() == audiosettings.audioSampleRate()); - QVERIFY(other.audioChannelCount() == audiosettings.audioChannelCount()); - QCOMPARE(other.audioCodec(), audiosettings.audioCodec()); - QVERIFY(other.encodingMode() == audiosettings.encodingMode()); - QVERIFY(other.quality() == audiosettings.quality()); -} - -void tst_QMediaRecorder::testAudioSettingsOperatorNotEqual() -{ - /* create an object for AudioEncodersettings */ - QMediaEncoderSettings audiosettings1; - QMediaEncoderSettings audiosettings2; - - /* setting the desired properties to for the AudioEncoder */ - audiosettings1.setAudioBitRate(128*1000); - audiosettings1.setAudioChannelCount(4); - audiosettings1.setAudioCodec(QMediaFormat::AudioCodec::FLAC); - audiosettings1.setEncodingMode(QMediaEncoderSettings::ConstantBitRateEncoding); - audiosettings1.setQuality(QMediaEncoderSettings::LowQuality); - audiosettings1.setAudioSampleRate(44100); - - /* setting the desired properties for the AudioEncoder */ - audiosettings2.setAudioBitRate(128*1000); - audiosettings2.setAudioChannelCount(4); - audiosettings2.setAudioCodec(QMediaFormat::AudioCodec::FLAC); - audiosettings2.setEncodingMode(QMediaEncoderSettings::ConstantBitRateEncoding); - audiosettings2.setQuality(QMediaEncoderSettings::LowQuality); - audiosettings2.setAudioSampleRate(44100); - - /* verify the both are equal or not */ - QVERIFY(audiosettings1 == audiosettings2); - QVERIFY(!(audiosettings1 != audiosettings2)); - - /* Modify the settings value for one object */ - audiosettings2.setAudioBitRate(64*1000); - audiosettings2.setEncodingMode(QMediaEncoderSettings::ConstantQualityEncoding); - - /* verify the not equal opertor */ - QVERIFY(audiosettings1 != audiosettings2); - - QVERIFY(audiosettings2.audioBitRate() != audiosettings1.audioBitRate()); - QVERIFY(audiosettings2.encodingMode() != audiosettings1.encodingMode()); -} - -void tst_QMediaRecorder::testAudioSettingsOperatorEqual() -{ - /* create an object for AudioEncodersettings */ - QMediaEncoderSettings audiosettings1; - - /* setting the desired properties to for the AudioEncoder */ - audiosettings1.setAudioBitRate(128*1000); - audiosettings1.setAudioChannelCount(4); - audiosettings1.setAudioCodec(QMediaFormat::AudioCodec::FLAC); - audiosettings1.setEncodingMode(QMediaEncoderSettings::ConstantBitRateEncoding); - audiosettings1.setQuality(QMediaEncoderSettings::LowQuality); - audiosettings1.setAudioSampleRate(44100); - - QMediaEncoderSettings audiosettings2; - - /* setting the desired properties for the AudioEncoder */ - audiosettings2.setAudioBitRate(128*1000); - audiosettings2.setAudioChannelCount(4); - audiosettings2.setAudioCodec(QMediaFormat::AudioCodec::FLAC); - audiosettings2.setEncodingMode(QMediaEncoderSettings::ConstantBitRateEncoding); - audiosettings2.setQuality(QMediaEncoderSettings::LowQuality); - audiosettings2.setAudioSampleRate(44100); - - /* verify both the values are same or not */ - QVERIFY(audiosettings1 == audiosettings2); - audiosettings2.setAudioChannelCount(2); - QVERIFY(audiosettings1 != audiosettings2); -} - -void tst_QMediaRecorder::testAudioSettingsOperatorAssign() -{ - - /* create an object for AudioEncodersettings */ - QMediaEncoderSettings audiosettings1; - - /* setting the desired properties for the AudioEncoder */ - audiosettings1.setAudioBitRate(128*1000); - audiosettings1.setAudioChannelCount(4); - audiosettings1.setAudioCodec(QMediaFormat::AudioCodec::FLAC); - audiosettings1.setEncodingMode(QMediaEncoderSettings::ConstantBitRateEncoding); - audiosettings1.setQuality(QMediaEncoderSettings::LowQuality); - audiosettings1.setAudioSampleRate(44100); - - QMediaEncoderSettings audiosettings2; - audiosettings2 = audiosettings1; - /* Verifying whether data is copied properly or not */ - QVERIFY(audiosettings2.audioBitRate() == audiosettings1.audioBitRate()); - QVERIFY(audiosettings2.audioSampleRate() == audiosettings1.audioSampleRate()); - QVERIFY(audiosettings2.audioChannelCount() == audiosettings1.audioChannelCount()); - QCOMPARE(audiosettings2.audioCodec(), audiosettings1.audioCodec()); - QVERIFY(audiosettings2.encodingMode() == audiosettings1.encodingMode()); - QVERIFY(audiosettings2.quality() == audiosettings1.quality()); -} - void tst_QMediaRecorder::testIsAvailable() { { @@ -731,244 +446,39 @@ void tst_QMediaRecorder::testEnum() QCOMPARE(spy.last()[0].value<QMediaRecorder::Error>(), QMediaRecorder::ResourceError); } -/* Test the QMediaEncoderSettings quality API*/ void tst_QMediaRecorder::testVideoSettingsQuality() { - /* Create the instance*/ - QMediaEncoderSettings settings; - QVERIFY(settings == QMediaEncoderSettings()); - + QMediaRecorder recorder; /* Verify the default value is intialised correctly*/ - QCOMPARE(settings.quality(), QMediaEncoderSettings::NormalQuality); + QCOMPARE(recorder.quality(), QMediaRecorder::NormalQuality); /* Set all types of Quality parameter and Verify if it is set correctly*/ - settings.setQuality(QMediaEncoderSettings::HighQuality); - QCOMPARE(settings.quality(), QMediaEncoderSettings::HighQuality); + recorder.setQuality(QMediaRecorder::HighQuality); + QCOMPARE(recorder.quality(), QMediaRecorder::HighQuality); - settings.setQuality(QMediaEncoderSettings::VeryLowQuality); - QCOMPARE(settings.quality(), QMediaEncoderSettings::VeryLowQuality); + recorder.setQuality(QMediaRecorder::VeryLowQuality); + QCOMPARE(recorder.quality(), QMediaRecorder::VeryLowQuality); - settings.setQuality(QMediaEncoderSettings::LowQuality); - QCOMPARE(settings.quality(), QMediaEncoderSettings::LowQuality); + recorder.setQuality(QMediaRecorder::LowQuality); + QCOMPARE(recorder.quality(), QMediaRecorder::LowQuality); - settings.setQuality(QMediaEncoderSettings::VeryHighQuality); - QCOMPARE(settings.quality(), QMediaEncoderSettings::VeryHighQuality); + recorder.setQuality(QMediaRecorder::VeryHighQuality); + QCOMPARE(recorder.quality(), QMediaRecorder::VeryHighQuality); } -/* Test QMediaEncoderSettings encodingMode */ void tst_QMediaRecorder::testVideoSettingsEncodingMode() { - /* Create the instance*/ - QMediaEncoderSettings settings; - QVERIFY(settings == QMediaEncoderSettings()); + QMediaRecorder recorder; /* Verify the default values are initialised correctly*/ - QCOMPARE(settings.encodingMode(), QMediaEncoderSettings::ConstantQualityEncoding); + QCOMPARE(recorder.encodingMode(), QMediaRecorder::ConstantQualityEncoding); /* Set each type of encoding mode and Verify if it is set correctly*/ - settings.setEncodingMode(QMediaEncoderSettings::ConstantBitRateEncoding); - QCOMPARE(settings.encodingMode(),QMediaEncoderSettings::ConstantBitRateEncoding); - - settings.setEncodingMode(QMediaEncoderSettings::AverageBitRateEncoding); - QCOMPARE(settings.encodingMode(), QMediaEncoderSettings::AverageBitRateEncoding); -} - -/* Test QMediaEncoderSettings copy constructor */ -void tst_QMediaRecorder::testVideoSettingsCopyConstructor() -{ - /* Create the instance and initialise it*/ - QMediaEncoderSettings settings1; - settings1.setVideoCodec(QMediaFormat::VideoCodec::Theora); - settings1.setVideoBitRate(128000); - settings1.setQuality(QMediaEncoderSettings::HighQuality); - settings1.setEncodingMode(QMediaEncoderSettings::ConstantBitRateEncoding); - settings1.setVideoFrameRate(60.); - settings1.setVideoResolution(QSize(320,240)); - - /* Create another instance with instance1 as argument*/ - QMediaEncoderSettings settings2(settings1); - - /* Verify if all the parameters are copied correctly*/ - QCOMPARE(settings2 != settings1, false); - QCOMPARE(settings2.videoCodec(), QMediaFormat::VideoCodec::Theora); - QCOMPARE(settings2.videoBitRate(), 128000); - QCOMPARE(settings2.encodingMode(), QMediaEncoderSettings::ConstantBitRateEncoding); - QVERIFY(qFuzzyCompare(settings2.videoFrameRate(), qreal(60.))); - QCOMPARE(settings2.videoResolution(), QSize(320,240)); - QCOMPARE(settings2.quality(), QMediaEncoderSettings::HighQuality); - - /* Verify both the instances are equal*/ - QCOMPARE(settings2, settings1); -} + recorder.setEncodingMode(QMediaRecorder::ConstantBitRateEncoding); + QCOMPARE(recorder.encodingMode(),QMediaRecorder::ConstantBitRateEncoding); -/* Test QMediaEncoderSettings Overloaded Operator assignment*/ -void tst_QMediaRecorder::testVideoSettingsOperatorAssignment() -{ - /* Create two instances.*/ - QMediaEncoderSettings settings1; - QMediaEncoderSettings settings2; - QCOMPARE(settings2, settings1); - - /* Initialize all the parameters */ - settings1.setVideoCodec(QMediaFormat::VideoCodec::Theora); - settings1.setVideoBitRate(128000); - settings1.setEncodingMode(QMediaEncoderSettings::ConstantBitRateEncoding); - settings1.setVideoFrameRate(60.); - settings1.setVideoResolution(QSize(320,240)); - settings1.setQuality(QMediaEncoderSettings::HighQuality); - /* Assign one object to other*/ - settings2 = settings1; - - /* Verify all the parameters are copied correctly*/ - QCOMPARE(settings2, settings1); - QCOMPARE(settings2.videoCodec(), QMediaFormat::VideoCodec::Theora); - QCOMPARE(settings2.videoBitRate(), 128000); - QCOMPARE(settings2.encodingMode(), QMediaEncoderSettings::ConstantBitRateEncoding); - QVERIFY(qFuzzyCompare(settings2.videoFrameRate(), qreal(60.))); - QCOMPARE(settings2.videoResolution(), QSize(320,240)); - QCOMPARE(settings2.quality(), QMediaEncoderSettings::HighQuality); - QCOMPARE(settings2, settings1); -} - -/* Test QMediaEncoderSettings Overloaded OperatorNotEqual*/ -void tst_QMediaRecorder::testVideoSettingsOperatorNotEqual() -{ - /* Create the instance and set the bit rate and Verify objects with OperatorNotEqual*/ - QMediaEncoderSettings settings1; - settings1.setVideoBitRate(1); - QMediaEncoderSettings settings2; - settings2.setVideoBitRate(1); - /* OperatorNotEqual returns false when both objects are equal*/ - QCOMPARE(settings1 != settings2, false); - settings2.setVideoBitRate(2); - /* OperatorNotEqual returns true when both objects are not equal*/ - QVERIFY(settings1 != settings2); - - /* Verify Resolution with not equal operator*/ - settings1 = QMediaEncoderSettings(); - settings1.setVideoResolution(800,600); - settings2 = QMediaEncoderSettings(); - settings2.setVideoResolution(QSize(800,600)); - /* OperatorNotEqual returns false when both objects are equal*/ - QCOMPARE(settings1 != settings2, false); - settings2.setVideoResolution(QSize(400,300)); - /* OperatorNotEqual returns true when both objects are not equal*/ - QVERIFY(settings1 != settings2); - - /* Verify Codec with not equal operator*/ - settings1 = QMediaEncoderSettings(); - settings1.setVideoCodec(QMediaFormat::VideoCodec::Theora); - settings2 = QMediaEncoderSettings(); - settings2.setVideoCodec(QMediaFormat::VideoCodec::Theora); - /* OperatorNotEqual returns false when both objects are equal*/ - QCOMPARE(settings1 != settings2, false); - settings2.setVideoCodec(QMediaFormat::VideoCodec::AV1); - /* OperatorNotEqual returns true when both objects are not equal*/ - QVERIFY(settings1 != settings2); - - /* Verify EncodingMode with not equal operator*/ - settings1 = QMediaEncoderSettings(); - settings1.setEncodingMode(QMediaEncoderSettings::ConstantBitRateEncoding); - settings2 = QMediaEncoderSettings(); - settings2.setEncodingMode(QMediaEncoderSettings::ConstantBitRateEncoding); - /* OperatorNotEqual returns false when both objects are equal*/ - QCOMPARE(settings1 != settings2, false); - settings2.setEncodingMode(QMediaEncoderSettings::AverageBitRateEncoding); - /* OperatorNotEqual returns true when both objects are not equal*/ - QVERIFY(settings1 != settings2); - - /* Verify Quality with not equal operator*/ - settings1 = QMediaEncoderSettings(); - settings1.setQuality(QMediaEncoderSettings::NormalQuality); - settings2 = QMediaEncoderSettings(); - settings2.setQuality(QMediaEncoderSettings::NormalQuality); - /* OperatorNotEqual returns false when both objects are equal*/ - QCOMPARE(settings1 != settings2, false); - settings2.setQuality(QMediaEncoderSettings::LowQuality); - /* OperatorNotEqual returns true when both objects are not equal*/ - QVERIFY(settings1 != settings2); - - /* Verify FrameRate with not equal operator*/ - settings1 = QMediaEncoderSettings(); - settings1.setVideoFrameRate(1); - settings2 = QMediaEncoderSettings(); - settings2.setVideoFrameRate(1); - /* OperatorNotEqual returns false when both objects are equal*/ - QCOMPARE(settings1 != settings2, false); - settings2.setVideoFrameRate(2); - /* OperatorNotEqual returns true when both objects are not equal*/ - QVERIFY(settings1 != settings2); -} - -/* Test QMediaEncoderSettings Overloaded comparison operator*/ -void tst_QMediaRecorder::testVideoSettingsOperatorComparison() -{ - /* Create the instance and set the bit rate and Verify objects with comparison operator*/ - QMediaEncoderSettings settings1; - settings1.setVideoBitRate(1); - QMediaEncoderSettings settings2; - settings2.setVideoBitRate(1); - - /* Comparison operator returns true when both objects are equal*/ - QVERIFY(settings1 == settings2); - settings2.setVideoBitRate(2); - /* Comparison operator returns false when both objects are not equal*/ - QCOMPARE(settings1 == settings2, false); - - /* Verify resolution with comparison operator*/ - settings1 = QMediaEncoderSettings(); - settings1.setVideoResolution(800,600); - settings2 = QMediaEncoderSettings(); - settings2.setVideoResolution(QSize(800,600)); - /* Comparison operator returns true when both objects are equal*/ - QVERIFY(settings1 == settings2); - settings2.setVideoResolution(QSize(400,300)); - /* Comparison operator returns false when both objects are not equal*/ - QCOMPARE(settings1 == settings2, false); - - /* Verify Codec with comparison operator*/ - settings1 = QMediaEncoderSettings(); - settings1.setVideoCodec(QMediaFormat::VideoCodec::Theora); - settings2 = QMediaEncoderSettings(); - settings2.setVideoCodec(QMediaFormat::VideoCodec::Theora); - /* Comparison operator returns true when both objects are equal*/ - QVERIFY(settings1 == settings2); - settings2.setVideoCodec(QMediaFormat::VideoCodec::AV1); - /* Comparison operator returns false when both objects are not equal*/ - QCOMPARE(settings1 == settings2, false); - - /* Verify EncodingMode with comparison operator*/ - settings1 = QMediaEncoderSettings(); - settings1.setEncodingMode(QMediaEncoderSettings::ConstantBitRateEncoding); - settings2 = QMediaEncoderSettings(); - settings2.setEncodingMode(QMediaEncoderSettings::ConstantBitRateEncoding); - /* Comparison operator returns true when both objects are equal*/ - QVERIFY(settings1 == settings2); - settings2.setEncodingMode(QMediaEncoderSettings::AverageBitRateEncoding); - /* Comparison operator returns false when both objects are not equal*/ - QCOMPARE(settings1 == settings2, false); - - /* Verify Quality with comparison operator*/ - settings1 = QMediaEncoderSettings(); - settings1.setQuality(QMediaEncoderSettings::NormalQuality); - settings2 = QMediaEncoderSettings(); - settings2.setQuality(QMediaEncoderSettings::NormalQuality); - /* Comparison operator returns true when both objects are equal*/ - QVERIFY(settings1 == settings2); - settings2.setQuality(QMediaEncoderSettings::LowQuality); - /* Comparison operator returns false when both objects are not equal*/ - QCOMPARE(settings1 == settings2, false); - - /* Verify FrameRate with comparison operator*/ - settings1 = QMediaEncoderSettings(); - settings1.setVideoFrameRate(1); - settings2 = QMediaEncoderSettings(); - settings2.setVideoFrameRate(1); - /* Comparison operator returns true when both objects are equal*/ - QVERIFY(settings1 == settings2); - settings2.setVideoFrameRate(2); - /* Comparison operator returns false when both objects are not equal*/ - QCOMPARE(settings1 == settings2, false); + recorder.setEncodingMode(QMediaRecorder::AverageBitRateEncoding); + QCOMPARE(recorder.encodingMode(), QMediaRecorder::AverageBitRateEncoding); } QTEST_GUILESS_MAIN(tst_QMediaRecorder) |