Commit Graph

340 Commits

Author SHA1 Message Date
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
Yoann Lopes
f69a051675 Fix tst_QVideoWidget.
Make sure the tested QVideoWidget has a valid size.
Since 7b63c45d in qtbase, native widgets are required to have a valid
size to be shown. This test relies on qWaitForWindowExposed() to work
correctly, which means the widget must be shown and thus must have
a valid size.

Change-Id: I13bc1536d788d9ba56b4dcbf0c60851b5634be9e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-01-18 12:43:19 +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
Yoann Lopes
82e135167a Change the way a playlist is bound to a media object.
The previous behavior was to simply switch from the internal
control to the service's control, discarding anything that was
added to the playlist before binding.
We now carry over the changes made to the playlist when switching
controls. This means the switch is now transparent to the user.
When the service's control is read-only, we cannot transfer the
items, which means the user must be notified of the items that
might have been "lost" during the switch.

Auto-test modified to reflect this change.

Change-Id: Ibf80b650b06425ddbaeb320b72ac5d3082a25960
Reviewed-by: Jim Hodapp <jim.hodapp@canonical.com>
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-12-11 14:53:16 +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
Liang Qi
87e5e24f52 Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I1373622a6d1fd0e2d35df2da79860a373056387f
2015-10-02 13:48:43 +02: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
4eb4a3ada3 Fix QML Camera::supportedViewfinderFrameRateRanges().
Pass the resolution argument as a QJSValue instead of a QSize.
This allows to be more flexible and doesn't require the QML argument
to be an actual QML 'size' value. It can be any object with the
'width' and 'height' properties.

Added missing auto-tests for supportedViewfinderResolutions()
and supportedViewfinderFrameRateRanges().

Change-Id: I6c8ae72e6dab8c9d12bbada5b8e7f45e96e9289d
Task-number: QTBUG-47630
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-08-25 11:18:51 +00:00
Yoann Lopes
a2244c9b7a Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
	src/imports/multimedia/qdeclarativeaudio.cpp

Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13
2015-08-24 14:36:13 +02:00
Yoann Lopes
13e40d522f Fix QCamera viewfinder capabilities functions..
- Filtering the results for a specific pixel aspect ratio would return
  wrong values.
- Correctly sort the frame rate ranges returned by
  supportedViewfinderFrameRateRanges().

Added missing auto-tests for all viewfinder capabilities functions.

Change-Id: Idfb40d4139cc48a5996ce2ddd98131a2f5be76bb
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2015-08-18 12:58:00 +00:00
Jim Hodapp
23acd9f01d Add audio role API to QMediaPlayer.
Change-Id: Ia5e3e2fe714f10b6aad62f0a4801c607905c7e0d
Task-number: QTBUG-41054
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-08-10 15:12:22 +00:00
Loïc Molinari
475a14ccc3 Check and fix up bounds in QMediaPlaylist methods.
Change-Id: I665d665139dbe9663b20ecb08fa3dab9cbe3f899
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-08-10 11:37:44 +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
Frederik Gladhorn
872f0de43e Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I957b44c06fca7a3f552edc18f286de043d31e42d
2015-08-09 15:27:16 +02:00
Yoann Lopes
3c54acb6f7 Add new property to QVideoSurfaceFormat.
The 'mirrored' property indicates the QVideoFrames need to be mirrored
along their vertical axis. This is typically needed for video frames
coming from a front camera on a mobile device.

This is implemented as a string-based property. In Qt 5.6, this should
be replaced by a new public function.

Change-Id: Ideb7de81e83f66826f4efb5f2951c4beec13546b
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2015-08-07 17:35:12 +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
Friedemann Kleint
b7d2215332 Unit test qaudiodecoder: Do not rely on qCompare(bool, int,...).
The overload was added for NokiaX86 and RVCT and is bound for
removal.

Task-number: QTBUG-47260
Change-Id: I8eb0333e0e20323ab20f361186d9a47fd3ab9f24
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-07-17 07:19:34 +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
Friedemann Kleint
a26df92bac Add CONFIG += testcase to auto/unit/qaudiobuffer/qaudiobuffer.pro.
When missing, make check is an empty target, meaning the test
is never run in the CI.

