summaryrefslogtreecommitdiffstats
path: root/qtmultimedia.pro
Commit message (Collapse)AuthorAgeFilesLines
* Move qtmultimedia over to the new config systemLars Knoll2016-11-141-38/+0
| | | | | | | | | | | | Use the new configuration system to define external libraries, configure tests and features. Don't use pkg-config outside of the configuration step. And move all command line options over from qtbase, so that we can remove them from there in a second step. Change-Id: I1aa4b557a6aee17eeceb00602005a2d28b426a26 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-111-1/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: qtmultimedia.pro src/multimedia/playback/qmediaplayer.cpp src/plugins/directshow/directshow.pro tests/auto/integration/qmediaplayerbackend/BLACKLIST Change-Id: I6dacdcbb223c1d12dd72eb308a67170983c709b3
| * WMF: make it possible to build only the audio decode serviceYoann Lopes2016-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The WMF plugin can now be built without the media player service. That enables the audio decode service even when DirectShow is used as media player backend. The default configuration on Windows is now: Camera, MediaPlayer -> DirectShow AudioDecode -> WMF Change-Id: Ic6f3c85ed849e0c603719cfb03794e6abd2d52fa Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8Yoann Lopes2016-09-231-1/+1
|\ \ | |/ | | | | Change-Id: I96aca24df935d51b40380c727b6c5002432a6be6
| * Don't try to compile Vivante video node plugin without OpenGL ESYoann Lopes2016-09-201-1/+1
| | | | | | | | | | | | Task-number: QTBUG-54315 Change-Id: I559f67e1f24cbed5155fd0e4330cd12150d4dbf9 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Add config test for wasapi pluginMaurice Kalinowski2016-06-141-0/+1
|/ | | | | | | | | | | | | | The wasapi audio plugin can also be used on desktop versions of Windows. The support has been experimental so far and will now be enabled in case the SDK contains support for it. Unfortunately MinGW does not provide Microsoft::WRL::RuntimeClass and IActivateAudioInterfaceCompletionHandler, hence we need to disable the plugin currently for it. Change-Id: I2be6e99810d462507112465a2084a2d72c3c62f0 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* DirectShow: use the EVR in the window control.Yoann Lopes2015-11-051-1/+1
| | | | | | | | | | Reuse existing code from the WMF plugin, which already uses the EVR. This enables HW-accelerated video decoding when using QMediaPlayer with a QVideoWidget. Task-number: QTBUG-45593 Change-Id: I757e4d53cd2c648aee6ba33a4851a8c6adc62843 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Remove unused configuration test.Yoann Lopes2015-11-051-1/+0
| | | | | Change-Id: Id406146995dfb0dd8534a00b62c471d430a7366f Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Remove warning about missing qmake variable on Android.Christian Strømme2015-04-221-1/+1
| | | | | | | gstreamer on Android is not supported, so we don't need to check for it. Change-Id: I7ccde2b9878f9f435828195a5ac1b76a9a6985d1 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-241-2/+2
|\ | | | | | | | | | | | | | | | | Conflicts: qtmultimedia.pro src/gsttools/qgstreamervideowidget.cpp src/plugins/gstreamer/camerabin/camerabinservice.cpp Change-Id: I883f20dc17924ab42514a1aa00d16675a0f13d99
| * Compile Alsa and PulseAudio plugins only when enabled by configure.Yoann Lopes2015-02-171-2/+2
| | | | | | | | | | | | | | | | They are enabled by default, this simply makes sure -no-alsa and -no-pulseaudio work. Change-Id: I8e921381363064bb65b414152eab27c08a551dc4 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Use configured GStreamer version.Yoann Lopes2015-02-161-20/+14
| | | | | | | | | | | | | | | | The gstreamer version detected or set by the configure script can be overridden by passing GST_VERSION=<version> to qmake qtmultimedia.pro. Change-Id: I6f2eac3705d3d6fe0ec8e79042017add6751ee8c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | GStreamer: port to 1.0.Yoann Lopes2014-11-271-5/+21
|/ | | | | | | | | | | | | | | 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>
* Android: Remove api level test in qtmultimedia.proChristian Strømme2014-08-251-4/+0
| | | | | | | ANDROID_API_VERSION env. var should take precedence, if set. Change-Id: I54325852ede27ff5c1bb19b81d3d649605607de9 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Detect V4L availabilityLisandro Damián Nicanor Pérez Meyer2014-08-181-0/+1
| | | | | | | | | | Do not build related stuff if not found. Makes GStreamer support available on Hurd. Task-number: QTBUG-39762 Change-Id: I1f70b6975e5bef99ab2441aac4d90508bc8b64bd Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Make it possible to build multimedia for embedded AndroidChristian Strømme2014-06-041-1/+1
| | | | | Change-Id: I3400b18379242ea4d1b4f94f5da6b60c64d551e4 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* enable imx6 specific QSGVideoNode based on a config testMichael Olbrich2014-03-041-0/+1
| | | | | | | | This way it also works custom mkspecs Change-Id: I7414aac775b797da3487e9625c7212486118b532 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Add mmrenderer configure checkv5.2.0-rc1Andreas Holzammer2013-11-251-0/+2
| | | | | | | | | | | No all QNX versions/variations have a mmrenderer by default, so we need to check for it, otherwise it fails to compile. Change-Id: I3efe9df37cf7807c1b0ac4d2e8f49aa02e3408cd Reviewed-by: Frank Osterfeld <frank.osterfeld@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* OpenSL ES: enable the plugin only on Android.Yoann Lopes2013-10-251-1/+0
| | | | | | | | | | | | Removed the configure test to enable or not the plugin (which solves the problem of the plugin not being built on Windows because of a bug in QMake). Even though it should work on other OpenSL ES implementations than the Android one, it hasn't been tested. Compile and use the plugin only on Android for now. Task-number: QTBUG-34275 Change-Id: I02d47c8be3be8163a17c68b44b8c4b18a218a3fe Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* DirectShow: improve metadata support.Yoann Lopes2013-10-111-1/+3
| | | | | | | | | | Correctly return the list of available metadata. On Windows Vista and later, we now use shell properties to retrieve the metadata. This allows us to get much more metadata properties. Task-number: QTBUG-30776 Change-Id: If542756d08d832903984ef10d09c4caf410bdb1c Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Some cleanup in the GStreamer plugin.Yoann Lopes2013-09-201-1/+0
| | | | | | | | | | | | Removed QGstreamerVideoOverlay and related classes. It was used as 'Window' control but performs worse than QGstreamerVideoWindow which does basically the same thing using GStreamer ready-made components instead. Removed X11 dependencies and related configuration tests. It was only needed for QGstreamerVideoOverlay. Change-Id: I2ad2636ccf0060e56cd64f3d9e5b3c24dc75f5a3 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Merge branch 'stable' into devSergio Ahumada2013-08-051-1/+1
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id3427cb1a80956ba61373313c21b4b9aa007ea54
| * Use the new (-no)-wmf-backend configuration optionWouter Huysentruit2013-07-251-1/+1
| | | | | | | | | | | | | | | | | | Don't build the wmf backend when configure was executed with the -no-wmf-backend option. Change-Id: Ia047137c15c7aac302092e9f77b961c6e584bb86 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | OpenSL ES audio plugin.Yoann Lopes2013-07-191-0/+1
|/ | | | | | | | Adds support for QAudioOutput, QAudioInput and QAudioDeviceInfo using OpenSL ES 1.0.1. This plugin is used on Android. Change-Id: Idf2c22a861e067196f6c5139e51393b086f64183 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-121-1/+3
|\ | | | | | | Change-Id: Ic82ed2ba60d9855f1490d4ca66451dbc42ae6e2f
| * Android: Fix compilation on WindowsEskil Abrahamsen Blomfeldt2013-05-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qtCompileTest function in configure.prf does not work when cross-compiling on Windows because it detects the wrong make executable. And it's anyway not the best way to do this, since what we really want to check for is the existence of the SDK version, whereas the compile test could potentially hide a lot of other problems under the same error message. Task-number: QTBUG-31405 Change-Id: I2c16b214e40bac5751d4e7098edcc30318756621 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | disable module when gui is not availableTasuku Suzuki2013-06-101-0/+2
|/ | | | | Change-Id: I414b67d8c4fe34a41e1d96d51879138c01c6e3a5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Android: Added config tests for multimedia on android.Christian Strømme2013-04-291-0/+2
| | | | | | | | | The Android multimedia plug-in requires API level 11 to compile, so the config test will check and issue a message about the requirement if the API level can't be satisfied. Change-Id: I6c21fe1255024e853023bd8168dfa917b00c4c23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Don't run the Linux configure tests on OS XAndy Nichols2012-10-121-4/+2
| | | | | | | | | | | This can create weird senarios where they pass due to MacPorts actually having the dependencies. We don't support this, so dont allow it to happen. Task-number: QTBUG-27352 Change-Id: I2be104549b5d1e9a61a734d05b3c21afcd2f6828 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Update docs after modularization of docsTor Arne Vestbø2012-10-111-2/+0
| | | | | | | | | | | The global files now live in qtbase only, and are made available to the other modules via the $QT_INSTALL_DOCS variable. We now use QMAKE_DOCS to trigger doc generation instead of rolling our own rules for qdoc. Change-Id: I900029d71c305a1f269cddeeb0e05c524d933834 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Added config test for AVFoundation frameworkAndy Nichols2012-10-091-0/+4
| | | | | Change-Id: Ifd152513074e6b7802a3ed6d4722ba78762ec79c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Moved doc under src to fall in-line with the new modular structureVenugopal Shivashankar2012-07-251-8/+1
| | | | | Change-Id: Ia2933baa1f0eaf82b5c2a626cb3661ee087049e3 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Updated the camerabin2 based camera with QtMultimedia changesDmytro Poplavskiy2012-07-161-0/+1
| | | | | | | | | | | | | | Moved it to the separate plugin as the rest of gstreamer based services; Updated with libqgsttools_p changes; Implemented QMediaRecorder::status property; Made gst_photography dependency optional, it's not always available on desktop; Added video recording case to auto integration test; Moved backend implementation into qt namespace Task-number: QTBUG-26046 Change-Id: Iacfc1a6e263a4c0201d5eb28d04c960b87a230c0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* use centralized handling of QT_BUILD_PARTSOswald Buddenhagen2012-07-111-23/+4
| | | | | Change-Id: I9f4b70bf2dc19dc75e6490a7c5430b11add0b0f5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix typo in config test name.Michael Goddard2012-07-101-1/+1
| | | | | Change-Id: Ic89cb21f9098591c97f780bd50248686f4da3919 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
* switch to new-style configure testsOswald Buddenhagen2012-06-251-0/+19
| | | | | Change-Id: Ib56d0cb24065c1f990aee5d7f41bfedfe75332a1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Docs: fix qml links and standalone build for MultimediaPeter Yard2012-02-221-1/+1
| | | | | Change-Id: Ia3f1e49aef203911bb5cf1ee062c9100be213b38 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fixed unreliable enabling of doc snippetsRohan McGovern2012-01-201-4/+2
| | | | | | | | | | | | | | Testing for QT.widgets.name in qtmultimedia.pro causes the behavior of that .pro file to depend on whether or not qtbase.pro has been processed. Due to QTBUG-23376, and because these are sibling .pro files, this is not safe - nothing guarantees that qtmultimedia.pro is processed after qtbase.pro. Work around the issue by pushing the QT.widgets.name test down one level. Change-Id: I3e155b3f18ad5fa8c527cf5a806313db4b6aabeb Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Enable building the documentation snippets.Michael Goddard2012-01-191-1/+10
| | | | | Change-Id: Ib7ef5a564408092ecd72be5d855b2defaddf9c4e Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Doc: Add ability to generate documentation for the module.Jerome Pasion2011-10-171-0/+1
| | | | | | | | -Added targets so that "make docs" will generate the documentation. Change-Id: I16a74d7e15e12df16570f110c7e67a110d53afad Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Tests should not be unconditionally excluded.Jonas Rabbe2011-10-121-1/+2
| | | | | | | | Change-Id: I3910a03e5c2231f91b84b368339948fbca750f28 Reviewed-on: http://codereview.qt-project.org/6399 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Rename QtMultimediaKit to QtMultimedia.Michael Goddard2011-10-071-0/+21
There are a few legacy bits left in place so it passes CI, and then qt5.git etc can be updated. Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a Reviewed-on: http://codereview.qt-project.org/5368 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>