From 63db99a8ee1fa6430cf5f6ab3406323bd7c14850 Mon Sep 17 00:00:00 2001 From: Dmytro Poplavskiy Date: Fri, 18 May 2012 10:26:51 +1000 Subject: Added custom parameters to Audio/Video/ImageEncodingSettings This allows to specify more advanced and system/codec specific settings Change-Id: Ia0a2e94eaf56df285a219018e0beab895a2e7c2a Reviewed-by: Ling Hu --- tests/auto/unit/qcamera/tst_qcamera.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'tests/auto/unit/qcamera/tst_qcamera.cpp') diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp index 838041db3..42bc69ec7 100644 --- a/tests/auto/unit/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/qcamera/tst_qcamera.cpp @@ -791,11 +791,26 @@ void tst_QCamera::testImageSettings() QCOMPARE(settings.resolution(), QSize(800,600)); QVERIFY(!settings.isNull()); + settings = QImageEncoderSettings(); + settings.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1)); + QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption")), QVariant(1)); + QVariantMap options; + options.insert(QLatin1Literal("encoderOption"), QVariant(1)); + QCOMPARE(settings.encodingOptions(), options); + options.insert(QLatin1Literal("encoderOption2"), QVariant(2)); + options.remove(QLatin1Literal("encoderOption")); + settings.setEncodingOptions(options); + QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption")), QVariant()); + QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption2")), QVariant(2)); + QVERIFY(!settings.isNull()); + QVERIFY(settings != QImageEncoderSettings()); + settings = QImageEncoderSettings(); QVERIFY(settings.isNull()); QCOMPARE(settings.codec(), QString()); QCOMPARE(settings.quality(), QtMultimedia::NormalQuality); QCOMPARE(settings.resolution(), QSize()); + QVERIFY(settings.encodingOptions().isEmpty()); { QImageEncoderSettings settings1; @@ -855,6 +870,14 @@ void tst_QCamera::testImageSettings() QVERIFY(settings1 == settings2); settings2.setQuality(QtMultimedia::LowQuality); QVERIFY(settings1 != settings2); + + settings1 = QImageEncoderSettings(); + settings1.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1)); + settings2 = QImageEncoderSettings(); + settings2.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1)); + QVERIFY(settings1 == settings2); + settings2.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(2)); + QVERIFY(settings1 != settings2); } void tst_QCamera::testCameraLock() -- cgit v1.2.3