summaryrefslogtreecommitdiffstats
path: root/tests/auto/unit
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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>
| * New QCameraInfo class.Yoann Lopes2014-02-2817-29/+837
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | 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>
* 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>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-173-6/+11
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id367a610a3aefd288bfe287a3bf64606e582deb9
| * Fix build without Qml and Quick modules.Yoann Lopes2014-01-163-6/+11
| | | | | | | | | | | | | | | | | | 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>
* | 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>
* 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>
* 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 calculation bug in QWaveDecoder.Christian Strømme2013-03-222-0/+2
| | | | | | | | | When comparing the size of the WaveHeader and the chunk size, we need to include the ID and Size fields, or any extra data won't be discarded and the parsing will fail. Change-Id: I730833f33f57b26cd750985354136191f7e7ce04 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-1990-92/+92
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/doc/qtmultimedia.qdocconf src/plugins/blackberry/mediaplayer/bbmetadata.cpp src/plugins/blackberry/mediaplayer/bbmetadata.h tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
| * Fix XPASS on Ubuntu Precise Pangolin.Friedemann Kleint2013-02-182-1/+3
| | | | | | | | | | | | Change-Id: I0199ad3a52621763c214fa65302d3de4701814cf Reviewed-by: Tobias Koenig Reviewed-by: Andy Nichols <andy.nichols@digia.com>
| * make use of qtHaveModule()Oswald Buddenhagen2013-01-112-4/+2
| | | | | | | | | | | | | | Change-Id: I14da5455b7dd4681254e1652395df5f5c65746bd Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Update copyright year in Digia's license headersSergio Ahumada2013-01-1088-88/+88
| | | | | | | | | | | | Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Remove QEXPECT_FAIL on Linux for QPainterVideoSurface::shaderPresentAndy Nichols2013-02-191-6/+0
| | | | | | | | | | | | | | | | | | | | | | These tests seem to be passing consistently now, so this is an attempt to reenable them on Linux, as right now passing them on some Linux machines in CI is causing failures. Task-number: QTBUG-26320 Change-Id: I4f2b219dc694e24d8beee651919f3b805922bde1 Reviewed-by: Tobias Koenig Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-281-4/+0
|/ | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Id95d10f5d9c146d9eb496119af6a8b8501ffcb17 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-1632-32/+0
| | | | | | | | qt is already added by spec_pre.prf, warn_on by default_pre.prf, and no_private_qt_headers_warning by qt_build_config.prf. Change-Id: Ia5cee420d577dd0ae0120cb2dd430d4ddd29ebcf Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* test: Mark tst_QPainterVideoSurface as insignificant on WindowsSergio Ahumada2012-12-111-0/+2
| | | | | | Task-number: QTBUG-28542 Change-Id: Ib879ffd31e534cc9cde4c4893af6f2a7799529cd Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add PLUGIN_CLASS_NAME to qtmultimedia pluginsMiikka Heikkinen2012-12-104-0/+4
| | | | | | | | Needed for automating static plugin loading. Task-number: QTBUG-28131 Change-Id: Ia392b112fc46dedd34c9ffdbd6e874dbbfeaef83 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove pointless QT.<module>.sources referencesOswald Buddenhagen2012-12-044-15/+15
| | | | | | | | there is no point to use this for in-module references. cleaning it out in an attempt to purge the constants entirely. Change-Id: Id160b6241126717dc412d80aeaa13df3cbf8fa17 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix syncqt-warnings.Friedemann Kleint2012-11-191-1/+1
| | | | | | | Use include with module name for the multimedia-classes. Change-Id: I8da1a4015a162959b604cd859aee139e246e3f6c Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Rename namespace QtMultimedia -> QMultimediaSze Howe Koh2012-11-0617-171/+171
| | | | | | | | | | | | | | | | Main code, examples, tests and docs updated. Method: 1. Mass find+replace "QtMultimedia::" -> "QMultimedia::" 2. Hand-modified declaration in qtmedianamespace.h/cpp For consistency (with minimal disruption), namespaces with a "Qt" prefix will be renamed. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Rename namespace QtMultimedia::MetaData -> QMediaMetaDataSze Howe Koh2012-11-067-32/+32
| | | | | | | | | | | | | | | | | | Main code, examples, tests and docs updated. Method: 1. Remove unused forward-declarations, "class QMediaMetaData" 2. Mass find+replace "QtMultimedia::MetaData" -> "QMediaMetaData" 3. Un-nest from the QtMultimedia namespace in qtmedianamespace.h For consistency (with minimal disruption), namespaces with a "Qt" prefix will be renamed. Also, Qt guidelines don't include nested namespaces (http://lists.qt-project.org/pipermail/development/2012-October/006756.html) Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I40e59c1cf58c1792725e735e9285c51bc5f226b1 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* adjust to qt_plugin.prf changesOswald Buddenhagen2012-11-054-16/+16
| | | | | | | | | | DESTDIR and INSTALLS+=target are set up automatically now. note that in the qmediaserviceprovider test we must override that. also, TARGET munging is done automatically. Change-Id: Ida5d5601e22b099134d1ec07ace713e0d0986bd6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove stale QT_MODULE() usage casesSergio Ahumada2012-10-251-2/+0
| | | | | | | As of Qt5, this macro is defined to be empty; simply get rid of these leftovers. Change-Id: Id24056c0afd013904b1e098dc49e502038fd77a4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Build fix after a QVariant changeJędrzej Nowacki2012-10-101-4/+4
| | | | | | | QVariant(Qt::GlobalColor) ctor was removed in Qt5. Change-Id: If272ff26003cdc58eb3decf5030e927134d126b0 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2488-2118/+2118
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Id77334cfb15de096941c88e32d04ca07b4eb4709 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-124-12/+0
| | | | | Change-Id: Ie07a32729ec8679f799613f8f6ccdd9c1b6bf7c9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Re-enabled CIImage based gfx video item on MacDmytro Poplavskiy2012-08-271-4/+4
| | | | | | | | | Also prefer CoreImageHandle to GLTextureHandle in QuickTime player backend, to avoid unnecessary copy via FBO. Change-Id: Id5aa039c438378b7bbf816b7845b05574683c471 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Compile in C++11 mode: the Q_DECLARE_METATYPE must be visibleThiago Macieira2012-08-061-2/+2
| | | | | | | | | | | The error was: tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp:113:62: required from here qmetatype.h:637:5: error: static assertion failed: Type is not registered, please use Q_DECLARE_METATYPE macro to make it know to Qt's meta-object system Change-Id: Id4e29803de646cbad0d401b1fe0e0b38e458d12f Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Set the Qt API level to compatibility mode in all tests.Thiago Macieira2012-08-0145-0/+45
| | | | | | | | | | Qt 5.0 beta requires changing the default to the 5.0 API, disabling the deprecated code. However, tests should test (and often do) the compatibility API too, so turn it back on. Task-number: QTBUG-25053 Change-Id: I9589f57998af237f2e89c7799789dae5a13ef634 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix compile failure in qmediaplayer unit testKurt Korbatits2012-07-261-1/+0
| | | | | Change-Id: Ic8342f536b16c55c79e4ff792634d5d1a03e3a9a Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>