Commit Graph

126 Commits

Author SHA1 Message Date
Maurice Kalinowski
3420041883 Blacklist testSetSourceWhileLoading on all Linux distros
(cherry picked from ccb985990880717f29fdec16f119b0c02b93d643)
Change-Id: I94d970cb51202d35d894503b1fa5c342b8e8ae44
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
2016-10-06 11:27:05 +00:00
Milla Pohjanheimo
026aec5079 Blacklist testSetSourceWhilePlaying() in 5.6
The test is flaky and running it 300 times didn't reproduce the
failure.

Change-Id: Ib03722579dbe58c05cb324fdca37eb7e5b732e33
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
2016-09-29 13:30:49 +00:00
Milla Pohjanheimo
c4bf444f5c Stabilize pushSuspendResume() autotest
Same as 7d00a457e4.

Change-Id: Ia7b01eef7650c1db23562d1a36a4a19748c92fc7
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
2016-09-27 08:03:18 +00:00
Milla Pohjanheimo
9d9a29bcc3 Stabilize tst_QAudioOutput::pull() and push() autotests
Same as 7d00a457e4.

Change-Id: Iaf4a9d4eb5b5afe307a82af6f1a7fdf3e49f08ac
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
2016-09-23 07:02:11 +00:00
Yoann Lopes
7d00a457e4 Stabilize tst_QAudioOutput::pullSuspendResume()
Don't wait after resume(); the test is meant to check the state of the
QAudioOutput right after the call, not later. The state and the error
status are supposed to change immediately, even if the backend runs in
another thread.
Ignore any state change that can happen because of underrun errors
(likely to happen on CI).
Removed the test from blacklist.

Change-Id: Idaef6a9e0dfcfc89424fb2383cf3830a3184f975
Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io>
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
2016-09-21 13:13:41 +00:00
Yoann Lopes
87abe0bad1 Improve tst_QMediaPlayerBackend::playPauseStop()
Check the state of the media player when trying to play or pause
without a loaded media.

Change-Id: I6685f196457630eb9f4e834426c8e1b9a9eaf8dc
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
2016-08-12 10:33:16 +00:00
Yoann Lopes
7966aca384 Give more time before timeout in some tst_QAudioInput tests
Change-Id: If2336e9c550ef8264d0853be83972a6170a9746b
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2016-08-04 12:24:10 +00:00
Tuomas Heimonen
efccadf055 tst_qsoundeffect: Update to case testLooping
Be more permissive while checking loops remaining.
Remove file BLACKLIST

Task-number: QTBUG-46689
Change-Id: I15b5fb55ee770a190b2c21dd8cf1fad45665a73c
Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io>
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
2016-07-04 13:32:26 +00:00
Liang Qi
40924657e9 tests: skip tst_qaudiodecoderbackend when no audio decoding support
Task-number: QTBUG-46331
Change-Id: I9168ae7d89869cc0811394fc4091a5e44c136b9b
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2016-04-08 18:18:36 +00:00
Simo Fält
d4f7f9dbbc RHEL 7.1: Enabling make check
Blacklisting those test cases which were blackisted for RedHat 6.6
and which are not passing on RedHat 7.1 either

Change-Id: I6750b7a6ed3305829153a4cce7714b0e969f0a98
Reviewed-by: Heikki Halmet <heikki.halmet@theqtcompany.com>
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-02-04 08:43:10 +00:00
Liang Qi
365e05bad8 Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I6d88b17f44479a522d181374023648dd007112bd
2016-01-21 08:00:31 +01:00
Pasi Petäjäjärvi
42dc973881 Fix tst_QAudioOutput::pushSuspendResume().
Documentation states that state in push mode after suspend and resume
should be QAudio::IdleState.

Task-number: QTBUG-50390
Change-Id: I214f1808948ce862b62afd0fb9d245d0c7e4ad26
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@theqtcompany.com>
2016-01-19 15:31:04 +00:00
Liang Qi
02b8c7527a Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I01940fe4f3d059fbb425492a1748e2b5d9b6804b
2016-01-19 09:50:11 +01:00
Pasi Petäjäjärvi
8d84a30e4d Be more permissive in QSoundEffect integration test.
Change-Id: I9f92fda79bb359f8fa53aa11b9b6889cd35fcb6e
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-01-18 13:47:04 +00:00
Pasi Petäjäjärvi
dd0fa191ff Fix clearing signals already send after first part of audio data
Previous place for clearing received signal could errounsely
clear already sent signal which causes next signalState
comparison to fail on some platform.

Change-Id: Iaffdbbcab1ec9afa0be6f1f7b7aee62b981ee319
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-01-13 16:05:10 +00:00
Pasi Petäjäjärvi
481dd30e2f Remove testing category to empty string
Not all backends have empty default category

