summaryrefslogtreecommitdiffstats
path: root/tests/auto/unit
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-101-6/+0
|\ | | | | | | | | | | | | Conflicts: src/plugins/winrt/qwinrtcameracontrol.cpp Change-Id: I45d3042adf19577a72794610fa1c310cb22e26c4
| * decruft project fileOswald Buddenhagen2016-05-101-6/+0
| | | | | | | | | | | | | | the "created by qt creator" header is not supposed to be checked in. Change-Id: I6d8c623f41c633babe5923344c915412d3d6bcd4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-081-0/+2
|\| | | | | | | Change-Id: I7de78c63b5f81620474c69e5c651202c553a70d7
| * tst_qdeclarativeaudio: fix ubsan buildMarc Mutz2016-03-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | The test uses QDeclarativePlaylist, but no out-of-line methods or data members, so it got by with just including the header. But a ubsan build requires access to the class' typeinfo objects, so add QDeclarativePlaylist's implementation to the test, too. Change-Id: Ib6bb155b71c0082969f77a13a0e50132a782db2d Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-0718-54/+48
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/avfoundation/mediaplayer/mediaplayer.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro Change-Id: I5742596230dc510ba2a09eba624429bb67179194
| * Fix constructor parameters in tst_QMediaPlaylist.Friedemann Kleint2016-02-261-1/+1
| | | | | | | | | | | | | | | | | | Fix warning: tst_qmediaplaylist.cpp: In member function 'void tst_QMediaPlaylist::mediaPlayListControl()': tst_qmediaplaylist.cpp:1221:49: warning: the address of 'parent' will always evaluate as 'true' [-Waddress] Change-Id: I46391550d07a8f58442269d0e5eae418258adbff Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * remove redundant statements from project filesOswald Buddenhagen2016-02-2517-23/+12
| | | | | | | | | | | | | | | | | | | | - TARGET is unnecessary if it matches the project file's basename - CONFIG+=no_private_qt_headers_warning is added by qt_build_config.prf - load(qt_build_config) is done by .qmake.conf Change-Id: I3eb45a758dfee34be3c78fc13d996780741c95e9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-255-35/+35
| | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I8e1554b648327ea2fb342b882ce8e439bd6f271d Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-261-61/+42
|\| | | | | | | Change-Id: I2e4e9cca01d63ed0d1e7f71c7a58322390696036
| * Fix tst_QVideoWidget.Yoann Lopes2016-01-181-61/+42
| | | | | | | | | | | | | | | | | | | | | | Make sure the tested QVideoWidget has a valid size. Since 7b63c45d in qtbase, native widgets are required to have a valid size to be shown. This test relies on qWaitForWindowExposed() to work correctly, which means the widget must be shown and thus must have a valid size. Change-Id: I13bc1536d788d9ba56b4dcbf0c60851b5634be9e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-2098-1666/+1176
| | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I96559337481456cce6ea909fb7e53877acd352bd Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devChristian Strømme2016-01-154-30/+323
|\| | | | | | | | | | | | | | | Conflicts: src/plugins/android/src/mediacapture/qandroidcamerasession.cpp src/plugins/wmf/mftvideo.cpp Change-Id: I78868b416ea4baec89ca3e2dc9eb4712db16d5fc
| * Change the way a playlist is bound to a media object.v5.6.0-beta1Yoann Lopes2015-12-114-30/+323
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous behavior was to simply switch from the internal control to the service's control, discarding anything that was added to the playlist before binding. We now carry over the changes made to the playlist when switching controls. This means the switch is now transparent to the user. When the service's control is read-only, we cannot transfer the items, which means the user must be notified of the items that might have been "lost" during the switch. Auto-test modified to reflect this change. Change-Id: Ibf80b650b06425ddbaeb320b72ac5d3082a25960 Reviewed-by: Jim Hodapp <jim.hodapp@canonical.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Remove insignificant from tst_qpaintervideosurface testTony Sarajärvi2015-11-241-2/+0
| | | | | | | | | | | | Task-number: QTBUG-28542 Change-Id: If44652c36c09d3367197a0366b42b62aab565ff9 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-141-0/+154
|\| | | | | | | Change-Id: Ia6a6b6fce7aeca446b5e87ff72076fb8be2ada04
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-021-0/+154
| |\ | | | | | | | | | Change-Id: I1373622a6d1fd0e2d35df2da79860a373056387f
| | * Fix QML Camera::supportedViewfinderFrameRateRanges().Yoann Lopes2015-08-251-0/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the resolution argument as a QJSValue instead of a QSize. This allows to be more flexible and doesn't require the QML argument to be an actual QML 'size' value. It can be any object with the 'width' and 'height' properties. Added missing auto-tests for supportedViewfinderResolutions() and supportedViewfinderFrameRateRanges(). Change-Id: I6c8ae72e6dab8c9d12bbada5b8e7f45e96e9289d Task-number: QTBUG-47630 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-08-313-2/+571
|\| | | | | | | | | | | Change-Id: Ie3b254baa99c37b756b0950c9270f3c2b599469e
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Yoann Lopes2015-08-243-2/+571
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/imports/multimedia/qdeclarativeaudio.cpp Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13
| | * Fix QCamera viewfinder capabilities functions..Yoann Lopes2015-08-182-2/+454
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Filtering the results for a specific pixel aspect ratio would return wrong values. - Correctly sort the frame rate ranges returned by supportedViewfinderFrameRateRanges(). Added missing auto-tests for all viewfinder capabilities functions. Change-Id: Idfb40d4139cc48a5996ce2ddd98131a2f5be76bb Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| | * Check and fix up bounds in QMediaPlaylist methods.Loïc Molinari2015-08-101-0/+117
| | | | | | | | | | | | | | | Change-Id: I665d665139dbe9663b20ecb08fa3dab9cbe3f899 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests.Friedemann Kleint2015-08-2449-54/+6
|/ / | | | | | | | | | | | | | | | | There was only one test actually using the deprecated WaitForWindowShown(). Replace by qWaitForWindowExposed() and remove define. Change-Id: I2e71edca8f8be26c9a63b6a9d1fa30b31979c1fe Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Add audio role API to QMediaPlayer.Jim Hodapp2015-08-106-1/+181
| | | | | | | | | | | | Change-Id: Ia5e3e2fe714f10b6aad62f0a4801c607905c7e0d Task-number: QTBUG-41054 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-091-1/+2
|\| | | | | | | Change-Id: I957b44c06fca7a3f552edc18f286de043d31e42d
| * Add new property to QVideoSurfaceFormat.Yoann Lopes2015-08-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The 'mirrored' property indicates the QVideoFrames need to be mirrored along their vertical axis. This is typically needed for video frames coming from a front camera on a mobile device. This is implemented as a string-based property. In Qt 5.6, this should be replaced by a new public function. Change-Id: Ideb7de81e83f66826f4efb5f2951c4beec13546b Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Unit test qaudiodecoder: Do not rely on qCompare(bool, int,...).Friedemann Kleint2015-07-171-4/+4
|/ | | | | | | | | The overload was added for NokiaX86 and RVCT and is bound for removal. Task-number: QTBUG-47260 Change-Id: I8eb0333e0e20323ab20f361186d9a47fd3ab9f24 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Add CONFIG += testcase to auto/unit/qaudiobuffer/qaudiobuffer.pro.Friedemann Kleint2015-05-261-1/+1
| | | | | | | | When missing, make check is an empty target, meaning the test is never run in the CI. Change-Id: I6f09e0f78c26b631fdfe89d2520dc0012d177843 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* QMediaPlayer: handle resource files in a cross-platform way.Yoann Lopes2015-04-076-6/+108
| | | | | | | | | | | | | | | | | | | | It was the backend's responsibility to handle resource files in an appropriate way. In practice, it was either not handled at all, or implemented in an almost identical manner in every backend that does handle it. This is now dealt with in QMediaPlayer, always passing to the backend something it will be able to play. If the backend has the StreamPlayback capability, we pass a QFile from which it streams the data. If it doesn't, we copy the resource to a temporary file and pass its path to the backend. Task-number: QTBUG-36175 Task-number: QTBUG-42263 Task-number: QTBUG-43839 Change-Id: I57b355c72692d02661baeaf74e66581ca0a0bd1d Reviewed-by: Andrew Knight <qt@panimo.net> Reviewed-by: Peng Wu <peng.wu@intopalo.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Improve QMediaPlayer auto tests.Yoann Lopes2015-03-041-36/+133
| | | | | | | Use test data only for test functions that require it. Change-Id: I7fde1ba53ee8d2f5294597fd309a6e7d7dbbe15d Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Update copyright headersAntti Kokko2015-02-1297-679/+679
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I1c6faa4f59f8eca54f01ef20941fa60161dd7872 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* New camera viewfinder settings API.Yoann Lopes2015-01-134-1/+248
| | | | | | | | | | | | | | | | There already was a control interface for the viewfinder settings but no real public C++ API and a partial QML API. This patch adds a new C++ API and improves the QML API. Supported viewfinder settings are resolution, minimumFrameRate, maximumFrameRate and pixelFormat. The camera can be queried for the supported values for each of these settings. A new control interface was created to match the new API. Change-Id: I289fea038fe46277a5516c956a64280da09ed985 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Allow supported camera locks to change after initialization.Andrew den Exter2014-11-281-11/+11
| | | | | | | | | A camera backend may not be able to report which locks it supports until after it is loaded, so query support on demand instead of caching the value available at construction time. Change-Id: I56fb1adee980ebc2fa893da3c983a6dce26329c0 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* 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>
* | 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>
* | Update license headers and add new license filesAntti Kokko2014-08-2496-1816/+1048
| | | | | | | | | | | | | | | | | | - 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>
* | 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-1118-40/+848
|\| | | | | | | 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-032-11/+11
| | | | | | | | | | Change-Id: I48ae4b46f7a0342a1436ba78958b057e919e3a8a Reviewed-by: Marc Mutz <marc.mutz@kdab.com>