summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3091-92/+92
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I20e5215108c6ebd5f8474fed5c3665118e4791e6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Moved zoom related properties out of QCameraFocusControlDmytro Poplavskiy2012-01-275-67/+146
| | | | | Change-Id: I16f9b80ebbacc0b325530e81c291dc030763b65e Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix some surface assignment errors.Michael Goddard2012-01-271-3/+21
| | | | | | | | On destruction and changing sources, make sure we don't clobber the surface property if it's been changed. Change-Id: I3080b98a547911543a391c8bc040792d260782fd Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Add a rendered and content rectangle properties to VideoOutput QML.Michael Goddard2012-01-274-2/+708
| | | | | | | | | | | | | So you can align controls with an edge of the rendered area. There's also some convenience functions for mapping source to and from destination coordinates. Also tweaked the updateGeometry function to bail out if no input parameters have changed, rather than doing some more boring maths. Added a unit test for a lot of the class, too. Change-Id: I943bb45e4e56356247d5d6deb5d446222edcb7ca Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Add a volume (gain) property to QAudioInput.Michael Goddard2012-01-251-0/+27
| | | | | | | | Only implemented for PulseAudio so far, but the API does explain that it's optional. Change-Id: I4543a1c81d810fe92bb08f1ed13f3a3534a371e4 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* QCameraExposure API refactoringDmytro Poplavskiy2012-01-252-90/+101
| | | | | | | | | | | | | QCameraExposureControl: Separated requested from actual exposure values. Removed ParameterFlags, it's confusing and seldom used. Moved ExposureMode and MeteringMode to parameters. QCameraExposure: Added requestedAperture/ShutterSpeed/Iso getters Change-Id: I408586d85e6c9de0c8a711c32b3c90ea46052270 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Removed QMediaServiceProvider parameter from media objects constructors.Dmytro Poplavskiy2012-01-2411-324/+272
| | | | | | | | | | | | | QMediaServiceProvider should be removed from the public API, to provide media objects with a custom media service. A protected QMediaPlayer/QCamera/QRadioTuner/etc constructor with QMediaService* parameter is a cleaner and more flexible solution. Change-Id: I335cce4bbebe0e548c3df338f206e7be7c93c3dd Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Implement QAudioDeviceInfo operator==/!=Michael Goddard2012-01-231-107/+90
| | | | | | | | | | | | | Compares some of the useful parts, but perhaps should be made more tolerant. Also refactored the auto test to properly skip if there are no (output) devices, rather than manually skip. Task-number: QTBUG-13723 Change-Id: I3b83f87a440a83f4237fa119a23009bc99e7626a Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-2389-89/+89
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: Ie8cd560b6d9a2c6e552b6be1ad8bc96c80a6535c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed compile.Rohan McGovern2012-01-231-2/+2
| | | | | | | Removed usage of QBool. Change-Id: I5e1db9cd3e833a196d73a3493967daa573200c77 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Changed metadata keys type from enum to QString.Dmytro Poplavskiy2012-01-2012-191/+63
| | | | | | | | This allows to combine metaData and extendedMetaData and simplify metadata handling on both backend and application sides. Change-Id: I136eedc86c215be3485db101c43069ca7c82101b Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QAudioRecorder: fixed handling the missing inputs control.Dmytro Poplavskiy2012-01-191-18/+19
| | | | | | | | Added check for null audioEndpointSelector control in QAudioRecorder::audioInputs() Change-Id: I506dcea9e8d3a468319acf2489cd4d803a5c187d Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Replaced QAudioCaptureSource with QAudioRecorder.Dmytro Poplavskiy2012-01-196-69/+43
| | | | | | | | | | QAudioCaptureSource name is confusing, it's essentially an audio recording service but it's not evident from API. QAudioRecorder replaces QAudioCaptureSource+QMediaRecorder combination. Change-Id: I0082d766fc0d1b8d5ecbfc527f13e715add730c8 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Set the volume for our automatic integration tests.Michael Goddard2012-01-182-0/+12
| | | | | | | | | These aren't manual test, so we don't care if you can't hear it. QSound does not have a volume property (yet). Change-Id: I6ef90262decf4630de84478215bfe8d259db4751 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Changed QCamera::captureMode property to QFlagsDmytro Poplavskiy2012-01-173-15/+15
| | | | | | | | | This enables the expression of extra camera modes like viewfinder only or capture during video recording. Change-Id: Ie02fdeef5eb7fd6fc2f133c1afb0141e37c22b06 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add a metaData property to QVideoFrame.Michael Goddard2012-01-131-12/+48
| | | | | Change-Id: I6614cd86e3e1e170277bfc751222b5b42cb657eb Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Update year in Nokia copyright headers.Jason McDonald2012-01-1286-86/+86
| | | | | | | Update headers from before 2011 that were missed in the previous commit. Change-Id: Ib0fd91a39ffc57117fe01280e34519c3f914fac0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove widgets config test.Michael Goddard2012-01-111-1/+1
| | | | | | | | | Since it's not guaranteed that other Qt modules will be built by the time qmake is run (and config.tests are created) we can't rely on compilation. Just check the module.pri variable for widgets instead. Change-Id: I352cf6427b748b89b69ec17588ce0dd83065090f Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fix for QSoundEffect crash bugMithra Pattison2012-01-062-1/+1
| | | | | | | | | | | | When multiple QSoundEffect instances play the same wav source file simultaneously, the system would crash due to some instances not waiting for the underlying pulse audio stream to complete its setup logic. QSoundEffect now waits for the stream to attain the correct state before playing the sound. Change-Id: Ib5a1e6bc3f1cc314054f9cdc89c10100ad546721 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add the spot for spot metering mode.Michael Goddard2012-01-062-3/+31
| | | | | | | Not yet fully documented in QML - needs a bit of an overhaul first. Change-Id: Ic11684858fb872d0b4dcedf60b390571371db252 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Properly handle the case where QtWidgets is not available.Michael Goddard2012-01-063-5/+2
| | | | | | | | | | | | | | | It does use a config test for now, just to make it clearer. The Mac backend currently requires widgets, but most of the others should work without it (just not supporting QVideoWidget/WindowControl). The QVideoDeviceControl interface was modified to remove the QIcon usage - it was never implemented. Unfortunately even the QML examples need widgets for the wrapper application, and will need to be ported to QtGui based wrapper. Change-Id: I8a55ad5cf09ab51749510bf16f49de0bd3f0bcdb Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-063-3/+3
| | | | | Change-Id: Ib82c1be5548443ef1f5e97b3d5641a2f55d212af Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QtMultimedia: Fix compiler warnings.Friedemann Kleint2012-01-052-2/+2
| | | | | | | | | | | - Fix deprecated QDeclarative includes. - Comment out unused parameter. - Remove trailing comma from enumeration value (Clang) Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Change-Id: I31d54a12505f4e3a48eb4b7736a48d5dacc2c0d9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QSound/QSoundEffect: Use QFINDTESTDATA to locate test data.Friedemann Kleint2012-01-054-12/+14
| | | | | | | | | | Replace SRCDIR define by QFINDTESTDATA, which is the standard method of locating test data. Remove apparently unused code path within QT_QSOUNDEFFECT_USEAPPLICATIONPATH. Change-Id: Id7120e75af727839ad2d1d2b3ef25c7ef2122fa5 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Restructure the source code a little.Michael Goddard2012-01-051-2/+2
| | | | | Change-Id: I995b0fb33bdda7f01bf6266c1c50a1b17eba6760 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* QAudioIn/Output-tests: Remove SRCDIR-macro/stabilize.Friedemann Kleint2012-01-044-115/+105
| | | | | | | | | | | | - Introduce QTemporaryDir to create a temporary directory to write the files, preventing file open failures caused by left-overs of failed tests. - Use smart pointers for files and QTemporaryDir to ensure that files and the directory are always cleaned up at destruction time. Change-Id: Icfbb331dbdd586012b5787f91c36e164033c4120 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Initialize the mock player state variables.Michael Goddard2012-01-041-1/+17
| | | | | | | | So valgrind is less grumpy. Change-Id: I3219fd1eaa2296bc6e158876137e0b79c4d8b714 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Remove a random instantiation of a backend.Michael Goddard2012-01-041-4/+6
| | | | | | | Not appropriate for a unit test. Change-Id: I7b05bb8aa067382b34e30d0602809c9fe56b27ef Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Remove some test functions that are actually integration tests.Michael Goddard2012-01-041-39/+0
| | | | | | | | And they're already in the qcamerabackend test. Change-Id: If3edba9035380372a2e8d46efe1cf41e91ce5f09 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Add new implementation of QSound classMithra Pattison2011-12-306-2/+148
| | | | | | | | | | | | Added a re-implementation of QSound, using functionality derived from QSoundEffect. QSound API remains the same as the original 4.x version. It offers both a static interface (with auto resource cleanup on sound completion), as well as an object instance interface for more detailed control. Change-Id: I85c00dd88547f8dea9b1e1ef2da31d2f2e28a172 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* SoundEffects System Tests addeddakovaci2011-12-071-8/+65
| | | | | | | Added some soundeffects systems test to the audio systems test Change-Id: I9f9392a9bee50c11d0ec9d32490b79241e49014a Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com>
* Edited the Camera systemtestdakovaci2011-12-071-8/+2
| | | | | | | Just some small editing Change-Id: I918a259570ef105047015dccfbf27c1be6e5a513 Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com>
* Remove unused QTRY_WAIT macros.Jason McDonald2011-12-062-29/+0
| | | | | Change-Id: I8484c19d0458d9ec9a3a621fa0b866258e8212c3 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>