Change-Id: I6f09e0f78c26b631fdfe89d2520dc0012d177843
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-05-26 11:58:24 +00:00
Yoann Lopes
63cff37741 QMediaPlayer: handle resource files in a cross-platform way.
It was the backend's responsibility to handle resource files in an
appropriate way. In practice, it was either not handled at all,
or implemented in an almost identical manner in every backend
that does handle it.
This is now dealt with in QMediaPlayer, always passing to the
backend something it will be able to play. If the backend has the
StreamPlayback capability, we pass a QFile from which it streams
the data. If it doesn't, we copy the resource to a temporary
file and pass its path to the backend.

Task-number: QTBUG-36175
Task-number: QTBUG-42263
Task-number: QTBUG-43839
Change-Id: I57b355c72692d02661baeaf74e66581ca0a0bd1d
Reviewed-by: Andrew Knight <qt@panimo.net>
Reviewed-by: Peng Wu <peng.wu@intopalo.com>
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2015-04-07 17:21:47 +00:00
Yoann Lopes
dbcf44247d Improve QMediaPlayer auto tests.
Use test data only for test functions that require it.

Change-Id: I7fde1ba53ee8d2f5294597fd309a6e7d7dbbe15d
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2015-03-04 15:50:04 +00:00
Frederik Gladhorn
f9014d136f Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I5575a4ba13212c9bfe73a3de3ef17c6528beafc3
2015-02-13 13:10:48 +01: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
Sergio Ahumada
b1a2b3f55e bic: Add 5.{1,2,3,4}.0 bic data for linux-gcc-amd64
Remove the ia32 data since there are no linux x86 machines in
the CI system (which makes the data useless from an automated
testing point of view) and most people use x64 these days anyway.

Change-Id: Ib62195d0b992a52d3a87f460283b1f2813f0e5eb
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-02-10 13:31:57 +00:00
Yoann Lopes
fe21ee675e New camera viewfinder settings API.
There already was a control interface for the viewfinder settings
but no real public C++ API and a partial QML API.

This patch adds a new C++ API and improves the QML API.

Supported viewfinder settings are resolution, minimumFrameRate,
maximumFrameRate and pixelFormat. The camera can be queried for
the supported values for each of these settings.

A new control interface was created to match the new API.

Change-Id: I289fea038fe46277a5516c956a64280da09ed985
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
2015-01-13 13:34:41 +01:00
Andrew den Exter
dc2fec1bd8 Allow supported camera locks to change after initialization.
A camera backend may not be able to report which locks it supports
until after it is loaded, so query support on demand instead of caching
the value available at construction time.

Change-Id: I56fb1adee980ebc2fa893da3c983a6dce26329c0
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2014-11-28 04:19:35 +01: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
Sergio Ahumada
34cf911167 Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4 2014-09-26 16:11:59 +02:00
Sergio Ahumada
41a1c16340 Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
	.qmake.conf

Change-Id: Iad73368a22c6d4662188e6f357a265d0c26756d0
2014-09-26 15:28:44 +02: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
Yoann Lopes
46c56ed530 Revert "QMediaNetworkPlaylistProvider: Upon error parsing, stop parsing."
This reverts commit 0ed18d846c.
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>
2014-09-17 13:11:07 +02:00
Yoann Lopes
4c5aec9bb6 Make PLS parser more permissive.
The PLS format is not clearly specified, some rules are just assumed
and files don't always respect them.
We now only look for 'File' entries, since that's the only thing we
actually use. We ignore the Version, NumberOfEntries, Title, Length
and any other unrecognized tags.

Task-number: QTBUG-40515
Change-Id: I9c176b7b68fd1441abbd50364f88994ad5d6236f
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2014-09-10 15:15:54 +02:00
Yoann Lopes
e26483c106 Fix URL handling in PLS parser.
Make sure relative paths are resolved to a full path.

Task-number: QTBUG-40515
Change-Id: Ideb83fc3a3c4a74c84917a22e3c30162d7b6158a
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2014-09-09 18:06:56 +02:00
Andres Gomez
973ae5e0f6 QMediaNetworkPlaylistProvider: Upon error parsing, stop parsing.
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>
2014-09-09 13:46:31 +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