summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | 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 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>
| * | Update player state after QMediaPlayer::EndOfMediaVal Doroshchuk2017-12-201-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return up-to-date player state if mediaStatusChanged() with QMediaPlayer::EndOfMedia is already received but stateChanged() is not. mediaStatusChanged() is always emitted first which could cause the player to keep outdated state before stateChanged() is received. Task-number: QTBUG-57197 Change-Id: I0706069d2f4875076442fdf8ac7e938272ab843c Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-201-0/+11
|\| | | | | | | | | | | Change-Id: Icaf645e271b21320c4cb6269178d9e722092a263
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-151-0/+11
| |\| | | | | | | | | | Change-Id: I0e525d0cc7f4e4b776e5a536e2bf9b2c66be5429
| | * Fix deadlock when a new url is set in loading stateVal Doroshchuk2017-11-101-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting a new url while QMediaPlayer is in loading state can result in a deadlock between the GUI and worker thread. Because main thread is waiting when worker realeses m_graph but worker cleared all pending tasks and is waiting for new tasks from main thread. Task-number: QTBUG-53534 Change-Id: I296ecdf866c5d85efc7121d3e7936334d6b700fd Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Replace remaining Q_NULLPTR with nullptrKevin Funk2017-11-151-3/+3
| | | | | | | | | | | | | | | Change-Id: I22561c3d58e0e52d502badf6dddbd6eb0c6a8ade Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Propagate customAudioRole into the QML classesJames McDonnell2017-10-231-0/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Propagate customAudioRole into the Audio, MediaPlayer and Video classes. [ChangeLog][Audio/Video/MediaPlayer] Added customAudioRole string property to enable use of audio roles beyond those available via the audioRole enum property. Change-Id: If3c4ec20f014653d31d1fa0d1ad925084f446478 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-192-7/+6
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h Change-Id: Ic6e27742ef6d1af0532ad05902a1431ebd5f449d
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Christian Strømme2017-09-262-7/+6
| |\| | | | | | | | | | Change-Id: Ib7c41a4cd7fd6976ebab52673898888dfac53db5
| | * Adjust timeouts for QSounds auto testsVaL Doroshchuk2017-09-261-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests contains fixed timeouts which sometimes is not enough, causing the test to fail under heavy load. Since isFinished() doesn't actually tell if a device has started, the timeout might come too early, e.g., when the device is still waiting for data, or even before it has started. Change-Id: I8f2f8341b9fcf656d86d161203c7eb63e66acca5 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | * Blacklist tst_QSound::testLooping for OpenSuse 42.3Sami Nurmenniemi2017-09-121-0/+3
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-63090 Change-Id: I5e9288d0d7d31972b7ba5745819d0b6a962d3191 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Skip OVG tests on boot2qtSami Nurmenniemi2017-09-122-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loading OVG is unstable on qemu. That needs to be skipped for boot2qt tests. This will conflict when merging to branch 5.10 with commit c341b2b25697f937280fe3620629ac3d32c19613. Correct version is in 5.10. Task-number: QTBUG-63079 Change-Id: Ic691beb3dbbfdc64ca31b380ad85d9dadbe08a90 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-09-081-0/+2
|\| | | | | | | | | | | Change-Id: I9babd08b4a50ff4bda1b50e8a4051e236ae4476a
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-alpha1Liang Qi2017-09-081-0/+2
| |\| | | | | | | | | | Change-Id: I4ebeec7ac72152c134dc87c8d69d0f4c2f0d3cfc
| | * Blacklist tst_qaudiooutput in openSUSE 42.3Tony Sarajärvi2017-08-311-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-52673 Change-Id: Ia093b2836b0f137e06624f557f4ee1746726e3e3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Add custom audio role API to QMediaPlayerJames McDonnell2017-09-065-2/+173
|/ / | | | | | | | | | | | | | | | | | | | | | | Allows use of audio roles beyond those known to Qt. [ChangeLog][QMediaPlayer] Added customAudioRole string property to enable use of audio roles beyond those available via the audioRole enum property. Change-Id: Id7ed5d7bc1af0c15910e699f25c97cfed2d48243 Reviewed-by: Christian Stromme <christian.stromme@qt.io> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* / Enable tests for boot2qtSami Nurmenniemi2017-08-229-67/+179
|/ | | | | | | | | | | | | | | | | The tests for boot2qt were disabled with commit b9bfe241cc3c3466ad250da80b2a7ccf087706a4. The tests can be enabled since qtdeclarative now fallbacks to software renderer if OpenGL is not supported. Two changes were needed to pass tests on boot2qt 1. Add option to disable tests requiring WAV format and use that in the boot2qt environment 2. Skip some tst_QPainterVideoSurface tests if GLContext is not supported by the platform Task-number: QTBUG-60268 Change-Id: I236207fedb505124a2c7edf0caccd85011ab1416 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Use QSharedPointer::create() moreMarc Mutz2017-08-081-1/+1
| | | | | | | | | | | | | This is the result of running the (experimental) clang-tidy check qt-modernize-qsharedpointer-create Discarded changes: none. This run probably does not cover all of qtmultimedia. Change-Id: I86a51b6a1edfe254f3fa9bff12dda359ac413df0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Update binary compatibility files for Qt 5.9.0 for QtMultimediaMilla Pohjanheimo2017-06-302-0/+34188
| | | | | | | Binary compatibility files updated. Change-Id: Idfb4d256ad582a601538b584dcddb71dce480227 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* Disable/blacklist failing tests for boot2qtSami Nurmenniemi2017-04-283-0/+25
| | | | | | | | | | Currently boot2qt is tested with QEMU and some tests fail. Disabling them for now to make it possible to enable qt5 tests for Coin. Task-number: QTBUG-60266 Change-Id: I0eadd95e202e4ff14f811856d982424608d29c44 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Improve tst_QMediaPlayerBackend::playPauseStop()v5.9.0-beta3Yoann Lopes2017-04-201-0/+7
| | | | | | | | Check that the position doesn't change after calling pause(). Change-Id: I4d7629c2f9cb165134279e1cc7047a5c82f394c9 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 00:31:20 +0000