summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* bic: Add 5.{1,2,3,4}.0 bic data for linux-gcc-amd64Sergio Ahumada2015-02-1010-29675/+128370
| | | | | | | | | Remove the ia32 data since there are no linux x86 machines in the CI system (which makes the data useless from an automated testing point of view) and most people use x64 these days anyway. Change-Id: Ib62195d0b992a52d3a87f460283b1f2813f0e5eb Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Sergio Ahumada2014-09-264-1/+126
|\
| * Merge remote-tracking branch 'origin/5.3' into 5.4Sergio Ahumada2014-09-264-1/+126
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iad73368a22c6d4662188e6f357a265d0c26756d0
| | * Make PLS parser more permissive.Yoann Lopes2014-09-102-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PLS format is not clearly specified, some rules are just assumed and files don't always respect them. We now only look for 'File' entries, since that's the only thing we actually use. We ignore the Version, NumberOfEntries, Title, Length and any other unrecognized tags. Task-number: QTBUG-40515 Change-Id: I9c176b7b68fd1441abbd50364f88994ad5d6236f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | * Fix URL handling in PLS parser.Yoann Lopes2014-09-092-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | Make sure relative paths are resolved to a full path. Task-number: QTBUG-40515 Change-Id: Ideb83fc3a3c4a74c84917a22e3c30162d7b6158a Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | * QMediaNetworkPlaylistProvider: Upon error parsing, stop parsing.Andres Gomez2014-09-094-1/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an error is found parsing a playlist, stop parsing. This will also prevent the emission of the "loaded" signal when the parser finishes. Task-number: QTBUG-40513 Change-Id: Ia814864d0d546806219993f0b727761d5d4e7903 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | Add metadata test for qmediaplayerbackend auto-test.Yoann Lopes2014-09-262-0/+38
| | | | | | | | | | | | | | | Change-Id: I419496293b11b6a941af08e9709595458b7ca423 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* | | Android: fix some problems with the media player.Yoann Lopes2014-09-261-21/+225
|/ / | | | | | | | | | | | | | | | | | | | | | | | | - Correctly emit positionChanged signal. One of the problems with this was that QMediaPlayer automatically sends periodic position updates while playing a media. There's no need to have the same logic in the backend. - Seeking after reaching the end of the media now correctly works Auto tests included. Change-Id: I6d5ecbae6e05f94a8aac1a0834cf57427adf219b Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Revert "QMediaNetworkPlaylistProvider: Upon error parsing, stop parsing."Yoann Lopes2014-09-174-125/+1
| | | | | | | | | | | | | | | | | | This reverts commit 0ed18d846c0b425b0c50a2fefd7cc0fc148832c2. The same patch was submitted in both 5.3 and 5.4 branches. It should have been pushed only to 5.3. Change-Id: I9e2974886190dfb2e5def5bc325c58f6e7783f55 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | winrt: Add media playback serviceAndrew Knight2014-08-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | This introduces a MediaPlayer service based on the MFEngineEx API. Only scene graph video rendering is supported at this time. The video renderer control is abstracted in order to provide a base for future video nodes which do not source their content from the MF engine. [ChangeLog] Media player support was added to the winrt backend. Change-Id: I8155a1030466ea352fad0a87d1ae97a88983760c Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Update license headers and add new license filesAntti Kokko2014-08-24113-2139/+1235
| | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: Ied06887225df341064c12bcc14c259ae74116f2e Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | QMediaNetworkPlaylistProvider: Upon error parsing, stop parsing.Robin Burchell2014-08-044-1/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | When an error is found parsing a playlist, stop parsing. This will also prevent the emission of the "loaded" signal when the parser finishes. Some of the newly added testcases do not yet pass because the parser is overly strict. These improvements are being tracked in QTBUG-40515. Change-Id: I5c96b7eb488996f28eebd7b6c643940de8e2e0b9 Done-by: Andres Gomez <agomez@igalia.com> Task-number: QTBUG-40513 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* | Support dynamic opengl32 - ANGLE switching on WindowsLaszlo Agocs2014-07-291-8/+10
| | | | | | | | | | | | Change-Id: I38532db3ab0ad4fcb8dbabd0cbb528f7d8e4ba06 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | New camera selection API in QML.Yoann Lopes2014-07-1710-5/+381
| | | | | | | | | | | | | | | | | | | | | | | | Also added a new QtMultimedia global object which makes it possible to retrieve the list of available cameras. It can be extended with new utility functions in the future. Includes documentation, example and auto tests. Task-number: QTBUG-23770 Change-Id: Ifea076329c3582ea99246ee1131853344a7b773f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Support per-plane strides and data offsets in QVideoFrame.Andrew den Exter2014-07-081-0/+122
| | | | | | | | | | | | | | | | | | | | | | | | Since just adding a new virtual isn't binary compatible add a new derivative type with a virtual member and connect it up through a virtual in the private class. [ChangeLog] Support for per-plane strides and data offsets in QVideoFrame. Task-number: QTBUG-38345 Change-Id: I1974c2b0b454d130e17971ce549031259d61f9cd Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-113-6/+5
|\| | | | | | | | | | | | | Conflicts: tests/auto/unit/qaudioformat/tst_qaudioformat.cpp Change-Id: I8499473569df9eac8c7069160e42ed477dacad4d
| * Fix some MediaPlayer properties returning wrong values.Yoann Lopes2014-04-091-1/+1
| | | | | | | | | | | | | | | | Once the QML component is complete, don't cache any value anymore and always ask the backend for the actual value. Change-Id: I2c3ad55618e0532f713cfcc8258a70a1114fc975 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Add support for running on big-endian systemsDmitry Shachnev2014-04-031-1/+1
| | | | | | | | | | | | | | | | Now qtmultimedia test suite passes on powerpc. Change-Id: I540dff93195115ad1dc5725af7293e3b8540403f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Fix unit testsBernd Weimer2014-04-022-5/+4
| | | | | | | | | | | | | | | | | | | | Random playback mode is not good for testing index changed signal, because the same media might be played successively. Calling show() might result in showFullScreen() on some platforms, which is not expected by some video widget tests. Change-Id: Ib47433fc6411b6dfa244a245aae508df5627ec62 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Yoann Lopes2014-03-261-1/+0
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-241-1/+0
| |\| | | | | | | | | | Change-Id: I310b468e9ba5b1e70f2e792df746a93ecb067c1a
| | * Mac: Re-enable qcamerabackend testAndy Nichols2014-03-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The cause of the tests flakyness has been resolved, so it should be re-enabled. Task-number: QTBUG-36040 Change-Id: Ic4d18ea891ed5b6c5f4acbb4d05322b910b87d29 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | Removed debug operator autotests.Yoann Lopes2014-03-263-300/+0
|/ / | | | | | | | | | | | | | | | | | | For QVideoFrame, QAudioFormat and QVideoSurfaceFormat. There's no point in testing the formatting of the debug operator. These tests can break every time there's a change in QDebug's output policy. Change-Id: I2349b4722a428bc4c56ca58b13889790e86df4c1 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-03-1121-49/+1000
|\| | | | | | | Change-Id: I42587537cadade4b3f45df18385adb760fb24430
| * tst_qcamerainfo: Fix weird symbol in license headerSergio Ahumada2014-03-061-1/+1
| | | | | | | | | | Change-Id: Idff0ffb96fa86dd7faa9ff9b86338c238d4edcb5 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Prefer to use normalised signal/slot signaturesSergio Ahumada2014-03-034-17/+17
| | | | | | | | | | Change-Id: I48ae4b46f7a0342a1436ba78958b057e919e3a8a Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * New QCameraInfo class.Yoann Lopes2014-02-2818-29/+910
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The class allows to get the list of available cameras on the system as well as getting some static information about them such as their unique ID, display name, physical position and sensor orientation. This makes QCamera::availableDevices() and QCamera::deviceDescription() obsolete. This patch contains the API, documentation and auto-tests but not the actual implementation by each backend (except for retrieving the default camera device). [ChangeLog][QtMultimedia] Added new QCameraInfo class [ChangeLog][QtMultimedia] QCamera: availableDevices() and deviceDescription() are deprecated, use QCameraInfo instead Change-Id: I64fd65729ab26a789468979ed5444ee90bb82cd0 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * QSoundEffect: fix changing the loop count while playing.v5.3.0-alpha1Yoann Lopes2014-02-251-3/+73
| | | | | | | | | | | | | | | | | | | | | | | | The running count was not updated with the new value. Auto-test added and documentation updated to be more clear about this behavior. Task-number: QTBUG-36643 Change-Id: I29e98ca4679f950a75133b21873738bcb72d23d4 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Fix autotests expecting a trailing whitespace for qDebug streamKai Koehne2014-02-204-17/+17
|/ | | | | | | | The behavior of QDebug was fixed in qtbase. Update autotests accordingly. Change-Id: I0bbd1b52958c24710f877224158fa30f082941b8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Use QVERIFY2 for elapsed time in tst_QMediaPlayerBackend::seekPauseSeek().Friedemann Kleint2014-02-171-6/+10
| | | | | | | The test has been observed to fail sometimes, try to obtain values. Change-Id: Id0374b7ad3d593c099500e771bc4d8cc50f26651 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Yoann Lopes2014-01-304-8/+2
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-274-8/+2
| |\ | | | | | | | | | Change-Id: I83d589c55e8463cce23068dc81096aa66ec596a5
| | * Allow plugins to override the QML VideoOutput type.Andrew den Exter2014-01-204-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move QDeclarativeVideoOutput to the private QtMultimediaQuickTools library to make the QDeclarativeVideoOutputBackend interface implementable by a plugin. Change-Id: I763c483a1fc9ec56dc7b8be0bc71523f029a36ee Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | whitespace fixesOswald Buddenhagen2014-01-308-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | remove trailing spaces & expand tabs. Change-Id: I05ef110abed90f13b47752760ffb4567a11a6a5e Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* | | Fix MSVC-warning about truncation of constant in tst_qaudiobuffer.cpp.Friedemann Kleint2014-01-291-1/+1
| | | | | | | | | | | | | | | Change-Id: If9e239be38f8d15542ab9bf3a74bccf0a43b4e69 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | Fix MSVC-warnings about unsafe bool operations in tst_qcamera.cpp.Friedemann Kleint2014-01-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | qglobal.h(501) : warning C4804: '-' : unsafe use of type 'bool' in operation global/qglobal.h(501) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning) tst_qcamera.cpp(507) : see reference to function template instantiation 'T qAbs<bool>(const T &)' being compiled Change-Id: Ifd467b5536a0d386f592ae339129b3ebfb7b8838 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | Fix MSVC-warnings about unused variable meta in tst_qdeclarativevideooutput.cpp.Friedemann Kleint2014-01-291-4/+2
|/ / | | | | | | | | Change-Id: If324fd2e65acb7650b1d8dee4964a2c2bb17f876 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-174-8/+17
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id367a610a3aefd288bfe287a3bf64606e582deb9
| * Fix build without Qml and Quick modules.Yoann Lopes2014-01-164-8/+17
| | | | | | | | | | | | | | | | | | Conditionally enable auto-tests that depend on the Quick and Qml modules. Task-number: QTBUG-35911 Change-Id: I8b9d304ea630093d423b48a4ebc53ef6f4280244 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-101-0/+2
|\| | | | | | | Change-Id: I7dc36a224702721b67ffa2cf7f9ce2a6b047f88e
| * Mark tst_qcamerabackend test as insignificant on Mac OS XSimon Hausmann2014-01-081-0/+2
| | | | | | | | | | | | | | | | | | It has failed 6 times during qt5.git stable integrations since September 2013 See also QTBUG-36040 Change-Id: I6abd5b2723d2346a4831ab28fa040c14615148b0 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Fix whitespace issue in the QVideoFrame auto test.Christian Strømme2014-01-071-1/+1
|/ | | | | | | | The test was failing because it was expecting a trailing whitespace directly after the serialization of the meta-data map. Change-Id: I62aa022492c721d408d23a98e8a3cfa173f45e68 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Remove unnecessary warning in QMediaPlaylistNavigator.Yoann Lopes2013-10-092-4/+1
| | | | | | Task-number: QTBUG-33862 Change-Id: Ie74e649ebb5819ccf6300492bdce2a0046b87f02 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* CoreAudio: Create an audio plugin supporting iOS and OS XAndy Nichols2013-09-191-2/+3
| | | | | | | | | | This removes the Mac audio backend that was hardcoded into QtMultimedia and adds a new audio plugin using the CoreAudio API. Change-Id: Ib15291825f9452a3763e0eeb281d952deb0bad3d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Stabilized QPainterVideoSurface auto-test.Yoann Lopes2013-09-171-0/+12
| | | | | Change-Id: Idfd6f8396dce223be1c73ad56c6f7f66ca9d5d25 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Multimedia plugins now have a unique JSON metadata 'Keys' property.Yoann Lopes2013-06-214-4/+8
| | | | | | | | | | | | | | | | | | | | | They previously had the multimedia services they provided as keys. This was a problem when several plugins were available on the same platform, providing the same multimedia service, but with different features or capabilities. Since they had the same key, only the first plugin in the directory was loaded. Nevertheless, it was actually working until commit 732dcfe7 in qtbase, as all plugins were loaded even when sharing the same key. The services a multimedia plugin provides are now declared in the 'Services' property. To preserve compatibility with third-party plugins, if that new property doesn't exist it falls back to the 'Keys' property. Task-number: QTBUG-31868 Task-number: QTBUG-31476 Change-Id: Ic3ba32eeef21b69b922bd3d4feb111101559d132 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Make directshow-plugin available.Friedemann Kleint2013-05-152-1/+3
| | | | | | | | | | | | | | | No longer include <qedit.h> in directshow-plugin, which no longer ships in newer SDKs. Ensure it only provides the camera service if the WMF-plugin is built by using a different .json-file. Adapt qcamerabackend-test to use widgets. Task-number: QTBUG-28047 Change-Id: I22ea441b9edb56ff55bc275dba37c01c77d8dd90 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Decouple qmediametadata.h from qmultimedia.hSze Howe Koh2013-05-146-0/+6
| | | | | | | | qmultimedia.h is included in more places, but qmediametadata.h is larger. This patch should reduce unnecessary #include-ing. Change-Id: I4a3d174bafc555d794bb75087c1f6b79745ae903 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Fix bic autotestJan Arve Saether2013-04-294-112/+12
| | | | | | | | | | | | Caused by https://codereview.qt-project.org/54820 I actually tried to avoid this with https://codereview.qt-project.org/54837 but my assumption was wrong. Change-Id: If0db8c9b5a317e07d97bcf97056b44e2124d1e1b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Fix hang in tst_qaudioinput (Windows).Friedemann Kleint2013-04-161-2/+2
| | | | | | | Task-number: QTBUG-28731 Change-Id: Iebe598f9e0760b05d05d5a6b6ecbeb535e745e2c Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>