Commit Graph

2019 Commits

Author SHA1 Message Date
Yoann Lopes
c8090b7952 AVFoundation: return correct viewfinder settings.
When the camera is unloaded, return the requested settings.

Change-Id: If39e158cd8d0fd8d4bbd7cf6cd48226cdefc1272
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2016-04-13 12:44:02 +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
Maurice Kalinowski
c8eed01f1f winrt: add default capabilities
A module compiled for WinRT should define a default set of capabilities
to enable all features specified by the module.

Task-number: QTBUG-38802
Change-Id: I57c3aec60c72b1383b836cee2087b801196def1d
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-04-08 04:41:13 +00:00
Andreas Holzammer
c9e668cdb6 wince: revert flipping Video content
It turned out in my previous tests, that the codec which I used is
buggy and does not play well with this documented behavior.

Change-Id: I8aff9f68d449da10de4fa33073d5d5cbe9b2a281
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-04-06 13:30:39 +00:00
Christian Strømme
3fb3231a9e DirectShow: Release all filters when disconnecting the graph.
When disconnecting the graph we need to make sure that all the filters
in the graph are released, even the ones that are automatically added.
Since we can't know in advance which filters the graph consists of, we
need release them one by one.

Task-number: QTBUG-49281
Change-Id: Ifdf2fb6fe1c90ab85b47565c5fe82b6ebe55b183
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-03-31 10:12:37 +00:00
Marc Mutz
6569c25619 tst_qdeclarativeaudio: fix ubsan build
The test uses QDeclarativePlaylist, but no out-of-line methods or
data members, so it got by with just including the header.

But a ubsan build requires access to the class' typeinfo objects,
so add QDeclarativePlaylist's implementation to the test, too.

Change-Id: Ib6bb155b71c0082969f77a13a0e50132a782db2d
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-03-29 12:28:58 +00:00
Dan Cape
15c42ebccb QNX: Fix video playback on VMWare
Mark eglImage as not supported on VMWare since that path requires
that the image data be in GPU accessible memory which is not the
case for video

Change-Id: I2ea1ec52842adf0bc1ca39c882e6771e6a992c65
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
2016-03-22 12:18:01 +00:00
Edward Welbourne
45ca387cb0 Purge sRGB chunks from PNGs in documentation.
Subjects each *.png file that matched grep -law "sRGB" to:
pngcrush -ow -brute -rem allb -reduce -force

Change-Id: I2ac34243ebe39c93860c5ac595c2f1eca4322eb8
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
2016-03-22 12:09:19 +00:00
Edward Welbourne
7b68ca81dd Purge sRGB chunks from PNGs in examples.
Subjects each *.png file that matched grep -law "sRGB" to:
pngcrush -ow -brute -rem allb -reduce

Change-Id: Iff326d7e63d6e0106204beb1f42700032cb6b79a
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
2016-03-22 12:09:07 +00:00
Friedemann Kleint
71a6b1b620 DirectShow: Fix MinGW warnings about signedness of comparison.
Use a switch on int instead of else if.