Change-Id: I55025bf213063c5fd64dd5be4031aabf3a148a7b
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-01-13 14:16:56 +00:00
Pasi Petäjäjärvi
ba847185e2 Remove checking exact remaining loop amount right after calling play()
Depending on platform it is unknown how many times it has already been
actually playing the audio.

Change-Id: I27b65cee8de5f9f75ceda277ee22d86f7897ce7b
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-01-13 12:49:29 +00:00
Yoann Lopes
0a7b553eea Blacklist tst_qmediaplayerbackend::seekInStoppedState() on RHEL.
Change-Id: I150be89f71684890d65fd157a5b1782468636751
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2016-01-06 15:21:12 +00:00
Yoann Lopes
704ac34cc7 Favor more commonly supported formats in qmediaplayerbackend test.
Prefer mp4 and mp3 over ogv and mkv.

Change-Id: Id24d475207ccf76e113557f9ad14775477f414aa
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2016-01-06 15:20:57 +00:00
Yoann Lopes
e8a75e225b Make qmediaplayerbackend::processEOS test less flaky.
Change-Id: Ib961f3d4e238a156dc2e1ade1828ae8f1bf5b755
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2016-01-06 15:20:55 +00:00
Yoann Lopes
2593f00411 Make qmediaplayerbackend::seekPauseSeek test less flaky.
Change-Id: I05e4b9d392359bd84f9e932864a2e14275ef625f
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2015-12-18 19:08:20 +00:00
Tony Sarajärvi
94c33684fe Blacklist qmediaplayerbackend tests in OSX 10.11
These were found to also fail in OSX 10.11

Task-number: QTBUG-46368
Change-Id: Ifac6fd0540ff63f3eb5198b5ac76c65ee893f005
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-12-11 11:09:06 +00:00
Tony Sarajärvi
e796e3a55f Blacklist qaudiodecoderbackend tests in OSX 10.11
These were found to fail also in OSX 10.11

Task-number: QTBUG-46331
Change-Id: I619816655c614c08183ab700bca8bd7ec5384a91
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-12-11 11:09:00 +00:00
Frederik Gladhorn
dfa57af6de Remove RHEL blacklisting for tests that pass
After installing the gstreamer plugins, these tests that used to be
blacklisted pass now.

Change-Id: I9be38ceb45f007930257d72d6b22a44ae661ad07
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2015-11-07 13:21:04 +00:00
Frederik Gladhorn
05bede94c9 Blacklist a few test functions for RHEL
After installing the gstreamer-plugins, these tests still fail.
Blacklist them until they get fixed.

Change-Id: I5acbd5a4911253e96e40e30a2faf161bfa387989
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2015-11-07 13:21:03 +00:00
Yoann Lopes
3ab55ed987 Blacklist qmediaplayerbackend test on Windows 64-bits.
Change-Id: I3cdb89a0189c5089a4e65218db9604010da97a2c
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-30 10:40:36 +00:00
Edward Welbourne
83a68761f2 Purge spurious execute permissions.
Source code and graphics are not for running.

Change-Id: I3b015b3cefd70329036c044f1b6c478d50453054
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2015-09-29 14:23:05 +00:00
Yoann Lopes
ef3695a009 Blacklist failing test in tst_qsoundeffect on OpenSuse.
Change-Id: Iccf3e295fb79f043b2e64cb02528ac12e15a0ab6
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-08-10 11:36:48 +00:00
Simon Hausmann
4819f90904 Exclude failing tests on RHEL and Ubuntu
Change-Id: Ifbfb36f47da5f826c94777286fde27d5edd29d01
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2015-07-23 12:02:40 +00:00
Simon Hausmann
82069d0527 Extend test exclusion for this test on OS X
The test doesn't work on OS X 10.9 and 10.10. It also doesn't work
on OS X 10.8, but the current CI system doesn't actually run tests
on 10.8. In the (future) event of us running tests on 10.8, this
change is required.

Change-Id: I6cbe6249aee2460353322d6f1254858238af3711
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-07-23 12:02:35 +00:00
Jani Vähäkangas
4ba25e692a Blacklist failing part from tst_qsoundeffect
Task-number: QTBUG-46689
Change-Id: I195d5cea8a588afcdefae5a91acb511fadbb839c
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
2015-07-06 07:45:16 +00:00
Jani Vähäkangas
303acdb6e5 Blacklist cases from qaudiodecoderbackend and qmediaplayerbackend
Change-Id: I73156f18f79afbdb26ba31462162dde9c1d0094b
Task-number: QTBUG-46368
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
2015-06-30 13:14:00 +00:00
Jani Vähäkangas
86915f01f7 Blacklist part of tst_qaudiodeviceinfo
Task-number: QTBUG-46409
Change-Id: Iebfc6595b7be3fc29f1fca61fa71a706dbe64ebb
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
2015-06-29 12:22:16 +00:00
Antti Kokko
bbfccc7135 Update copyright headers
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>
2015-02-12 10:27:47 +00:00
Yoann Lopes
108dda7a90 GStreamer: port to 1.0.
0.10 is still used by default.
To enable GStreamer 1.0, pass GST_VERSION=1.0 to qmake
for qtmultimedia.pro.

