summaryrefslogtreecommitdiffstats
path: root/src/multimedia/multimedia.pro
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-191-2/+2
|\ | | | | | | | | | | | | Conflicts: src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h Change-Id: Ic6e27742ef6d1af0532ad05902a1431ebd5f449d
| * Update Android dependencies with private library name changeEskil Abrahamsen Blomfeldt2017-09-261-2/+2
| | | | | | | | | | | | | | | | | | | | In c74de91cb075ce407e0205d1f810dabb299779ce, the QtMultimediaQuick_p library was renamed and the _p suffix was removed. However, this was not updated in the Android dependencies. Task-number: QTBUG-63002 Change-Id: I3c06c688f238f8fb7222e013fb2d3b1bc9309d03 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Android: remove support for local/debug deploymentJake Petroules2017-09-061-2/+0
|/ | | | | | | | | | | | | | This removes the pre-dexed JAR files activated by the absence of the bundled_jar_file CONFIG option, as versions of Android >= 5 no longer support this deployment mechanism. Now, the "bundled" JARs simply become normal JARs containing class files, and are neither activated by a bundled_jar_file CONFIG entry nor do they have a -bundled suffix in the file's base name. Task-number: QTBUG-62995 Change-Id: Ib53cbfe1009aa7e37de109dc317a58968854bf59 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Add proper global headers for QtMultimediaLars Knoll2016-11-231-2/+3
| | | | | | | And deprecate the old qtmultimediadefs.h Change-Id: I2d4164f3a51d8e5d1813413b4f6691a721386fdf Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* winrt: add default capabilitiesMaurice Kalinowski2016-04-081-0/+4
| | | | | | | | | | 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>
* consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-2/+2
| | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.5' into 5.6Yoann Lopes2015-11-201-2/+4
|\ | | | | | | Change-Id: I8e0f222f110cc23b426f2d68416f5cc3982e30f2
| * Add qt_real_to_fraction() helper function.Yoann Lopes2015-11-191-2/+4
| | | | | | | | | | | | | | | | | | | | Private API meant to be used by plugins whose backends expect frame rate values represented by a ratio. The function implementation was moved from the AVFoundation plugin to the QtMultimedia library. Change-Id: I555b9d5da5ca3bae88992ed03501869fb731e45f Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Add private API for conversion from QVideoFrame to QImage.Yoann Lopes2015-10-201-0/+2
| | | | | | | | | | | | | | | | | | | | The Android plugin had a function to convert from NV21 to RGB32. It's now moved to the Qt Multimedia library and it supports additional source formats. It could be further improved with more SIMD code, it could then become a public API. Change-Id: Ibee349027048a263a1a7ea74dc51237f7747912c Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Add 'resourcepolicy' to MODULE_PLUGIN_TYPES of multimedia.pro.v5.6.0-alpha1Friedemann Kleint2015-09-031-1/+2
|/ | | | | | | | | Fix warning: WARNING: Project ERROR: No module claims plugin type resourcepolicy discovered when running lupdate to create the translations. Change-Id: I9fdde3e86219164cabbfe10672899eb2984f06d2 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* GStreamer: port to 1.0.Yoann Lopes2014-11-271-0/+2
| | | | | | | | | | | | | | | 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>
* Support dynamic opengl32 - ANGLE switching on WindowsLaszlo Agocs2014-07-291-1/+2
| | | | | | Change-Id: I38532db3ab0ad4fcb8dbabd0cbb528f7d8e4ba06 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Moved QMediaStorageLocation out of the Android plugin.Yoann Lopes2014-05-091-1/+3
| | | | | | | | It's now a private API in the QtMultimedia library in order to be accessible in other plugins. Change-Id: I63541de1e8c540cebc210f9037646ce74d866c6f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* make MODULE_PLUGIN_TYPES assignment actually have an effectOswald Buddenhagen2014-04-071-5/+6
| | | | | | | it must be done before load()ing qt_plugin.prf. Change-Id: I0ad31f8d9761b2d059d656c9e4f674c8a7cc88a6 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* android: add missing feature tags.Yoann Lopes2014-02-211-1/+3
| | | | | | | | | | Adding the CAMERA and RECORD_AUDIO permissions implicitely makes some features a hard requirement for the app. By adding these features in the .pro file, androiddeployqt will mark them as unrequired in the final package. Change-Id: Ie9357d05626cb12272001d63b04e230737fbf1bc Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Android: automatically deploy playlist plugins.Yoann Lopes2013-12-101-1/+2
| | | | | | | Include the playlistformats directory for automatic plugin deployment. Change-Id: Ie61a4b1c1637a493e1bdb7354b33060728ccabda Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Android: Add permissions/features for Qt Multimedia moduleEskil Abrahamsen Blomfeldt2013-11-081-0/+5
| | | | | | | | | | To avoid potential exceptions when using Qt Multimedia, the applications needs to request camera and audio recording capabilities by default. Task-number: QTBUG-33953 Change-Id: I75061e24c65a24f7f45dcfdbb5edb1874c1eb4da Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* use private linkage where possibleOswald Buddenhagen2013-10-311-1/+1
| | | | | | Task-number: QTBUG-34463 Change-Id: Iffbeed2f1a27fd38b5960afa9715815ac11b722a Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Android: refactor video renderer.Yoann Lopes2013-10-011-1/+2
| | | | | | | | | | | | | Removed the overhead of having to create a shared OpenGL context in the GUI thread and pre-render the frame into a FBO. We now directly render the GL_TEXTURE_EXTERNAL_OES in the QtQuick render thread, using an Android-specific QSGVideoNode. We also use a callback from the render thread to create the texture from there and not have to create a separate shared OpenGL context. Change-Id: I6c8eb94b47d0a03329c912701b8af3fb5ebd1876 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Android: Make sure the OpenSL plugin is included on Android.Christian Strømme2013-09-261-1/+2
| | | | | Change-Id: Ic46dd8afe50250bb30754ce12eda57138d05b81d Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Android: added camera support.Yoann Lopes2013-09-121-3/+3
| | | | | | | | | This patch includes all camera features: viewport, settings, image capture, and video recording. It also adds support for QAudioRecorder. Change-Id: Ib962177cc8de4bac03f42a2bc0f534e03464bbfc Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* AVFoundation: Enable use of QMediaPlayer for audio on iOSAndy Nichols2013-08-271-3/+0
| | | | | | | | | This commit disables the video components of the AVFoundation mediaplayer backend when building for iOS and enables the use of QMediaPlayer with audio assets. Change-Id: Iadd6f9c61ed1e656301326e90a22cbca6428b654 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-111-2/+2
|\ | | | | | | Change-Id: Ia2cf3c55e57d7ac17f02965915fa6933ff2c8cce
| * Android: removed unnecessary init class for QtMultimedia.jarYoann Lopes2013-07-091-2/+2
| | | | | | | | | | Change-Id: Ib13597389a3896da8b619993d197623e7c74a7e0 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-041-1/+4
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf sync.profile Change-Id: I62a3095e4a4d507de199fac32b64e9e76323bbf4
| * Android: add libQt5MultimediaQuick_p to the list of dependencies.Christian Strømme2013-05-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | libQt5MultimediaQuick_p is first loaded as a result of a qml import, and is therefore not detected as a dependency. Note that libQt5MultimediaQuick_p will only be added as a dependency if QtQuick is used. Task-number: QTBUG-30861 Change-Id: I8ce818ef1648302bbbbdf63ef133185a66b66cca Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-231-0/+4
|\| | | | | | | Change-Id: I24ffb71c4cc2e262394797deb8a22b2cf9a80c3c
| * Make it possible to bundle Android buildsEskil Abrahamsen Blomfeldt2013-05-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | We need to adapt to the way the jar builds are split on Android, into a jar file which can be bundled and one which can be distributed and loaded on the classpath. We also need to add meta-information about which plugins the module depends on so that they can be bundled as well. Task-number: QTBUG-30751 Change-Id: I5cca51c3732ce72985df29672a219c3fd4fe7bac Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Add autoOrientation property to QDeclarativeVideoOutputTobias Koenig2013-03-191-1/+1
|/ | | | | | | | | | | | The autoOrientation property is a flag to switch on/off automatic rotation of the video output, depending on the current screen orientation, to always show the output upright. This is useful when the VideoOutput is used as viewfinder for a Camera. Change-Id: I72753888592dc59c9adaa3343bfec8b168343229 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Android multimedia plug-in.Christian Strømme2013-03-061-0/+5
| | | | | | | Adds MediaPlayer support for Android. Change-Id: I4c7b1e19927b2e50b227f3a3b3f7ca2e99397618 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* remove leftover code from multimediawidgets carve-outOswald Buddenhagen2013-01-081-5/+0
| | | | | Change-Id: Ibb347193761a94ce4a309eddb75af37b73dd9be6 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Enable the "#include <QMultimedia>" camel-case headerSze Howe Koh2012-11-061-3/+3
| | | | | | | | | | | | Rename qtmedianamespace.h/cpp -> qmultimedia.h/cpp, and have sync.profile generate the camel-case header during compilation. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: Iade9ee6538970b4b9935f169eb2d9a0ea6949a95 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Enable the "#include <QMediaMetaData>" camel-case headerSze Howe Koh2012-11-061-0/+2
| | | | | | | | | | | | | | | | | | Move the QMediaMetaData namespace into new files, and have sync.profile generate the camel-case header during compilation. For now, the new header (qmediametadata.h) is included whereever the old one appears (qtmedianamespace.h), but an audit will be done later to make explicit #includes only where necessary. NOTE: Git may think that a rename has occurred. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I63705722a5e175628d56128888a94ae4c20879f2 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Update docs after modularization of docsTor Arne Vestbø2012-10-111-0/+2
| | | | | | | | | | | 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>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-121-2/+0
| | | | | Change-Id: Ie07a32729ec8679f799613f8f6ccdd9c1b6bf7c9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* follow rename of qt_module_config.prf to qt_module.prfOswald Buddenhagen2012-08-111-1/+1
| | | | | Change-Id: I6fd02095b9c75952c689b2c55aec9c71b39aadd3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-251-10/+1
| | | | | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - pointless DEFINES+=QT_MAKEDLL - pointless and commented out include and depend paths - qmake -project boilerplate Change-Id: I8f4586403848fe8f2dff4e889b389956ffcdea59 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* auto-generate module prisOswald Buddenhagen2012-06-251-1/+0
| | | | | Change-Id: I19285dfef7294e813ec241a8f6f00a804d56df49 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix MinGW-w64 compilationJonathan Liu2012-04-301-0/+1
| | | | | Change-Id: I812b53e822947a9f85d6523722c6a4f9e57e0426 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix a number of doc errors and warnings.Michael Goddard2012-04-111-4/+0
| | | | | | | | | | | * Document a few missing classes/functions/methods * Fix a number of QML snippets that wouldn't work as standalone snippets * Add files to .pro so they show up in Creator.. Still the mysterious lack of controls dir documentation persists :/ Change-Id: I57162371a4d966e4db5bdb1b71d1baf9c0ca57c3 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Added resource policy support though internal plugin systemLing Hu2012-03-231-1/+8
| | | | | Change-Id: I374be17d49b6a5eed0b1ed94d0b9ca5f9a2caa9b Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Updated plugins to use new plugin architectureJonas Rabbe2012-03-201-1/+1
| | | | | | | | | | | | | | | | | | | Changed QMediaPluginLoader to use QFactoryLoader instead of QPluginLoader and used metadata to get keys. Removed QAudioPluginLoader and changed audio classes to use instead use QMediaPluginLoader. The plugins must include the Q_PLUGIN_METADATA macro, and no longer use the Q_PLUGIN_EXPORT/Q_PLUGIN_EXPORT2 macros. A json file has been added for each plugin which can contain metadata which is available to the plugin loader before the plugin is actually loaded, and is used to read the keys for the plugin, e.g. supported services. QFactoryInterface will be deprecated and has been removed from all plugins. Change-Id: I035b82f9c9c65717bebf704d560ea8f891df21da Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Moved QMediaServiceProvider to private header.Dmytro Poplavskiy2012-02-061-1/+1
| | | | | | | It's not intended to be used by applications. Change-Id: I2acc26180ebb5c2419438169827f39aaf4578389 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove QMediaImageViewer (SC break).Michael Goddard2012-02-031-1/+0
| | | | | | | 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>
* More minor doc fixes.Michael Goddard2012-01-171-0/+4
| | | | | | | | | | - Missing enums - Misspelt \fn etc - Missing QSoundEffect C++ docs - A few typos etc Change-Id: I3418e79b5d50a7ab86e54d79676c33d06954bef5 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Restructure the source code a little.Michael Goddard2012-01-051-114/+17
| | | | | Change-Id: I995b0fb33bdda7f01bf6266c1c50a1b17eba6760 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add new gapless playback control interfaceLing Hu2012-01-041-3/+4
| | | | | | Change-Id: If14c20af6da81dd65177102c9b955e3ebd40c722 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add qRegisterMetaTypes for the public Q_DECLARE_METATYPEs.Michael Goddard2011-11-091-1/+2
| | | | | | | | Also turned qtmedianamespace.qdoc into a cpp file so I could stick the qRegisterMetaTypes into it. Change-Id: Idd6d3e2f348f1ed45b0a35ce180d023a170e8625 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* QtMultimedia: Remove qpa-sections from .profiles.Friedemann Kleint2011-11-011-1/+1
| | | | | | | Prepare for removal of the -qpa configure option. Change-Id: Ibf4be58231d29cd972eb765f32b410e1eb9d7fed Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Added RDS functionality to the QRadioTuner/QDeclarativeRadioSami Nurmenniemi2011-10-211-0/+4
| | | | | | Change-Id: I865e3caba82977002cf1f01f1d64ee0a42de77c6 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 22:38:18 +0000