summaryrefslogtreecommitdiffstats
path: root/tests/auto/unit
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* QtMultiMedia/Tests: Fix MSVC2012 warning about overload.Friedemann Kleint2012-07-251-1/+1
| | | | | | | | | | warning C4373: 'MockVideoSurface::supportedPixelFormats': virtual function overrides 'QAbstractVideoSurface::supportedPixelFormats', previous versions of the compiler did not override when parameters only differed by const/volatile qualifiers. Change-Id: I87701ce0a2db3d4a0ec0a98980ad231f352a2ab2 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QtMultimedia: Remove usages of qWaitForWindowShown(QWidget *).Friedemann Kleint2012-07-241-49/+49
| | | | | Change-Id: I7a2869c381da133b72b1721838a458cdbf058b0d Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Replaced endpoint control with audio input and output controlsDmytro Poplavskiy2012-07-247-41/+41
| | | | | Change-Id: I981aabe39d106ced4ee1240db9e5b653c6fa5e91 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Removed QEXPECT_FAIL for non reproducible showFullScreen bug on MacDmytro Poplavskiy2012-07-241-6/+0
| | | | | | | Task-number: QTBUG-25310 Change-Id: If5786340386de5f6664ccfa45439858d209a45ba Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added volume property to QMediaRecorderDmytro Poplavskiy2012-07-192-0/+34
| | | | | Change-Id: I19f727107651c9f640ca1c010a3764f05aef8820 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Skip crashing tests and replace insignificant tests with QEXPECT_FAIL.Toby Tomkins2012-07-122-2/+82
| | | | | | | | | Task-number: QTBUG-25310 Task-number: QTBUG-26481 Change-Id: Ib6cbbe4f23a7ad7ea72db0f686aa5b2c96eeff76 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Clarify API/docs by introducing the audio "frame", and add helpers.Michael Goddard2012-07-112-10/+112
| | | | | | | | | | | The frame is the interleaved set of one sample for each channel. Add some docs and some methods that make working with samples a bit more convenient. Adjusted QAudioBuffer to use these helper functions and terminology. Change-Id: I96db48e659561972d6de2aa19893d29f9a828cd3 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Delete obsolete class methods and update related codeMithra Pattison2012-07-104-29/+21
| | | | | | | | Delete obsolete methods from QAudioFormat and QAudioDeviceInfo and update code that relied on the obsolete methods. Change-Id: I007e36375a45399b1d5a289341bc5d5a05dc68cc Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed a testing bug on windows platform.bigbearzhu2012-06-291-0/+6
| | | | | Change-Id: Iaf11864e6929345b105cdd185b4bb01b24961406 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Rename availabilityError to availability.Michael Goddard2012-06-2911-53/+53
| | | | | | | It's perhaps clearer in the usual case. Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Rename a few controls.Michael Goddard2012-06-2912-41/+41
| | | | | | | | | | The encoder controls could be confused with actual encoding, so make clear they are just settings. Also, the end point selector controls were not named very well. Change-Id: I27f8bf9c865c5f295abad97c01ef98752af42613 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Fixed timeout on waiting for positionChanged event.bigbearzhu2012-06-271-2/+2
| | | | | Change-Id: I894af066073f601e5838dbd47eb92da516c04544 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed plugin dir error on Windows.bigbearzhu2012-06-275-2/+30
| | | | | Change-Id: I470877d988fb70915607b65c4f17eee1adb8049d Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove insignificant flag from tests that are passing.Toby Tomkins2012-06-262-4/+0
| | | | | Change-Id: I246d7cfa79cbbbee3cfc4a354b38c155aa887aa2 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add expected fail flags for consistently failing autotests.Toby Tomkins2012-06-261-0/+6
| | | | | | | Task-number: QTBUG-26320 Change-Id: I58624a8c39c0c247d9073097616a7a78e7e307da Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed a testing bug.bigbearzhu2012-06-261-2/+2
| | | | | Change-Id: Iff7fb6d4de2f38fde37019ea7e8b034707f8bbe1 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-254-4/+4
| | | | | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - pointless DEFINES+=QT_MAKEDLL - pointless and commented out include and depend paths - qmake -project boilerplate Change-Id: I8f4586403848fe8f2dff4e889b389956ffcdea59 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Replace a writable position() property with a seek() method.Michael Goddard2012-06-141-5/+5
| | | | | | | | Seeking is sometimes asynchronous, and more importantly nearly every one using a slider for seeking ends up with a binding loop. Change-Id: I45d92e19b0276c8b97c51c073754d1c9d3dc611e Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Remove the legacy QML API.Michael Goddard2012-06-083-1318/+0
| | | | | | | | This means no version 4.0 (which was never released) and no Qt.multimediakit alternative import. Change-Id: Iaacf047b0d72381a4a8cd975e036135ed11ea383 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Don't use QtWidgets/QApplication in autotestsKent Hansen2012-06-072-2/+2
| | | | | | | | These tests don't link against QtWidgets; including QGuiApplication is sufficient. Change-Id: I96812af7ac5ef79a9602acf4b51498350e8e50e1 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Removed encoding options from Audio/Video encoding controlsDmytro Poplavskiy2012-06-075-85/+0
| | | | | | | | | | | They are replaced with encoding options from QAudio/Video/ImageEncoderSettings. This also allows to specify options without requesting controls. Change-Id: I507e68cdb8cb46325689804d27c6d0561cada50b Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Use QPointer instead of QWeakPointer to track QObjects.Stephen Kelly2012-06-071-2/+2
| | | | | | | The latter is to be deprecated. Change-Id: I01998be880feba0819a9bc51f9bec48fd4601789 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Added custom parameters to Audio/Video/ImageEncodingSettingsDmytro Poplavskiy2012-05-182-0/+69
| | | | | | | This allows to specify more advanced and system/codec specific settings Change-Id: Ia0a2e94eaf56df285a219018e0beab895a2e7c2a Reviewed-by: Ling Hu <ling.hu@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 09:47:22 +0000