Contributions from:
Andrew den Exter <andrew.den.exter@qinetic.com.au>
Ilya Smelykh <ilya@videoexpertsgroup.com>
Jim Hodapp <jim.hodapp@canonical.com>
Sergio Schvezov <sergio.schvezov@canonical.com>

Change-Id: I72a46d1170a8794a149bdb5e20767afcc5b7587c
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
2014-11-27 23:30:05 +01:00
Yoann Lopes
99a55585e9 Add metadata test for qmediaplayerbackend auto-test.
Change-Id: I419496293b11b6a941af08e9709595458b7ca423
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
2014-09-26 14:27:13 +02:00
Yoann Lopes
ec24592186 Android: fix some problems with the media player.
- Correctly emit positionChanged signal. One of the problems with
  this was that QMediaPlayer automatically sends periodic
  position updates while playing a media. There's no need to have
  the same logic in the backend.
- Seeking after reaching the end of the media now correctly works

Auto tests included.

Change-Id: I6d5ecbae6e05f94a8aac1a0834cf57427adf219b
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2014-09-26 14:26:58 +02:00
Andrew Knight
778b233bcd winrt: Add media playback service
This introduces a MediaPlayer service based on the MFEngineEx API. Only
scene graph video rendering is supported at this time. The video renderer
control is abstracted in order to provide a base for future video nodes
which do not source their content from the MF engine.

[ChangeLog] Media player support was added to the winrt backend.

Change-Id: I8155a1030466ea352fad0a87d1ae97a88983760c
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-08-25 16:05:24 +02:00
Antti Kokko
2732e23887 Update license headers and add new license files
- 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>
2014-08-24 17:30:13 +02:00
Andy Nichols
ddd22fab2b Mac: Re-enable qcamerabackend test
The cause of the tests flakyness has been resolved, so it should be
re-enabled.

Task-number: QTBUG-36040
Change-Id: Ic4d18ea891ed5b6c5f4acbb4d05322b910b87d29
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-03-20 23:06:46 +01:00
Sergio Ahumada
d5dfef66bb Prefer to use normalised signal/slot signatures
Change-Id: I48ae4b46f7a0342a1436ba78958b057e919e3a8a
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2014-03-03 12:12:31 +01:00
Yoann Lopes
b28ee24628 New QCameraInfo class.
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>
2014-02-28 14:10:00 +01:00
Yoann Lopes
d964388b38 QSoundEffect: fix changing the loop count while playing.
The running count was not updated with the new value.

Auto-test added and documentation updated to be more clear about this
behavior.

Task-number: QTBUG-36643

Change-Id: I29e98ca4679f950a75133b21873738bcb72d23d4
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2014-02-25 15:00:44 +01:00
Friedemann Kleint
01714ef0c5 Use QVERIFY2 for elapsed time in tst_QMediaPlayerBackend::seekPauseSeek().
The test has been observed to fail sometimes, try to obtain values.

Change-Id: Id0374b7ad3d593c099500e771bc4d8cc50f26651
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-02-17 18:13:00 +01:00
Yoann Lopes
67b86a9fbd Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev 2014-01-30 14:32:29 +01:00
Friedemann Kleint
8bfd49d40f Fix MSVC-warnings about unused variable meta in tst_qdeclarativevideooutput.cpp.
Change-Id: If324fd2e65acb7650b1d8dee4964a2c2bb17f876
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-01-29 08:32:38 +01:00
Andrew den Exter
60fb11d9a2 Allow plugins to override the QML VideoOutput type.
Move QDeclarativeVideoOutput to the private QtMultimediaQuickTools
library to make the QDeclarativeVideoOutputBackend interface
implementable by a plugin.

Change-Id: I763c483a1fc9ec56dc7b8be0bc71523f029a36ee
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-01-20 14:26:03 +01:00
Yoann Lopes
c54018f8e2 Fix build without Qml and Quick modules.
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>
2014-01-16 15:56:19 +01:00
Simon Hausmann
f74d7393b8 Mark tst_qcamerabackend test as insignificant on Mac OS X
It has failed 6 times during qt5.git stable integrations since September 2013

See also QTBUG-36040

Change-Id: I6abd5b2723d2346a4831ab28fa040c14615148b0
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-01-08 18:19:54 +01:00
Andy Nichols
b357c55f2d CoreAudio: Create an audio plugin supporting iOS and OS X
This removes the Mac audio backend that was hardcoded into QtMultimedia
and adds a new audio plugin using the CoreAudio API.

Change-Id: Ib15291825f9452a3763e0eeb281d952deb0bad3d
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2013-09-19 14:36:28 +02:00