summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Edited the radio system testedakovaci2012-04-031-17/+17
| | | | | | | Added some missing detail Change-Id: I127a427e670196c80654eb4aae6cf7da4598f4ca Reviewed-by: Daron Andrew Edie <daron.edie@nokia.com>
* added locksreen, hw volume and headset systemtests to audiodakovaci2012-04-031-71/+125
| | | | | | | An addition to the audio systemtests Change-Id: I5b0625e25b4e11c6971eb8bc5bd09c2d0597c5cb Reviewed-by: Daron Andrew Edie <daron.edie@nokia.com>
* Fix tst_qmediaplayerbackend construction test.Ling Hu2012-03-301-1/+1
| | | | | | | | | Availibility test should use QTRY_VERIFY instead of VERIFY, should not assume available immediately after constructing. Change-Id: Ic267ac9718aeecfe186d593af5439c1ffcf48e94 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added some radio systemtests, editeddakovaci2012-03-292-20/+339
| | | | | | | | | Added some detail to the radio systemtest Edited the Camera systemtest Change-Id: I61c603e5de8e50400053da26563b937756aea316 Reviewed-by: Daron Andrew Edie <daron.edie@nokia.com>
* Add deleteLater() test to tst_qmediaplayerbackendSami Rosendahl2012-03-271-0/+52
| | | | | | | Task-number: QTBUG-24927 Change-Id: Ic58a33aad9038af0325d20bed16d3e70d7e15b5a Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Make this unit test a bit more robust for qreal changes.Michael Goddard2012-03-271-5/+2
| | | | | | | It's not just ARM that has qreal == float (and sometimes not even then) Change-Id: Ic2fa890afd9f926c455442d04dc84e57dffe7787 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fixes to qmediaplayerbackend integration test: use ogg video on Linux.Lev Zelenskiy2012-03-232-9/+38
| | | | | | | | | | Attempt to find supported video format before running tests. Tests are skipped if no video format is supported by the system. Change-Id: Iad5b26438b6407f0808e288c5e6184f220f30e36 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fixed media service provider auto test on Mac OS XJonas Rabbe2012-03-221-1/+1
| | | | | | Change-Id: I424ef50188244b5f4232534f9088bdc0071ea63e Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QMediaPlaylist: Added ability to load from provided QNetworkRequest.Lev Zelenskiy2012-03-211-0/+6
| | | | | Change-Id: I7d8fc8a432810ff87650808b9ca6af53f7356d4e Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Added integration test for new playlist functionality.Lev Zelenskiy2012-03-219-0/+167
| | | | | Change-Id: I9cc4a3d140003de737b81b4dcfa1e4a94d4a2ba4 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* QMediaPlayer frontend: changes to playlist support.Lev Zelenskiy2012-03-212-54/+61
| | | | | | | | | Allow to load playlists using setMedia(). Use QNetworkMediaPlaylistProvider for playlist parsing. Updated unit tests. Change-Id: If4dba07be8b2e8a9e9549d5bed58e552dfb958b7 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Marked media service provide test as insignificant on macJonas Rabbe2012-03-201-0/+2
| | | | | | | | Temporary measure to ensure that IID and plugin changes make it through CI, will be investigated once those changes have been integrated. Change-Id: Ie9313a0fa6081ebeff62a83f183ab2534c0469ee Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Updated IID, services, and controls to use qt-project URLJonas Rabbe2012-03-208-8/+8
| | | | | | | | | Instead of com.nokia.qt we should use org.qt-project.qt. All the identifiers have also been updated to use pure lowercase, and where used the version numbers have been updated to 5.0. Change-Id: Ib209327f5205f5a086a5932394504a8a52e1f712 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Updated plugins to use new plugin architectureJonas Rabbe2012-03-2018-233/+570
| | | | | | | | | | | | | | | | | | | Changed QMediaPluginLoader to use QFactoryLoader instead of QPluginLoader and used metadata to get keys. Removed QAudioPluginLoader and changed audio classes to use instead use QMediaPluginLoader. The plugins must include the Q_PLUGIN_METADATA macro, and no longer use the Q_PLUGIN_EXPORT/Q_PLUGIN_EXPORT2 macros. A json file has been added for each plugin which can contain metadata which is available to the plugin loader before the plugin is actually loaded, and is used to read the keys for the plugin, e.g. supported services. QFactoryInterface will be deprecated and has been removed from all plugins. Change-Id: I035b82f9c9c65717bebf704d560ea8f891df21da Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Make QDeclarativeAudio use QMediaPlayer instead of the controls.Michael Goddard2012-03-163-9/+9
| | | | | | | | | | Very minor changes in semantics due to previous differences: * negative positions are not supported any more (clamped to >= 0) * setting muted to the same value previously set to the control itself won't signal any more. Change-Id: Iacf4310508d853ae82b63dee28095fce12b6ff28 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Merge the QDeclarativeMediaBase and QDeclarativeAudio classes.Michael Goddard2012-03-161-3/+1
| | | | | | | | | Since there is only one subclass of base. Next step is to clean up QDeclarativeAudio Change-Id: Ibda8c3006efa165b58372a011121f04a39458562 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Add use of TESTDATA feature to integration testsKalle Juhani Lehtonen2012-03-1511-23/+15
| | | | | | | | Use TESTDATA and QFINDTESTDATA in integration tests. Also remove unused path defines from unit test .pro files. Change-Id: I46dc6a96b918e989acf79eb3bd23c53125c7c3d6 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Updated declarative components to use the QML moduleJonas Rabbe2012-03-146-6/+11
| | | | | Change-Id: I4b49466ba5248683c2285f98ce17bc2c24bba515 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Made QRadioData bind to QRadioTuner to avoid using multiple servicesJonas Rabbe2012-03-123-58/+100
| | | | | | | | | | | | | | | | | | | | | QRadioData has been updated to be a QMediaBindableInterface, and it will bind to a QRadioTuner instance, i.e. a QMediaObject that provides a service which implements the QRadioDataControl. This change is reflected in the declarative implementations of radio tuner and data. There is a new `radioData` property in the Radio element which will give access to the declarative RadioData element for the tuner. If a RadioData element is created in QML, it will have an anonymous tuner which communicates with the underlying media service (which is pretty much the same how the QRadioTuner and QRadioData classes work previously). Updated radio tuner and data test cases to use availability control and extended the mock media service to allow providing a number of controls rather than just one (needed for testing availability of all classes extending from or using QMediaObject). Change-Id: Id41dde66eee529decd828fd2dcdfe4a54c0e81f4 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Update Qt Multimedia tests to use TESTDATAKalle Juhani Lehtonen2012-03-123-9/+14
| | | | | | | | | | Qt5 brought support for general for test data install and find. This change replaces old Qt4 time deployment supported in WinCE and Symbian with the new general solution using TESTDATA in .pro files and QFINDTESTDATA in source code. Change-Id: I5dbe3ca22e2259f249ebb4df570ea91f17d23526 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added playlist property to QMediaContentLev Zelenskiy2012-03-121-0/+38
| | | | | | | | | This is a part of changes to QMediaPlayer related to playlist handling. Updated unit test. Change-Id: Ic2460dc4d3121788cd5eb08df71e6d45aac032bc Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Don't request renderer control if null surface is set as video output.Dmytro Poplavskiy2012-03-122-0/+20
| | | | | | | | | | | | | QCamera and QMediaPlayer are likely to wait for valid surface to be passed to the renderer control before startup, so after player->setVideoOutput(nullSurface) player will not start playback. If the renderer control was already requested before for valid surface it should be released when the null surface is assigned. Change-Id: I3f78f2d82e61fae5f305874874c0ffbc4cb7dc1d Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Move most of playlist API to private.Lev Zelenskiy2012-03-065-9/+9
| | | | | | | Moved objects either not needed to be public or require API review/redesign. Change-Id: Ibeb8b8c9c9a74bea32191c119fa4daaffde57c17 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Fix some memory leaks.Michael Goddard2012-03-052-5/+9
| | | | | | | | Adjusted a unit test or two to make leaks easier to find, and then fixed a few leaks. Change-Id: I47a20df8de7cac113d34a2015f76a65ab957dedd Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Expose availability from the backend to C++ and QML.Michael Goddard2012-03-028-45/+200
| | | | | | | | | | | | | | The availabilityError property was static based on the service, but it can change at run time, so add the plumbing to allow the backend to report it itself. Also make sure that both QML and C++ expose the availability. The radio tuner and data controls previously had properties (but no signals) for availability - these have been removed. Change-Id: I9240cf93e2a51b14cd38642f9312ae3c75f05361 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Changes to GStreamer backend for audio decoder.Lev Zelenskiy2012-02-243-49/+146
| | | | | | | | | | | | Removed WaitingState. New signals: finished(), positionChanged(), durationChanged(). New methods: position(), duration(). A parameter removed from read() method. Unit tests updated. Change-Id: Ie9d8a2804285c5542e592cce69963adbdf6ebfb8 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Don't use QT_ARCH to detect ARM or OpenGL ES 2 on ARMBradley T. Hughes2012-02-221-1/+1
| | | | | | | | | | | Use Q_PROCESSOR_ARM instead of QT_ARCH_ARM. On maemo6, don't use QT_ARCH==armv6 to conditionally include egl code. Instead check for opengles2 in QT_CONFIG, which is detected by the configure script. Change-Id: Ib3062fbd81c3a3acd318df32c49ad133a5b0d07c Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix a few audiodecoder things.Michael Goddard2012-02-212-10/+215
| | | | | | | | Beef up the autotest a little, and check the conversion. Change-Id: Ifffca118e092eb6c388db50a6eb12810a87aa32a Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix QAudioBuffer sampleCount vs. channelCount.Michael Goddard2012-02-211-8/+41
| | | | | | | | | | | There were some inconsistencies in when the sample count was per channel or in total. The docs mention that it is in total, so fix a few cases where it went wrong and test it. Change-Id: I55c855911fcde66a218d6cdd327e09ad5406d5a4 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* GStreamer backend for audio decoder service.Lev Zelenskiy2012-02-173-0/+166
| | | | | | | Includes basic integration test. Change-Id: I4c6d1dbefa1f27e107b3556a3d4da58811eeb122 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Use QTESTFINDDATA to FIND TEST DATA.Michael Goddard2012-02-171-24/+30
| | | | | | Change-Id: I5fd222e562045085b3d08e19c6544f674e9429d4 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* GStreamer backend changes for media probing API.Lev Zelenskiy2012-02-161-10/+82
| | | | | | | | QGstreamerPlayerSession: Using GStreamer buffer probes to access media data. Change-Id: Ibc056283fdedaebba90456cc4e86ab63eae5f5f7 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix some compiler warnings.Michael Goddard2012-02-141-0/+1
| | | | | | | | | As it turns out, we had an overloaded virtual from an earlier era, with the extra parameter never used. So cleaning that up was a bonus to remove the compiler warning. Change-Id: I780287f8a5d2b0a1ec84ec62c88ba50e051f372b Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Remove duplicates definitions of QTRY_VERIFY and QTRY_COMPARE.Jason McDonald2012-02-132-48/+0
| | | | | | | | | These definitions were already ignored due to #ifndef directives surrounding them, so presumably the differences in timeout values between these definitions and those in testlib are acceptable. Change-Id: Ib860fc1ed27ef0690e619ffeed516f7417ae4cd0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Moved camera testsdakovaci2012-02-092-133/+2
| | | | | | | Moved camera tests out of Qt5Multimedia Change-Id: I571332217dac885810c8fb7a6d28020d4578e55f Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com>
* Add the audio decoder variant of QMediaPlayer.Michael Goddard2012-02-086-1/+625
| | | | | | | | Rather than the probe based way of doing it. Initially private. Change-Id: I30005f8da22f6451cb9de8eb3f0e193838d48c93 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Remove some more QTest::qWait(10) calls.Michael Goddard2012-02-083-20/+6
| | | | | | | | Since it seems to have changed slightly recently. Just use QTRY_COMPARE instead. Change-Id: I802c2e26acf5418bb5904fadd2a978a44fd9eb01 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* API changes to QML element MediaPlayer aka AudioAngus Cummings2012-02-084-382/+1414
| | | | | | | | | | | | | | | | | | Changed Video.qml for new API Removed lowercase enum copies, replaced with calling parent (VideoOutput, MediaPlayer) enums Removed properties playing, paused Removed signals started, resumed Added readonly property playbackState Added signal playing Added autoPlay property Fixed unit tests for new API Added backwards compatibility for QtMultimedia 4 Change-Id: I27c91cd46d91402b8c4c42bb7d4961ad67909aeb Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* tst_qmediaplayerbackend: try to load test file from the current dir.Dmytro Poplavskiy2012-02-071-0/+3
| | | | | | | This makes testing easier on other system than test was build. Change-Id: I75c4d620c8132a7fd298fe735dfdc1bf6f775e08 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add a QAudioBuffer class.Michael Goddard2012-02-063-0/+388
| | | | | | | | Prereq for probing or decoding. The abstract API probably needs to change. Change-Id: Ie0bf796c1f581f34bbc0a8af2dffc387c513a330 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Moved QMediaServiceProvider to private header.Dmytro Poplavskiy2012-02-064-4/+4
| | | | | | | It's not intended to be used by applications. Change-Id: I2acc26180ebb5c2419438169827f39aaf4578389 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Changes to QMediaPlayer GStreamer backend to allow setPosition before pauseLev Zelenskiy2012-02-062-0/+125
| | | | | | | | | | Do not display prerolled frames in stopped state. Instead store prerolled frame and display it only after switching to pause or playback state. Added new unit test with a sample video file to check this functionality. Change-Id: I3fd159a199b65ca10fdf9843af5675c5ae9dad05 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QMediaPlayer::setPosition: do not check isSeekable and do not bound by durationLev Zelenskiy2012-02-061-5/+0
| | | | | | | | | | | To allow setPosition to be called in stopped state we no longer check if the player is in seekable state and allow position to be greater than duration. Unit test has been updated accordingly. Change-Id: I29447ffe797a7cc3dcc80d20b2527e9eda493ab6 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Added metaDataChanged(key,value) signal to metadata controls.Dmytro Poplavskiy2012-02-064-15/+58
| | | | | | | | | | | | | | It may be more efficient and convenient for application to use this signal instead of metaDataChanged(). metaDataChanged() signal is emitted for compatibility, backends should emit both signals. Signal added QMetadataReader/WritterControl, QMediaObject and QMediaRecorder. Change-Id: I5ca34a40e64b22034e6fde8cd7f9735cc3f72c68 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Made camera unit tests more stableDmytro Poplavskiy2012-02-062-21/+18
| | | | | | | Replaced qWait() with QTRY_COMPARE() Change-Id: I951bd8ca1eaaf8d0fd7308a90f82afcdb0475819 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove QMediaImageViewer (SC break).Michael Goddard2012-02-0314-1239/+2
| | | | | | | This class has turned out to be not very useful at this point in time. Change-Id: Ic07132bdcd01a912a6dd1160c867979fd1307b6a Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Changed QCameraFocus::focusMode type to QFlags based FocusModesDmytro Poplavskiy2012-02-021-4/+4
| | | | | | | It was intended to be QFlags based from the start. Change-Id: I0919b3440eb18e84fc596fb894f18a53e5ff1da0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QCameraImageProcessingControl API fixesDmytro Poplavskiy2012-02-022-61/+57
| | | | | | | | | | | | | | | | Moved white balance preset from the separate methods to QCameraImageProcessingControl::ProcessingParameter; Separated absolute contrast/saturation/sharpening/denoising settings with adjustments to backend decided values, with QCameraImageProcessing using adjustments versions. Changed type of parameters from int to qreal with [0..1] range for absolute values and [-1..1] for adjustments. Change-Id: I85c8781c046be6dd45bcf626c25908e1ce5f6bcb Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added QMediaRecorder::actualLocation propertyDmytro Poplavskiy2012-02-012-0/+20
| | | | | | | To report the actual location file was written. Change-Id: Ibb56a720a258a1e5cedceaf0f9bcea73fb93bc96 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Split QMediaRecorder::setEncodingSettings to separate setters.Dmytro Poplavskiy2012-02-014-14/+65
| | | | | | | | | | It's easier to change only the necessary part of encoding settings. The settings are applied during the next event loop or before recording starts. Change-Id: Ia2b5c93826a302212aa7f79a0c75e4cbaaf1dd7a Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>