summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Collapse)AuthorAgeFilesLines
* Make QAudioSystemPlugin doc visible.Yoann Lopes2017-01-272-4/+0
| | | | | Change-Id: I0384fd6069349f321e60ffedd03834f1c46f634b Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devYoann Lopes2017-01-261-16/+94
|\ | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/multimediawidgets/videographicsitem/videoplayer.h src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp Change-Id: Id5ce05ffe2cd25657232157b162680b2e24a35ba
| * PulseAudio: make sound effect implementation more robustYoann Lopes2016-12-121-16/+94
| | | | | | | | | | | | | | | | | | | | | | | | - Always lock the pulse thread when modifying variables that are also used in callbacks (prevents concurrent access). - Improved handling of repeated calls to setSource(). - Don't try to write to the device when there is nothing to write. - Stop the Pulse thread when there are no sound effects in use anymore. Task-number: QTBUG-55735 Change-Id: I5e1c6beab89fdbb98707f5fcbb539dddea9a333f Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | GStreamer: Add missing override and remove redundant virtualAlexander Volkov2016-12-1312-81/+81
| | | | | | | | | | Change-Id: I61997676d7f002e769de499b19cbea3d96876480 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Add missing override and remove redundant virtualAlexander Volkov2016-12-1230-171/+171
| | | | | | | | | | Change-Id: Ifd439abf21877adff57080489324bea729ee5279 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Improve the playlist parserChristian Strømme2016-12-124-176/+312
| | | | | | | | | | | | | | | | | | | | | | | | | | The main goals of this change is to make the parser more lightweight, e.g., by removing unneeded QObject allocations, and make it possible to stop the parsing more quickly. In addition, support for the same resources as the media player was added, that is, support for QMediaContent, QMediaResource, and QIODevice. The combination of these changes should make it easier and faster to use the parser internally. Change-Id: I1f25d6529fa9bab0c6c3c9d9de35b7f8b4a708e0 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-1254-376/+495
|\| | | | | | | | | | | | | Conflicts: src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp Change-Id: I7c30c2d13fdd07ee07e4449d5d3e256e988d3793
| * Update label for backend testMaurice Kalinowski2016-12-091-1/+1
| | | | | | | | | | | | | | | | The "backend for Qt Multimedia" string is just redundant information causing noise and formatting of configure to be broken. Change-Id: Iac0e7a675640e70ab7f11180b2059c61949272b9 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Add proper global headers for QtMultimediaLars Knoll2016-11-2344-43/+161
| | | | | | | | | | | | | | And deprecate the old qtmultimediadefs.h Change-Id: I2d4164f3a51d8e5d1813413b4f6691a721386fdf Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * Remove Blackberry specific code pathsLars Knoll2016-11-142-87/+0
| | | | | | | | | | Change-Id: I187085984eb1b25d7f3de163dc05122df1259720 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| * Cleanup all maemo/meego specific codeLars Knoll2016-11-144-217/+0
| | | | | | | | | | Change-Id: I6c6f28084c6b030928eebc53c5d0009b168ede6a Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * Move qtmultimedia over to the new config systemLars Knoll2016-11-142-13/+320
| | | | | | | | | | | | | | | | | | | | | | | | 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-113-17/+15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtmultimedia.pro src/multimedia/playback/qmediaplayer.cpp src/plugins/directshow/directshow.pro tests/auto/integration/qmediaplayerbackend/BLACKLIST Change-Id: I6dacdcbb223c1d12dd72eb308a67170983c709b3
| | * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-043-17/+15
| | |\ | | | | | | | | | | | | Change-Id: Ib038c5e3ebb48c0e46569a35d530fa5ceaf06a32
| | | * Add missing Q_DECL_CONSTEXPRChristian Strømme2016-11-011-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The functions were missing the constexpr specifier, and since the code was touched, the equality check was also updated to use qFuzzyCompare. Change-Id: Ib06c5e7927bef0ebe513a411e2bb79b433e3ccd7 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | | * Reduce size of QMediaPlayerPrivateChristian Stromme2016-10-191-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rearranged the data members to reduce the object size (-16 bytes on 64 bit systems). Change-Id: I0f285fafc42633fff42eba1ddc68c6f9bee2cec8 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | | * Doc: Add a \brief for the QMediaMetaData namespaceLeena Miettinen2016-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ...to display the docs for it properly in tables. Change-Id: Ib719d2ef7278f44a25f9101e1629e558901bba5d Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-127-12/+12
|\| | | | | | | | | | | | | | | Change-Id: I126bc73db5b5d9b6c26cb9ff5da7ed13a16b378b
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Yoann Lopes2016-10-117-12/+12
| |\| | | | | | | | | | | | | | Change-Id: I8cfa9cb233675bb7ff842118d96ec8ac0b97964f
| | * | Doc: added definition for parameter gainNico Vertriest2016-10-051-1/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I710e99e6889e49755241e8448163167374f23f52 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-046-11/+11
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp Change-Id: I4a30fc030c25e7b8da3eb9f386c4a5fa468df141
| | | * Doc: Add comment about stream requirementsChristian Strømme2016-09-281-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I92e16722dc5cc8df23cf4ed0d048a0d2a23956eb Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | | * Remove useless castChristian Strømme2016-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Casting to same type. Change-Id: I93935b75edac56c958d0669eff216b9dcf16a153 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | | * Clamp out-of-range volume values in QAudioInput and QAudioOutputYoann Lopes2016-09-282-2/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I6da76524533e16f6987fad6029b1f42960972383 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | | * Clamp volume in QMediaRecorder and QSoundEffectYoann Lopes2016-09-272-6/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie61c33592873b7e5a2ed1b8ccf3386b20edb2cef Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-114-18/+51
|\| | | | | | | | | | | | | | | Change-Id: I7291f7a3bd5851eafe2bf0a4bd5c5f8e705a90bc
| * | | Bump QML module version in documentationYoann Lopes2016-09-263-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I2c3574e2a5cf46ecc9719111b5293b67583d006c Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Yoann Lopes2016-09-234-18/+51
| |\| | | | | | | | | | | | | | Change-Id: I96aca24df935d51b40380c727b6c5002432a6be6
| | * | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Yoann Lopes2016-09-221-14/+47
| | |\ \
| | | * | Merge remote-tracking branch 'origin/5.6' into 5.7Yoann Lopes2016-09-221-14/+47
| | | |\| | | | | | | | | | | | | | | | Change-Id: I5bce2843ac62bb97efc1ccaaa9c671c4adf10640
| | | | * PulseAudio: make code more robustYoann Lopes2016-09-211-14/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some asynchronous operations return a pa_operation pointer, which can be null if the operation fails. In some cases we were not checking that the returned object was non null, leading to some asserts being raised in pa_operation_unref. Change-Id: Iff1cc67b7f79b758fa81d79e658debb1d737b29f Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | * | | Fix QML module version in documentationYoann Lopes2016-09-223-4/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Upated to 5.7 from 5.6. Change-Id: Ife0bc905aa81a8e776c5fc3eeafbc5706e5352d3 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-2113-26/+119
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/multimedia/multimedia.cpp Change-Id: I38899391ec8d2fcec6f2d46514286759f7a27629
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-191-2/+4
| |\| | | | | | | | | | | | | | Change-Id: I022c07dab3ded6072f7c103e299822caaf40cf34
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-171-2/+4
| | |\| | | | | | | | | | | | | Change-Id: I27d68b69f2ad15e930b6adab5b2ff583f4642fac
| | | * Optimize QMediaPlaylistPrivate::readItems()Yoann Lopes2016-08-311-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When reading playlist items from a file, pass them to the playlist backend all at once rather than one by one. This might be faster depending on the implementation. Task-number: QTBUG-54849 Change-Id: I57acdc68604ee56fe5d7615ba0a72655e668443f Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Yoann Lopes2016-09-015-13/+52
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/audio/qaudiosystemplugin.cpp src/plugins/directshow/helpers/directshowobject.cpp src/plugins/directshow/player/directshowiosource.cpp src/plugins/directshow/player/directshowiosource.h Change-Id: I0e4632c7705128f81429ddbcb0d4abbc04858a8b
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-275-13/+52
| | |\| | | | | | | | | | | | | Change-Id: I639d42e78a2b85e939c9f8e9dd5da70cdc058857
| | | * PulseAudio (QSoundEffect): don't write data to an unready streamYoann Lopes2016-08-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PulseAudio stream must be ready to write data to it, otherwise an assert is raised. Change-Id: Iaa108124a135b018aa84845a37665895a005f380 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | | * PulseAudio: flush stream before loading a new source in a sound effectYoann Lopes2016-08-152-10/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When loading a new QSoundEffect source, the data in the stream must be flushed to avoid that the old source plays right before the new one. Task-number: QTBUG-48982 Change-Id: Iff14884edb2fb4851f93e67ff8191b77ebb16359 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | | * Doc: Change instances of 'OS X' to 'macOS'Topi Reinio2016-08-153-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase). Change-Id: I1ba3b1e3c11870523516d3a13790d40dd0803aad Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * | | Improve audio volume documentationYoann Lopes2016-08-227-11/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added information about volume scales. Change-Id: Ica8367396147e3e1c814b3575faa5cf0503be031 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | | GStreamer: move suggestedFileExtension() out of camerabin pluginYoann Lopes2016-08-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now in QGstUtils, in order to be used from other places. Change-Id: Id8beae1b804fa22bd648e254a1ff2a1f1e455a02 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | | GStreamer: improve QGstCodecsInfoYoann Lopes2016-08-231-7/+13
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The class now works with GStreamer < 0.10.31. - New codecElement() function that returns the GStreamer encoder name for a given codec. - New codecOptions() function that returns the list of available GStreamer properties for a given codec. - Don't return duplicate codecs (when several GStreamer plugins are available for a given codec). We now only use the highest ranked one. Change-Id: I4a79099d4469907c73046d7e78df737fe4ed036c Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-171-7/+9
|\| | | | | | | | | | | Change-Id: Ib8d05d6e21c7beb19f618cd1edc52d248b1e43b8
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-131-7/+9
| |\| | | | | | | | | | Change-Id: I3204cdf695f4b47730a88a7c41fc7a6de967b161
| | * Fix playing a playlist containing an invalid media as first itemYoann Lopes2016-08-121-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a playlist contains an invalid media, QMediaPlayer normally continues to the next media. If an invalid media was first in the list, the backend would never go into PlayingState, which would then cause the media player to never start the next item in the list (thinking it's stopped). We now always transition to PlayingState when starting playback of a playlist, regardless of the backend going into that state or not. Change-Id: I4227f937e7a619afbd8adbe2fccedfa5d43ad89a Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-091-1/+1
|\| | | | | | | | | | | Change-Id: I0e74582a735dd8fd169ac928a32143ab80a2d2a0
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-041-1/+1
| |\| | | | | | | | | | Change-Id: If640a9831fc4faf43a445bd0379fee1d53661f47
| | * QPlaylistFileParser: fix QUrl::resolved+QUrl::fromLocalFile misuseDavid Faure2016-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QUrl::resolved can be used to resolve relative paths, but not by passing them via QUrl::fromLocalFile (8a33077 in qtbase made QUrl more strict). To resolve both relative and absolute local paths against a local directory, QUrl::fromUserInput(3 args) does the job. Change-Id: Ifc01bbd590978f939f9538e70d12f2f3704d7b5d Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 06:55:49 +0000