common\evr\evrcustompresenter.cpp: In member function 'virtual bool EVRCustomPresenter::event(QEvent*)':
common\evr\evrcustompresenter.cpp:1882:22: warning: comparison between 'enum QEvent::Type' and 'enum EVRCustomPresenter::PresenterEvents' [-Wenum-compare]
     if (e->type() == StartSurface) {
                      ^
common\evr\evrcustompresenter.cpp:1885:29: warning: comparison between 'enum QEvent::Type' and 'enum EVRCustomPresenter::PresenterEvents' [-Wenum-compare]
     } else if (e->type() == StopSurface) {
                             ^
common\evr\evrcustompresenter.cpp:1888:29: warning: comparison between 'enum QEvent::Type' and 'enum EVRCustomPresenter::PresenterEvents' [-Wenum-compare]
     } else if (e->type() == PresentSample) {

Change-Id: I8533e2c6d9b0a01b7b95e1d8bb119b50d4aabd25
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
2016-03-21 08:08:46 +00:00
Dan Cape
d48fbf286b QNX: Fixed issue with non Qt-related mm-renderer windows
Windowgrabber would catch events from windows that were not related to
Qt Media Playback. Now there is a check to ensure the window id to
compare against is set before assigning the window to the Windowgrabber.

Change-Id: Ic85198de5fdb05e9fa740fc7b3b81f3bdffd631d
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: James McDonnell <jmcdonnell@qnx.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
2016-03-20 03:53:27 +00:00
Mark Brand
bf899dbf4d fix case of included files
Cross-compiling for mingw requires lowercase filenames.

Change-Id: I135deca455ca2ff6bb3969aca990fe9d1c2dd345
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
2016-03-18 13:50:09 +00:00
Frederik Gladhorn
812ab8e6a3 Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: I91fb2886b4ab8f0b9e2e28329cec69dfa2cb5435
2016-03-17 16:05:28 +01:00
Yoann Lopes
b17e0cd5dd PulseAudio: change the way volume is applied.
We used to change the PulseAudio sink input volume. Doing so had
some potential unwanted side effects depending on the PulseAudio server
configuration. When flat volumes were enabled, it would affect the
global system volume. It could also affect the volume of other streams
having the same audio role.
Volumes in Qt Multimedia are supposed to be relative to the application
volume and should not affect anything else than the object on which it
was changed. To guarantee that, PulseAudio volume APIs are not used
anymore. Instead, software-based volume attenuation is applied on the
audio samples before being passed to PulseAudio.

Applies to QSoundEffect, QAudioOutput and QAudioInput.

Task-number: QTBUG-40823
Task-number: QTBUG-49461
Change-Id: I690716976bda8fe666969ca2cbdf6d8d0b419733
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2016-03-16 12:04:33 +00:00
Yoann Lopes
399ec97f10 Windows EVR: show frames when pausing from stopped state.
The QAbstractVideoSurface was started only when calling play(), causing
frames received before (e.g. when pausing from stopped state) to not
be rendered.
The surface is now started as soon as a media type is agreed between
the EVR and the upstream element. Conversely, the surface is stopped
whenever the media type is cleared.

Change-Id: Ia96a07dbd277adce67de5a9cfbf9acc0d33b6497
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2016-03-15 15:35:49 +00:00
Maurice Kalinowski
b044066835 Reinitialize audio when changing device in examples
Different devices might have different audio formats supported. Always
relying on the format of the default device can cause the audio endpoint
to not start/initialize.

Change-Id: I4d05949fd023f2cc7eb1f75db3577242e0e66680
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
2016-03-11 07:06:49 +00:00
Lisandro Damián Nicanor Pérez Meyer
680cc0c974 ALSA: simplify checking the available version.
Make use of SND_LIB_VERSION instead of SND_LIB_[MAJOR MINOR SUBMINOR]
in order to simplify the tests.

Task-number: QTBUG-51681
Change-Id: Ib9f28ff15ddc643cc426ded3a5779fb4ff651139
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-03-10 12:42:42 +00:00
Andreas Holzammer
77c9ab4a38 Port DirectShow backend to wince
dshow.h needs to be included before Qt headers as they include the
windows header with NOMINMAX macro set. DirectShow header needs min/max
macro definition to compile. The min/max macro then conflicts with
QDateTime header, hence needs to be undefined again for some occasions.

Windows Embedded Compact then defines INTERFACE as macro, which conflicts.

Windows Embedded Compact does not support audio end point selection.
Feature has been disabled for this platform.

Windows Embedded Compact does not support setting meta data, control has
been disabled.

Windows Embedded Compact does not support VMR, feature was disabled.

Direct Show renders always top to buttom.

Change-Id: Id17700835e2105fb127b12e3448bea16e3b52546
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-03-09 12:09:49 +00:00
Marc Mutz
3198bf4944 Add explicit and make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent.

QtBase 5.6 headers already compile that way, so let the other
modules follow suit.

Cleaned up placement of * and & in parameters as a drive-by.

Added explicit where it was missing as a drive-by. This is
not a source-incompatible change, because code that breaks
by this is a bug. Let's not have this sitting around in an LTS.

Task-number: QTBUG-45291
Change-Id: If81ed0c71393aee21d347f5ade4bf3fcc07cd82f
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-03-03 16:34:50 +00:00
Sergio Martins
d2d0d93f76 Fix gstreamer camera when env var QT_NO_GLIB is set
It would fall into the glib code path because it was only checking
if QT_NO_GLIB was defined, but ignoring the env variable.

gst_bus_add_watch_full only works with a glib event loop running.

Task-Id: QTBUG-51607
Change-Id: I726afd5d6e114eacea6e5bc71e7a6e2d1c5bbd74
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-03-02 17:13:21 +00:00
Dyami Caliri
176179fb32 PulseAudio: remove debug warning of Underrun
The QAudio::UnderrunError is a normal error and is already reported
to the user.

Change-Id: I0ee5d827666fb08b5eb199255b3b3c5610f743c2
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-03-01 15:01:06 +00:00
Friedemann Kleint
787211c1d2 Polish the QtWidgets/Player example.
Point the file dialog to the Movies folder.
Add command proper command line handling.
Change the logic to use QUrl everywhere.

Change-Id: I1e54e600187153f52a55e3a381a24e4f2eeda3ab
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-03-01 14:59:17 +00:00
Dyami Caliri
1816f89b6f PulseAudio: fix playback for short streams in pull mode
If the provided stream's length is shorter than the stream prebuf
attribute, the stream will never play. We adjust the prebuf attribute
in this case.

Change-Id: Ia397ac967ad2fa357a7aba137fbb78de272440ed
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-02-26 20:39:49 +00:00
Friedemann Kleint
58019c256e Fix constructor parameters in tst_QMediaPlaylist.
Fix warning:
tst_qmediaplaylist.cpp: In member function 'void tst_QMediaPlaylist::mediaPlayListControl()':
tst_qmediaplaylist.cpp:1221:49: warning: the address of 'parent' will always evaluate as 'true' [-Waddress]

Change-Id: I46391550d07a8f58442269d0e5eae418258adbff
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-02-26 12:30:45 +00:00
Oswald Buddenhagen
8f9bc2ed72 standardize statement order in project files a bit
Change-Id: I96bbe1343eedbad6b48579d700bbb6b5b80d69f1
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-02-25 16:50:22 +00:00
Oswald Buddenhagen
3ef3e5b101 remove redundant statements from project files
- TARGET is unnecessary if it matches the project file's basename
- CONFIG+=no_private_qt_headers_warning is added by qt_build_config.prf
- load(qt_build_config) is done by .qmake.conf

Change-Id: I3eb45a758dfee34be3c78fc13d996780741c95e9
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-02-25 16:50:18 +00:00
Oswald Buddenhagen
3408abef86 rely on the automatically defined QT_BUILD_*_LIB
Change-Id: I8c1c755270aa0a703103925656f7c1b555e4db1f
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-02-25 16:50:12 +00:00
Oswald Buddenhagen
c82402e158 consistently put {qt,qml}_{module,plugin} at the end of project files
this fixes static builds by ensuring that all dependencies are exported.

Task-number: QTBUG-51071
Change-Id: I8e1554b648327ea2fb342b882ce8e439bd6f271d
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-02-25 16:50:09 +00:00
Yoann Lopes
9985224a89 Update version number in QML plugins.
Also removes unnecessary references of that import version in
the documentation and snippets. The import version is always
displayed at the top of every doc page anyway.

Change-Id: Ifbf4666e0bc333c51f51104a5720b988e8c04d0b
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2016-02-25 16:27:43 +00:00
Yoann Lopes
857996876e Add 5.6.0 changelog.
Change-Id: I1e7ad9b663db94d2986277c92abf574f6380e44d
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2016-02-25 16:26:57 +00:00
Andy Shaw
241444eab7 [Win] Compile fix, the mmdeviceapi.h header can only be included once
Change-Id: Idb9a995c90e6e0e8be392022e2a76b4d8fea853a
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2016-02-15 12:34:52 +00:00
Liang Qi
dd7c19ea9d Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: Iafd0dbf7f015e2dc8e5ef987fb247660db41e9fe
2016-02-15 08:08:48 +01:00
Oswald Buddenhagen
3b6de26fe5 Bump version
Change-Id: I6d91859ec788c78384d527a421172a92315c994e
2016-02-08 14:56:13 +01:00
Andreas Holzammer
d633c02ce2 Disable wince build
Do not build audiocapture and windowsaudio for wince.

Change-Id: I2cbc7743e8f88c74be49ce85a41909653816aca7
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-02-05 09:05:30 +00:00
Yoann Lopes
59629bef84 Windows EVR: fix EndOfStream event never being sent.
This was causing QMediaPlayer to never go into the EndOfMedia state.

Task-number: QTBUG-50814
Change-Id: I8920cf93db37a834f67b9e0b4abcf5a4934dfe0e
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2016-02-04 10:43:24 +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
Yoann Lopes
e126dbb6fb OpenSL ES: fix QAudioOutput state after resume().
In push mode, the state must be IdleState after resume(), and only
change to ActiveState once it receives some data.

Task-number: QTBUG-50390
Change-Id: Iaf47363196ee94b80ac4ebe58a588929af8d3fad
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@theqtcompany.com>
2016-01-19 15:30:52 +00:00
Yoann Lopes
4fd2b2f684 Alsa: fix QAudioOutput state after resume().
In push mode, the state must be IdleState after resume(), and only
change to ActiveState once it receives some data.

Task-number: QTBUG-50390
Change-Id: Idd08d8826f00d943b3bf750524f811874e010149
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@theqtcompany.com>
2016-01-19 15:30:48 +00:00
Yoann Lopes
627e488d54 PulseAudio: fix QAudioOutput state after resume().
In push mode, the state must be IdleState after resume(), and only
change to ActiveState once it receives some data.

Change-Id: I8caff011f517e91629abf45af51580f24136bcea
Task-number: QTBUG-50390
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@theqtcompany.com>
2016-01-19 15:30:44 +00:00
Yoann Lopes
94c846fb48 CoreAudio: fix QAudioOutput state after resume().
In push mode, the state must be IdleState after resume(), and only
change to ActiveState once it receives some data.

Task-number: QTBUG-50390
Change-Id: I4a38aa84a55e90d7a2db3e1d504674b2a688bbde
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@theqtcompany.com>
2016-01-19 15:30:40 +00:00
Yoann Lopes
f97c4aaa86 WindowsAudio: fix QAudioOutput state after resume().
In push mode, the state must be IdleState after resume(), and only
change to ActiveState once it receives some data.

Task-number: QTBUG-50390
Change-Id: I0e12f4eaff350b9423e44779f229e0e1061cf576
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@theqtcompany.com>
2016-01-19 15:30:36 +00:00
Yoann Lopes
b4d03dc82f GStreamer: fix GstAppSrc usage.
Allow our GstAppSrc wrapper to be reconfigured with a new GstAppSrc
object. This is necessary because that object changes every time
playback is restarted, even for the same source. The consequence of
not allowing the reconfigure was that playback for a given qrc media
would only work the first time; any subsequent calls to play() would
not work since our wrapper wouldn't know about the new GstAppSrc object
and therefore wouldn't be able to produce any data.

Also improved management of the wrapper lifecycle.

Task-number: QTBUG-49531
Change-Id: I905afb6848cc7e9a563b4edc2c5875cdd7e53d21
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2016-01-19 12:26:45 +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
Maurice Kalinowski
c9a841a376 winrt: Fix playback of files
The backend uses triple buffering in the background to prefetch some
buffers. However, at some point it tries to invoke SetCurrentPosition
beyond the end of the file. MSDN states that for IMFByteStream one
should return E_INVALIDARG, but that has negative sideeffects.

What happens is that immediately MF_MEDIA_ENGINE_ERR_DECODE is sent
causing the playback to stop, even if there are still valid buffers in
the queue. The example in the bug reports causes up to 5 seconds of
playback to be lost. This can also be reproduced with larger files.

To circumvent this, return S_FALSE instead to still notify that seeking
in the buffer did not work.

Task-number: QTBUG-49236
Change-Id: Id4b093bf9480f5d02c7f9191fa4424f51c60e078
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-01-18 15:39:43 +00: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
406f76b903 Windows: fix build with -opengl desktop.
Task-number: QTBUG-50510
Change-Id: Ide1b58061d0fcdd5caf8597af8cfaec2483d712b
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2016-01-18 13:32:39 +00:00
Maurice Kalinowski
752c1f0077 winrt: Fix crash in debug mode
In debug mode we try to set the D3D11_CREATE_DEVICE_DEBUG flag to gather
additional information for debugging purposes. However, some devices do
not provide those and the D3D11CreateDevice call fails.

Instead, try to create a hardware non-debug device first before going
into the last software-mode fallback.

Task-number: QTBUG-49488
Change-Id: I2d91b5f54f7fd818103bd106314b8503e5759159
Reviewed-by: Samuel Nevala <samuel.nevala@intopalo.com>
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
2016-01-18 12:44:23 +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