summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Add binary compatibility files for qtmultimedia 5.14 branchMilla Pohjanheimo2019-12-172-0/+36028
| | | | | | | BC files built against 5.14.0 added. Change-Id: Ibf60167e1fcb47ad4ceda492c33f12c980f99a82 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-221-21/+4
|\ | | | | | | Change-Id: Ib880ad9150a59700878942fa6c3b711004bec4b0
| * Fix tst_qcamerabackend.cpp to pass if capturing to JPEG is not supportedVal Doroshchuk2019-10-151-21/+4
| | | | | | | | | | | | | | | | | | | | | | DirectShow capture control supports only RGB32 to capture to buffer, which fails the test. Decided to fix the test to avoid checking against Jpeg format and just make sure that it returns proper QImage. Change-Id: Ibcd565d6157cf3543eb15d3e1e371df271fc358c Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-081-8/+12
|\| | | | | | | | | | | | | Conflicts: src/multimedia/configure.json Change-Id: Ie887a5f4d718cb3e082b0e2ee996c6687af330cb
| * DirectShow: Fix tst_QMediaPlayerBackend::seekPauseSeekVal Doroshchuk2019-10-011-8/+12
| | | | | | | | | | | | | | | | | | | | | | Fixed tests about start times. Since DirectShow can provide frames with negative start time, also from the beginning, also pixels can vary, e.g. (rgb) 255:0:0 would be 230:19:19 after decoding. Task-number: QTBUG-46368 Change-Id: I025f7cf9238ddf9ba2a04f63e3e54b77f3cceafe Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-011-0/+4
|\| | | | | | | | | | | | | Conflicts: src/multimedia/video/qvideoframe.h Change-Id: I8458c4138be05f661d6528116cbc6b18298f0a91
| * DirectShow: Fix tst_QMediaPlayerBackend::surfaceTestVal Doroshchuk2019-09-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | YVU formats are likely not supported by the codecs and the pipeline will not be negotiated in this case. Fixes BFAIL : tst_QMediaPlayerBackend::surfaceTest(YVU formats) 'surface.m_totalFrames >= 25' returned FALSE. (Expected >= 25, got 0) Task-number: QTBUG-46368 Change-Id: I6bf1a5822481a018549fe58aaf5fe79c79ff8456 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* | Prospective fix for test failures on MinGWv5.14.0-alpha1Simon Hausmann2019-09-236-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | After commit 4d289edb14aeb4976218cc306bfc514e37521b82 in qtbase, MinGW is not building with debug-and-release anymore. So similar to the change in qtbase, the .pro files need adjusting for the placement of the plugins to be scoped to debug-and-release configurations. Task-number: QTBUG-78561 Change-Id: I0a5fc029307ba48c8f40f7553a7f583450337690 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Remove usages of deprecated APIsSona Kurazyan2019-08-087-34/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replace the usages of deprecated APIs by corresponding alternatives. - Made the tests for deprecated APIs to compile conditionally, based on the deprecation version. Task-number: QTBUG-76491 Task-number: QTBUG-76540 Task-number: QTBUG-76541 Change-Id: Ifd397dae9b3ebc2ba2504db7baa2d8ff21bfb3a7 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-112-0/+35910
|\ \
| * | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-112-0/+35910
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2f2a9371dd1085c10450f23e56c9f18078cc8698
| | * Binary compatibility files for Qt 5.13.0 for QtMultimediaMilla Pohjanheimo2019-07-012-0/+35910
| | | | | | | | | | | | | | | | | | | | | Binary compatibility files added. Change-Id: Ibe93b6cd553702178df87d748e268d8b75968e69 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | | Eradicate all but one Q_FOREACH loopMarc Mutz2019-07-1110-32/+41
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Q_FOREACH is going to be deprecated, or at the very least banned from use in Qt code. All these are trivial in the sense that the loop body clearly doesn't modify the container over which we iterate, and that the container is const, or trivially marked as such. In one case, replaced Q_FOREACH + delete + clear() with qDeleteAll(qExchange()), in three others, replaced Qt containers with statically-known content with plain C arrays. Change-Id: I718821811370f0cfefac3893283572d39a7d957d Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | unblacklist passing testsDaniel Smith2019-06-282-4/+4
| | | | | | | | | | | | | | | | These tests have not failed on the removed platforms for at least 60 days Task-number: QTBUG-76608 Change-Id: I928994f305b35d381b17c18fe02a53d889ae9071 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | Remove usages of deprecated QLatin1LiteralSona Kurazyan2019-06-252-30/+30
| | | | | | | | | | | | Task-number: QTBUG-76491 Change-Id: I20d31b6afe5cd2a30e45686ef73b5e0834700ee7 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Add YUV422P format support to QVideoFrame and declarative rendererTomasz Olszak2019-05-101-0/+1
| | | | | | | | | | | | | | | | | | [ChangeLog] Added QVideoFrame::Format_YUV422P. Change-Id: If7741db00cf0b628d7fc4b1cd3a6e424e0f8e2c0 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io> Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | QtMultimediaQuick: Move headers from multimedia dirVaL Doroshchuk2019-05-092-2/+2
| | | | | | | | | | | | | | Headers of multimedia quick module should not be placed in separate dir. Change-Id: Ie1f9df8339847ffbac8f22ac16ab0e613c46d037 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-1311-34/+63
|\| | | | | | | Change-Id: Idb05a117cf226919a34122b8b4156173120a128d
| * Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-04-1011-34/+63
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp Done-with: Val Doroshchuk <valentyn.doroshchuk@qt.io> Change-Id: I745dd948c1e98180115f85c17bef802351bbdb6b
| | * Android: Fix tst_QCameraBackend to find FinalizingStatusVal Doroshchuk2019-04-031-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes tst_QCameraBackend::testVideoRecording. Since QMediaRecorder::FinalizingStatus could be sent immediately, it is sane to wait for final QMediaRecorder::LoadedStatus only. But added a fix to check if the FinalizingStatus has been emitted. Task-number: QTBUG-73582 Change-Id: I63fc6b1951a712215ee5d982233924a79ac1c124 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io>
| | * Android: Move inline qml to separate file in testsVal Doroshchuk2019-04-038-29/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since androiddeployqt is looking for qml modules in qml/js files only, it is unable to deploy qml plugins for inline qml from cpp. Hence modules are never found while compiling inline qml. Fixes tst_QDeclarativeVideoOutputWindow and tst_QDeclarativeVideoOutput Fixes: QTBUG-73597 Fixes: QTBUG-73598 Change-Id: I43dc1ac38522779ff37f04b055a41b2c05eb7619 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
| | * Android: Move test files to qrc in tst_QSoundEffectVal Doroshchuk2019-04-032-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since TESTDATA files are not deployed to device, need to add them to qrc. Task-number: QTBUG-73583 Change-Id: Ie0b934b1d9bd46f8748ca93a3502ef1643271217 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
| | * Android: Fix tst_QCameraBackend to wait for imageCapturedVal Doroshchuk2019-04-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QCameraImageCapture::imageCaptured is also async and could be delivered after QCameraImageCapture::imageSaved. Fixes tst_QCameraBackend::testCameraCapture and tst_QCameraBackend::testCaptureToBuffer Change-Id: I47ee22c39cd2570f20a3e75a80249ed16ca52d0e Fixes: QTBUG-73582 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-061-1/+1
|\| | | | | | | | | | | Change-Id: I5d8d370a4da0a155914cd0e07610a1dcbd737f67
| * | Fix some deprecation warningsv5.13.0-beta2Friedemann Kleint2019-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | tst_qvideoframe.cpp:736:68: warning: 'int QImage::byteCount() const' is deprecated: Use sizeInBytes [-Wdeprecated-declarations] videowidget.cpp:103:49: warning: ‘const QBrush& QPalette::background() const’ is deprecated: Use QPalette::window() instead [-Wdeprecated-declarations] videowidget.cpp:111:62: warning: ‘const QBrush& QPalette::background() const’ is deprecated: Use QPalette::window() instead [-Wdeprecated-declarations] Change-Id: If6ba7de74c695cb5405ef7d3f9c5be8f94e3e522 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | | Fix deprecation warnings about QVariant APIFriedemann Kleint2019-04-052-4/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings like: video/qvideosurfaceformat.cpp:522:47: warning: 'QVariant qVariantFromValue(const T&) [with T = QAbstractVideoBuffer::HandleType]' is deprecated: Use QVariant::fromValue() instead. [-Wdeprecated-declarations] video/qvideosurfaceformat.cpp:524:48: warning: 'QVariant qVariantFromValue(const T&) [with T = QVideoFrame::PixelFormat]' is deprecated: Use QVariant::fromValue() instead. [-Wdeprecated-declarations] video/qvideosurfaceformat.cpp:534:54: warning: 'QVariant qVariantFromValue(const T&) [with T = QVideoSurfaceFormat::Direction]' is deprecated: Use QVariant::fromValue() instead. [-Wdeprecated-declarations] video/qvideosurfaceformat.cpp:536:46: warning: 'QVariant qVariantFromValue(const T&) [with T = double]' is deprecated: Use QVariant::fromValue() instead. [-Wdeprecated-declarations] video/qvideosurfaceformat.cpp:538:53: warning: 'QVariant qVariantFromValue(const T&) [with T = QSize]' is deprecated: Use QVariant::fromValue() instead. [-Wdeprecated-declarations] video/qvideosurfaceformat.cpp:542:52: warning: 'QVariant qVariantFromValue(const T&) [with T = QVideoSurfaceFormat::YCbCrColorSpace]' is deprecated: Use QVariant::fromValue() instead. [-Wdeprecated-declarations] Task-number: QTBUG-74043 Change-Id: I95f3bba4e63d83d02183a76be41d3819e0f400d8 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | Fix QPainterVideoSurface test to respect libGLESVal Doroshchuk2019-02-141-41/+45
| | | | | | | | | | | | | | | | | | | | | | To reproduce: set QT_OPENGL=angle Reverts d662241bfeffc3bc36ad812393cfc8bf706f863d and 0eef4ec9e306e4bdab5914d9c8ab3c2d12cc913c Task-number: QTBUG-73755 Change-Id: I403064b557b7c3650b9879b10241ac68b7457b27 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Fix typo in QPainterVideoSurface testVal Doroshchuk2019-02-121-13/+13
| | | | | | | | | | Change-Id: I9bc5ca4e6aba49400acc26569b9c99119f31dbac Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Fix QPainterVideoSurface test to respect libGLESv2Val Doroshchuk2019-02-121-13/+13
| | | | | | | | | | | | Task-number: QTBUG-73755 Change-Id: Icadaf43599f0369524416ab5f3a38f7612205cc6 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-022-0/+35160
|\| | | | | | | Change-Id: Ia13d887c3e3bf00b6ded5d052384fc5689b816fe
| * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-082-5/+9
| |\ | | | | | | | | | Change-Id: Ic42cf93c3be21a84d711effae28a3292f2b5c600
| * | Add binary compatibility files for 5.12 for QtMultimediaMilla Pohjanheimo2018-12-182-0/+35160
| | | | | | | | | | | | | | | | | | | | | Binary compatibility files added. Change-Id: Id9346f9e75d9fdbcf8ad30409d706829f1ba2573 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-042-5/+9
|\ \ \ | | |/ | |/| | | | Change-Id: I5394a9d75850771068d43d2509b14a3ac4efcf83
| * | Fix test to pass when wave is not availableVal Doroshchuk2019-01-041-4/+8
| | | | | | | | | | | | | | | Change-Id: I97023663c4232146f844de1d1b380f5a7bf11264 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Fix QCamera::testCameraLockCancel testVaL Doroshchuk2019-01-021-1/+1
| |/ | | | | | | | | | | | | | | Since QCamera(0, provider) does not make any sense, because provider should not be passed to ctor, it is already inited as default. Change-Id: I398671ef9885a94d5f651a33f7f5376252611a1e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | VideoOutput: Introduce flushMode propertyVaL Doroshchuk2018-11-061-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added flushMode property to QML VideoOutput element to define what should be shown when flush is requested. Takes affect only for QDeclarativeVideoRendererBackend and when QSGVideoItemSurface is already started. Flushing (passing empty video frame to the surface) is usually performed when EndOfMedia or playback is stopped. Which caused disappearing the content and blinking if playlist is used. Using this property now possible to define what frame (last, first or empty) should be shown when playback is stopped or finished. By default shows empty frame (clears the video output). To show a frame it requires to keep QVideoFrame and thus its data. Task-number: QTBUG-37301 Task-number: QTBUG-49446 Change-Id: I3be5309217b9f543da804e3b616dee9d97fba65f Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Add a support for selecting the output device used by QSoundEffectOtto Ryynänen2018-10-301-1/+12
|/ | | | | | | | | | | | | The QSoundEffect can be forced to use a specific audio output device. This is useful on a system with multiple output devices as individual QSoundeffects can use separate output devices. Due to way QAudioOutput (alternate implementation behind QSoundEffect) is implemented, QAudioDeviceInfo is used as a method of defining the output device to be used. Task-number: QTBUG-63596 Change-Id: Ibfb9894fec914726faee4e31c42ab08832693cf6 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* Fix Gstreamer plugin to pass tst_QMediaPlayerBackendVaL Doroshchuk2018-09-062-3/+2
| | | | | | | | | | | | | - Fixed to provide QMediaPlayer::LoadedMedia media status in case when play -> pause -> stop made. - Fixed default duration -1 -> 0. - Fixed a test because after pause() positionChanged is always emitted. - Enabled the test. - Increased gap between prev and curr position after pause. Task-number: QTBUG-63517 Change-Id: I377f024d0a976f1ce802fe6740a771b7e0f2e8db Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* tst_qmediaplaylist: Fix multiple definition error in static buildsVal Doroshchuk2018-06-201-5/+1
| | | | | | Task-number: QTBUG-66480 Change-Id: I2df7877fe298f485d9bc67366d7d1251835eb9d2 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Add binary compatibility files for Qt 5.11 for QtMultimediaMilla Pohjanheimo2018-06-052-0/+34900
| | | | | | | Binary compatibility files for bic test added Change-Id: Ic8c73383cd4382052faac014eb604dbb5e64dc5f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix adjusting volume for default deviceVal Doroshchuk2018-05-081-0/+6
| | | | | | | | | | | | | | | | | | | | Using WAVE_MAPPER device id (which points to default device) is not possible to get and initialize a mixer object to set volume. Function mixerGetID() does not support WAVE_MAPPER as a device id yet. Since we do not know device number anymore needs to call waveInOpen() first and after that initialize mixer controls using hWaveIn handler. - Fixed default volume from 0.0f -> 1.0f. - Before QWindowsAudioInput::start() is called, use cached volume. - After QWindowsAudioInput::start(), mixer controls are initialized. - QWindowsAudioInput::stop() deinitializes mixer controls. Task-number: QTBUG-61920 Change-Id: I5a94dad282618fb4a2e0f75c34008ca002bd1aeb Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* QSound: Allow to play files with qrc schemaAndre Hartmann2018-04-253-0/+30
| | | | | | | | It was possible to play resource files only by prefix ":/". Added support of qrc schema in filenames. Change-Id: I9e538422828ad2107ab5567d172dca8728cbc64d Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* Support changing of volume in 24-bit audio samplesVaL Doroshchuk2018-03-222-0/+27
| | | | | | | | Introduced a fix to support changing of volume for 3 bytes samples audio stream. Task-number: QTBUG-60579 Change-Id: I4ba4a9a1cf65812ccbc46b40c78546875d5e4d73 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Add test for checking error handling on startVaL Doroshchuk2018-03-211-0/+22
| | | | | | | | | | | | | If a camera is not started successfully error() signal has to be emitted. This change adds a test for checking that we emit and set the correct status and state when trying to start an already active camera. Task-number: QTBUG-51825 Change-Id: Ia14119aa9a93a76e363214401b8c2e9f216e35c9 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Wrap QTest::qWaitForWindowExposed() with QVERIFYv5.11.0-beta2Kari Oikarinen2018-03-011-6/+6
| | | | | | | | The function is marked Q_REQUIRED_RESULT, so not handling the return value is a compiler warning. Change-Id: I167950e8f579446516c15f54388addf759afa69d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-202-0/+34830
|\ | | | | | | | | | | | | | | Conflicts: src/plugins/avfoundation/mediaplayer/avfmediaplayersession.h src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm Change-Id: Ic43fb2a805ed9f0f2ea48993d47859716f1f11b4
| * Add binary compatibility files for QtMultimedia for 5.10Milla Pohjanheimo2018-01-092-0/+34830
| | | | | | | | | | | | | | | | Added files to test binary compatibility for 5.10 content. Change-Id: I8fbe65fc92f120fcb70d89a98a316c227814985c Reviewed-by: Sergio Ahumada <sahumada@texla.cl> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-062-2/+24
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5acdc7e0bd3729b80522dfff0f388cf2507fb111
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-061-2/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3d6e69f3f99b2f0a0e2c29ffdd02176e1f22304e
| | * Blacklist qmediaplayerbackend tests in all versions of windowsJani Heikkinen2018-01-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was already blacklisted in most of builds and started to fail in remaining ones as well Task-number: QTBUG-46368 Task-number: QTBUG-65574 Change-Id: I809f8efd2887facfe85bf2d98f2251b0a7b82484 Reviewed-by: Liang Qi <liang.qi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 05:40:26 +0000