summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Yoann Lopes2016-10-112-6/+10
|\| | | | | | | | | | | Change-Id: I8cfa9cb233675bb7ff842118d96ec8ac0b97964f
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-042-6/+9
| |\| | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp Change-Id: I4a30fc030c25e7b8da3eb9f386c4a5fa468df141
| | * Blacklist testSetSourceWhilePlaying() in 5.6Milla Pohjanheimo2016-09-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | The test is flaky and running it 300 times didn't reproduce the failure. Change-Id: Ib03722579dbe58c05cb324fdca37eb7e5b732e33 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * Stabilize pushSuspendResume() autotestMilla Pohjanheimo2016-09-271-2/+2
| | | | | | | | | | | | | | | | | | | | | Same as 7d00a457e455e159a3dde30ad798be744cf38bb1. Change-Id: Ia7b01eef7650c1db23562d1a36a4a19748c92fc7 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * Stabilize tst_QAudioOutput::pull() and push() autotestsMilla Pohjanheimo2016-09-231-4/+4
| | | | | | | | | | | | | | | | | | | | | Same as 7d00a457e455e159a3dde30ad798be744cf38bb1. Change-Id: Iaf4a9d4eb5b5afe307a82af6f1a7fdf3e49f08ac Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Yoann Lopes2016-09-232-13/+2
|\| | | | | | | | | | | Change-Id: I96aca24df935d51b40380c727b6c5002432a6be6
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Yoann Lopes2016-09-222-13/+2
| |\| | | | | | | | | | Change-Id: I5bce2843ac62bb97efc1ccaaa9c671c4adf10640
| | * Stabilize tst_QAudioOutput::pullSuspendResume()Yoann Lopes2016-09-212-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't wait after resume(); the test is meant to check the state of the QAudioOutput right after the call, not later. The state and the error status are supposed to change immediately, even if the backend runs in another thread. Ignore any state change that can happen because of underrun errors (likely to happen on CI). Removed the test from blacklist. Change-Id: Idaef6a9e0dfcfc89424fb2383cf3830a3184f975 Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | * Make tst_QMediaObject::notifySignals() less flakyYoann Lopes2016-09-201-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than expecting a certain amount of signals to be fired within a fixed period, check that all the required signals are emitted and that it doesn't take longer than expected. Use a margin of error to take into account timers firing later because of high system load. Change-Id: I1569ce524e87efc47eb8d11066e509e5dc90f6f8 (cherry picked from commit 586abbd9732f9ccce127429fe0698c25a09ecefb) Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-194-0/+67222
|\| | | | | | | | | | | Change-Id: I022c07dab3ded6072f7c103e299822caaf40cf34
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-172-0/+33179
| |\| | | | | | | | | | Change-Id: I27d68b69f2ad15e930b6adab5b2ff583f4642fac
| | * BC data files for QtMultimedia for Qt 5.6Milla Pohjanheimo2016-09-142-0/+33179
| | | | | | | | | | | | | | | | | | | | | Added binary compatibility data files for tst_bic test Change-Id: I02ea21c1cfbd1087475f04a516cf524fa1ce878a Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| * | BC data files added for QtMultimedia (5.7)Milla Pohjanheimo2016-09-152-0/+34043
| | | | | | | | | | | | | | | | | | | | | | | | Added the generated data files for the binary compatibility tests for QtMultimedia for Qt 5.7. Change-Id: I380e472d912d4e34d1129e922ead00c94ef0ac9c Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | Add BLACKLIST for QSoundEffectMaurice Kalinowski2016-09-191-0/+2
| | | | | | | | | | | | | | | | | | | | | Blacklisting testSetSourceWhileLoading on all Linux distros. Change-Id: I024fcda458be2764d386897fec257731e67ab95d Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Adjust to qtConfig() changes in qtbaseLars Knoll2016-08-192-5/+3
| | | | | | | | | | | | | | | | | | Change-Id: I26d80ece18abf882338de5ce0258469ed103a0eb Reviewed-by: Yoann Lopes <yoann.lopes@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-172-3/+35
|\| | | | | | | | | | | Change-Id: Ib8d05d6e21c7beb19f618cd1edc52d248b1e43b8
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-131-0/+27
| |\| | | | | | | | | | Change-Id: I3204cdf695f4b47730a88a7c41fc7a6de967b161
| | * Improve tst_QMediaPlayerBackend::playPauseStop()Yoann Lopes2016-08-121-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | Check the state of the media player when trying to play or pause without a loaded media. Change-Id: I6685f196457630eb9f4e834426c8e1b9a9eaf8dc Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | Make tst_QMediaObject::notifySignals() less flakyYoann Lopes2016-08-101-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than expecting a certain amount of signals to be fired within a fixed period, check that all the required signals are emitted and that it doesn't take longer than expected. Use a margin of error to take into account timers firing later because of high system load. Change-Id: I7f77d32a9db3d09881eadbd0dfc6b70f62757d09 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-091-4/+4
|\| | | | | | | | | | | Change-Id: I0e74582a735dd8fd169ac928a32143ab80a2d2a0
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-041-4/+4
| |\| | | | | | | | | | Change-Id: If640a9831fc4faf43a445bd0379fee1d53661f47
| | * Give more time before timeout in some tst_QAudioInput testsYoann Lopes2016-08-041-4/+4
| | | | | | | | | | | | | | | Change-Id: If2336e9c550ef8264d0853be83972a6170a9746b Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | tst_QAudioDeviceInfo: don't do implicit cast from NULL to char*Yoann Lopes2016-08-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Use QString::isNull() rather than QString() == NULL. Task-number: QTBUG-55154 Change-Id: I3860caa504ed3abda6c525b93e9d232a708b7f0b Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-022-13/+3
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf tests/auto/integration/qsoundeffect/BLACKLIST Change-Id: Icd2edd4410a4ee914d489634d26b262c0c146bf4
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Yoann Lopes2016-08-012-11/+3
| |\| | | | | | | | | | Change-Id: Ic29cb09048003f18ff86d4546cd547be715eaec8
| | * tst_qsoundeffect: Update to case testLoopingTuomas Heimonen2016-07-042-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Be more permissive while checking loops remaining. Remove file BLACKLIST Task-number: QTBUG-46689 Change-Id: I15b5fb55ee770a190b2c21dd8cf1fad45665a73c Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-07-211-6/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/directshow/player/directshowiosource.cpp One side disintermediated filling a vector; the other reduced it to one entry. src/plugins/directshow/player/directshowiosource.h One side renamed a member, the other added another adjacent to it. src/plugins/pulseaudio/qpulseaudioengine.h One side added a header, the other replaced the next with a different header. Change-Id: I3a031975f5af43ca39cca571f215c612f640b7d6
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-301-6/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blacklisted a few functions in tst_QAudioInput. Conflicts: .qmake.conf src/plugins/avfoundation/camera/avfcameracontrol.mm src/plugins/avfoundation/camera/avfcameraservice.h src/plugins/avfoundation/camera/avfcameraservice.mm src/plugins/avfoundation/camera/avfcamerasession.h src/plugins/avfoundation/camera/avfcamerasession.mm src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm src/plugins/avfoundation/camera/avfimagecapturecontrol.mm src/plugins/avfoundation/camera/avfimageencodercontrol.mm src/plugins/avfoundation/camera/avfmediarecordercontrol.h src/plugins/avfoundation/camera/avfmediarecordercontrol.mm tests/auto/integration/qaudioinput/BLACKLIST Task-number: QTBUG-54459 Task-number: QTBUG-49736 Change-Id: I3a1fe8cef50b44d5c2785aaf4cf69fe3f16728e6
* | | Blacklisting playPauseStop() on all LinuxesMilla Pohjanheimo2016-07-061-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the blacklisting of playPauseStop() to be "linux" instead of separately blacklisting it for each Linux distribution, since it's failing on all. Change-Id: I0b545423bf598b7487722bd5dda2d236be7131f6 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | Add LogarithmicVolumeScale to VolumeScale enum.Yoann Lopes2016-06-142-0/+94
| | | | | | | | | | | | | | | Change-Id: I0b556b5f705825fc8c8135305bda4bc860ffbf14 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Blacklisting tst_QSoundEffect::testLooping on Ubuntu 16.04Milla Pohjanheimo2016-06-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The test in question has been blacklisted already for Ubuntu 14.04, and since it fails on Ubuntu 16.04 also, we need to blacklist it. Task-number: QTBUG-46689 Change-Id: I04eeb50031ddb622e62d895df37fd685a6f059f8 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-112-0/+2
|\| | | | | | | | | | | Change-Id: Iffd8d86489161c49a647cae77a31f5451b06cf4b
| * | Blacklist cases from qaudiodecoderbackend in Ubuntu 16.04v5.7.0-rc1Simo Fält2016-05-231-0/+1
| | | | | | | | | | | | | | | | | | Change-Id: I0482247ce2f24d1b47f32fe403db8587b6f92abc Task-number: QTBUG-46368 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Blacklisting pushSuspendResume for Ubuntu 16.04Milla Pohjanheimo2016-05-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This test is failing on all Linux distributions. Blacklisting it for Ubuntu 16.04 too. Task-number: QTBUG-49736 Change-Id: I24d6387fabd9257a36589ccd1b3d63092c9dc0c1 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | Add new volume conversion API.Yoann Lopes2016-06-032-1/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All Qt Multimedia volume APIs expect a linear volume factor. However, UI volume controls should typically use a logarithmic or cubic scale to match how the human ear perceives loudness. The new helper function (C++ and QML) provides a way to do the conversion from one scale to another. Change-Id: If7795426b728ab0e8fd6635988dbc9be795e3e5e Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Blacklisting tst_QSoundEffect::testLooping on OpenSUSE 42.1Milla Pohjanheimo2016-06-022-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blacklisted testLooping() on OpenSUSE 42.1 and removed 'insignificant_testcase' CONFIG, which was a typo in any case. It should be 'insignificant_test'. Also we should get rid of the tests marked as insignificant in any case. Task-number: QTBUG-46689 Change-Id: Idcf9589e26d066e664cf68e6c25c03f4d1973287 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-241-4/+2
|\| | | | | | | | | | | Change-Id: I5aedca14c2bd454de0c274eeca88d15b83ae07a5
| * | Stabilize tst_QAudioOutput::pull().Yoann Lopes2016-05-111-4/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-53297 Change-Id: I521b9b3594016197228676648f97f568a8db0a7e Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-134-47/+15
|\| | | | | | | | | | | Change-Id: I773db005bbdc511169917ee35eb5b517e898926b