summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Improve tst_QMediaPlayerBackend::processEOS()Yoann Lopes2017-04-201-0/+26
| | | | | | | | | When at the end of the media, check that pause() resets the position to the beginning and that the status changes to BufferedMedia. Change-Id: I3c7aeb98284de8cbeb12195fbf0a308e593af67b Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Improve tst_QMediaPlayerBackend::surfaceTest()Yoann Lopes2017-04-201-1/+3
| | | | | | | | - Add NV12 and NV21 formats to the tested formats. Change-Id: Ibca6966636352dda744820f80f08ca0f040356a7 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Fix the testsurface in tst_qmediaplayerbackendChristian Strømme2017-04-201-2/+7
| | | | | | | | Skip tests were the test-surface is incompatible with the backend. Task-number: QTBUG-46368 Change-Id: Ica2c01573b15cbf6a93080bb05e932202938629f Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Fix time-stamp tests in tst_qmediaplayerbackendChristian Strømme2017-04-201-0/+4
| | | | | | | | | Not all backends supports or have an implementation that sets the time-stamp on the video frames, so check if we do have valid time-stamps before running any tests that depends on it. Change-Id: I53926022a02cd87d23c493f7b392c4eb4c45a55e Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-181-0/+2
|\ | | | | | | Change-Id: I7cd203eec77f3b5689c14b81b0862c5b70bab1a6
| * Don't set library paths if !QT_CONFIG(library)Ulf Hermann2017-03-091-0/+2
| | | | | | | | | | | | Change-Id: Ibea22f6897ecd54a3aee1aafef6f73df03cf689f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Blacklist qmediaplayerbackend tests in all versions of macOSLiang Qi2017-03-161-5/+1
| | | | | | | | | | | | | | | | | | osx-10.12 in BLACKLIST was not supported in testlib yet. Task-number: QTBUG-46368 Task-number: QTBUG-58973 Change-Id: I26ef9fb5619c4f6ec5d2cfca67d212420f0facec Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-101-0/+4
|\| | | | | | | | | | | | | Conflicts: src/plugins/gstreamer/camerabin/camerabincontainer.h Change-Id: I4942d41d69112335fe0c994002f1b32ef3aad051
| * Fix test build when bearer management is disabledDaiwei Li2017-03-031-0/+4
| | | | | | | | | | | | | | Task-number: QTBUG-59263 Change-Id: I282c9eadf7ad0f8e49eb6f37ba3359ad511e595d Reviewed-by: Daiwei Li <daiweili@gmail.com> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Blacklist qmediaplayerbackend tests in macOS 10.12Liang Qi2017-02-231-0/+1
|/ | | | | | | | | These were found to also fail in macOS 10.12 Task-number: QTBUG-46368 Task-number: QTBUG-58973 Change-Id: I33f695a3495e61a9b7fb9901640a35dbf1333991 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* PulseAudio: make sound effect implementation more robustYoann Lopes2016-12-121-9/+0
| | | | | | | | | | | | - Always lock the pulse thread when modifying variables that are also used in callbacks (prevents concurrent access). - Improved handling of repeated calls to setSource(). - Don't try to write to the device when there is nothing to write. - Stop the Pulse thread when there are no sound effects in use anymore. Task-number: QTBUG-55735 Change-Id: I5e1c6beab89fdbb98707f5fcbb539dddea9a333f Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Add proper global headers for QtMultimediaLars Knoll2016-11-232-2/+2
| | | | | | | And deprecate the old qtmultimediadefs.h Change-Id: I2d4164f3a51d8e5d1813413b4f6691a721386fdf Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Remove leftover OpenGl ES 1 related macrosLars Knoll2016-11-161-4/+4
| | | | | | Change-Id: I9b1e31e3d1bcfbffc448551be5654f8818baf91a Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Cleanup all maemo/meego specific codeLars Knoll2016-11-141-31/+0
| | | | | Change-Id: I6c6f28084c6b030928eebc53c5d0009b168ede6a Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Move qtmultimedia over to the new config systemLars Knoll2016-11-141-1/+1
| | | | | | | | | | | | Use the new configuration system to define external libraries, configure tests and features. Don't use pkg-config outside of the configuration step. And move all command line options over from qtbase, so that we can remove them from there in a second step. Change-Id: I1aa4b557a6aee17eeceb00602005a2d28b426a26 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-115-16/+161
|\ | | | | | | | | | | | | | | | | | | Conflicts: qtmultimedia.pro src/multimedia/playback/qmediaplayer.cpp src/plugins/directshow/directshow.pro tests/auto/integration/qmediaplayerbackend/BLACKLIST Change-Id: I6dacdcbb223c1d12dd72eb308a67170983c709b3
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-045-17/+161
| |\ | | | | | | | | | Change-Id: Ib038c5e3ebb48c0e46569a35d530fa5ceaf06a32
| | * Blacklist tst_QAudioDecoderBackend on WindowsYoann Lopes2016-11-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | There are several issues in the WMF audio decoder implementation. Blacklist the test on the CI for now. Task-number: QTBUG-56796 Change-Id: I9284845e5f8caab8b11c86c086c7118125e4f043 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | * Improve playlist tests in tst_QMediaPlayerBackendYoann Lopes2016-10-281-2/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | Check media status changes when playing a playlist. Add a new test that checks constructed QMediaPlaylists. Task-number: QTBUG-49578 Change-Id: Ifbb7ee45b9633b684bd6a6fc653f96f391af130a Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | * Blacklist all media player integration tests on OpenSuseYoann Lopes2016-10-281-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | The media player plugin is not built at the moment on that platform. Change-Id: I47c6c0291853e997bd70d0c7be9942dfd00ee4af Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * Increase margin of error in tst_QMediaObject::notifySignals()Yoann Lopes2016-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | From 30% to 50%. Change-Id: I4a7720ebb9e1a5cdfb58b6cf92b6de2bebf56aed Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | * Blacklist testSetSourceWhileLoading on all Linux distrosMaurice Kalinowski2016-10-061-0/+3
| | | | | | | | | | | | | | | | | | (cherry picked from ccb985990880717f29fdec16f119b0c02b93d643) Change-Id: I94d970cb51202d35d894503b1fa5c342b8e8ae44 Reviewed-by: Christian Stromme <christian.stromme@qt.io>