diff options
author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-06-06 14:06:04 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-07 08:28:08 +0200 |
commit | 62749d654d6bbd50d84089e038529fda815cf96f (patch) | |
tree | 88c307cbf36ac739b1e5b0b21e322a3c2dcfa1c5 /tests/auto/unit/qmediarecorder | |
parent | f53788ae42175bd3b7cda1a18366086b285f6f1d (diff) |
Removed encoding options from Audio/Video encoding controls
They are replaced with encoding options from
QAudio/Video/ImageEncoderSettings.
This also allows to specify options without
requesting controls.
Change-Id: I507e68cdb8cb46325689804d27c6d0561cada50b
Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'tests/auto/unit/qmediarecorder')
-rw-r--r-- | tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp index bb5c8b525..99ea5d7b5 100644 --- a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp +++ b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp @@ -390,11 +390,6 @@ void tst_QMediaRecorder::testAudioEncodeControl() QStringList codecs = capture->supportedAudioCodecs(); QVERIFY(codecs.count() == 2); QVERIFY(capture->audioCodecDescription("audio/pcm") == "Pulse Code Modulation"); - QStringList options = encode->supportedEncodingOptions("audio/mpeg"); - QCOMPARE(options.count(), 4); - QVERIFY(encode->encodingOption("audio/mpeg","bitrate").isNull()); - encode->setEncodingOption("audio/mpeg", "bitrate", QString("vbr")); - QCOMPARE(encode->encodingOption("audio/mpeg","bitrate").toString(), QString("vbr")); QList<int> rates; rates << 8000 << 11025 << 22050 << 44100; QCOMPARE(capture->supportedAudioSampleRates(), rates); @@ -423,14 +418,6 @@ void tst_QMediaRecorder::testVideoEncodeControl() QStringList vCodecs = capture->supportedVideoCodecs(); QVERIFY(vCodecs.count() == 2); QCOMPARE(capture->videoCodecDescription("video/3gpp"), QString("video/3gpp")); - - QStringList options = videoEncode->supportedEncodingOptions("video/3gpp"); - QCOMPARE(options.count(), 2); - - QVERIFY(encode->encodingOption("video/3gpp","me").isNull()); - encode->setEncodingOption("video/3gpp", "me", QString("dia")); - QCOMPARE(encode->encodingOption("video/3gpp","me").toString(), QString("dia")); - } void tst_QMediaRecorder::testEncodingSettings() |