summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Fix setting state to not playing when audio error occurredPasi Petäjäjärvi2016-01-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Even if QAudioOutput has finished playing audio state don't change to stopped because QSoundEffect checks only QAudio::IdleState as when to stop itself. Change-Id: Iea3a4926c87ea5a7b440e62d832bbc13bcdd3b6d Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Updated license headersAntti Kokko2016-01-19251-3516/+5022
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I324f65c61171f36641472964d095d72e452afb3a Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into devChristian Strømme2016-01-1517-81/+157
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/android/src/mediacapture/qandroidcamerasession.cpp src/plugins/wmf/mftvideo.cpp Change-Id: I78868b416ea4baec89ca3e2dc9eb4712db16d5fc
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Christian Strømme2016-01-121-0/+2
| |\| | | | | | | | | | Change-Id: Ia563cf734178b821c2aadda8b79b1f09b17de7cd
| | * Fix playing sound in loop if sample size is smallPasi Petäjäjärvi2016-01-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If sample size is smaller that current periodsize, then playing sample multiple times in loop will fail. Reason is data offset of sample is set out of the bounds actual sample data size. Change-Id: I81f580cbb8dabf89db0d61528f5f1c9489216e0c Task-number: QTBUG-49838 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * | Doc: Generate separate listing of Widgets classes in the QHPTopi Reinio2016-01-121-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use the new QHP selection format to separately list the members of Qt Multimedia and Qt Multimedia Widgets modules in the table of contents. Change-Id: I50be80a820111834207967eada0865d212be98a8 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * | Doc: Fix documentation warningsTopi Reinio2016-01-085-27/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix incorrect paths passed to \example command - Fix resulting linking issues - Fix examplesinstallpath in .qdocconf - Remove unnecessary group definition Change-Id: I72a437ac6d297f3c63d4f29a0e3110971d1e330f Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * | Add virtual dtor to QSGVideoNodeFactoryInterfaceKevin Funk2015-12-221-0/+2
| | | | | | | | | | | | | | | | | | | | | Makes it compile for me Change-Id: Ib79f4c38bb165d3698a94c5d1aafee710423a907 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * | Change the way a playlist is bound to a media object.v5.6.0-beta1Yoann Lopes2015-12-112-8/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Doc: Move all doc artifacts under one projectVenugopal Shivashankar2015-12-077-41/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | Although the Qt Multimedia module has two submodules, a single project is sufficient to document these submodules, avoiding unnecessary maintenance overhead. Change-Id: I8fab48241b5c9aba35890a8aaa28ce7154f78c45 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * | Doc: Exclude outdated content using \omit commandVenugopal Shivashankar2015-11-251-3/+2
| | | | | | | | | | | | | | | | | | Change-Id: Ifb30e398b57550788dab6955e3eac80949d47248 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * | Fix some private headers.Yoann Lopes2015-11-241-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Add missing "We mean it" comment - Add missing '_p' suffix for QtMultimediaQuick_p headers Task-number: QTBUG-49480 Change-Id: I1fd4f8b2fdffecebaebaedaf1b78e1da62c08156 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | | Camera: replace foreach with range-based forAnton Kudryavtsev2016-01-152-15/+15
| | | | | | | | | | | | | | | Change-Id: Iedaad3bccea7a5d830f713d87240f5f957ae12c5 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Video, Playback: replace foreach with range-based forAnton Kudryavtsev2016-01-153-5/+9
| | | | | | | | | | | | | | | Change-Id: I46031547447669925cdd747f5ac6259acab9a410 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Multimedia, MultimediaWidgets: replace foreach with range-based forAnton Kudryavtsev2016-01-155-24/+35
| | | | | | | | | | | | | | | Change-Id: I6d291fb1a46686c9e7d5974c831d4d798de2f03a Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Audio: replace foreach with range-based forAnton Kudryavtsev2016-01-153-12/+15
| | | | | | | | | | | | | | | Change-Id: I5c9f7554f3ef1c93a0041afcf1331d092e5ec405 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | fix expensive iteration over QMap::keys() and QHash::keys()Anton Kudryavtsev2016-01-141-3/+3
| | | | | | | | | | | | | | | Change-Id: I244aa1ecf006774ebe5fb9bb5b22d37142186e39 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Add moveItem(from, to) to QMediaPlaylist.Jim Hodapp2015-12-186-0/+41
| | | | | | | | | | | | | | | Change-Id: Ic3c2ab35529ba5056b7f0d172a434e586e6cf03d Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | QSampleCache: use prefix ++ for iterator in setCapacityAnton Kudryavtsev2015-12-041-2/+3
| | | | | | | | | | | | | | | | | | | | | because it's useful for non-primitive types Change-Id: I59099d18ad8811601d09f76b6b30a95721e6e82f Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Add camera brightness adjustment API.Denis Shienkov2015-11-232-0/+22
|/ / | | | | | | | | | | | | | | | | | | The brightness adjustment already exists in the control API but not in the QCamera and QML Camera APIs. Simply add the missing functions which call into the control API. Change-Id: I56a5aef3ae8bef9ca13c5a01d8282014f6e20830 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Yoann Lopes2015-11-204-2/+143
|\| | | | | | | Change-Id: I8e0f222f110cc23b426f2d68416f5cc3982e30f2
| * Add qt_real_to_fraction() helper function.Yoann Lopes2015-11-193-2/+142
| | | | | | | | | | | | | | | | | | | | 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>
| * Support compiling with GStreamer < 0.10.32 in the camerabin plugin.Yoann Lopes2015-11-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documented minimum GStreamer version for Qt Multimedia is 0.10.24, however, the camerabin plugin actually required 0.10.32 to compile successfully. The reason is mainly due to the GstEncodingProfiles API, which is used to implement the audio and video encoding settings controls. There's no hard requirement for that API anymore and the aforementioned controls simply don't do anything when the GStreamer version used to compile is older than 0.10.32. A few other GStreamer calls had to be ifdef'd or replaced in order to compile with 0.10.24. Note that this patch only makes sure it compiles with older versions, running the camerabin plugin with GStreamer < 0.10.32 is currently untested and it might not work as expected. Task-number: QTBUG-48914 Change-Id: I4ce8e932f24a33e919e29326729e12bbae561faf Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix the install path with the repository name. Task-number: QTBUG-48736 Change-Id: Idb61addec1cc8a01c31cfa05a2424a2b4ac85a91 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Add private API for conversion from QVideoFrame to QImage.Yoann Lopes2015-10-2010-2/+899
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Yoann Lopes2015-10-203-2/+9
|\| | | | | | | Change-Id: Ie1e478eca1cdfd99ccd3a3c8a07aefbfa27ccbdb
| * GStreamer: fix compilation with version < 0.10.31.Yoann Lopes2015-10-202-0/+7
| | | | | | | | | | | | | | | | | | | | Qt 5.4 and earlier required GStreamer 0.10.24 as minimum version. Qt 5.5 added code that requires 0.10.31, this code is now ifdef'd and we now support again 0.10.24. Task-number: QTBUG-48353 Change-Id: Ie708a33c0515874b003ce26a3400475075d316ca Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * Fix signal/slot declaration in QVideoOutputOrientationHandler.Yoann Lopes2015-10-161-2/+2
| | | | | | | | | | Change-Id: I03cdd677feaf06ac2d61682cab46232f983e6494 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Simon Hausmann2015-10-061-0/+1
|\ \
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-021-0/+1
| |\| | | | | | | | | | Change-Id: I1373622a6d1fd0e2d35df2da79860a373056387f
| | * Fix crash in QSoundEffect when using it from a non-GUI thread.Yoann Lopes2015-08-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The internal QIODevice used as data source was not set as child of the parent QSoundEffectPrivate. If moveToThread() was called on the QSoundEffect, the QIODevice would still receive events on the main thread, leading to race conditions. Task-number: QTBUG-46359 Change-Id: I180da2fb498108b316fd9b5b5cc84376b360fa3f Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | | Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-0627-0/+297
|/ / | | | | | | | | | | Task-number: QTBUG-48595 Change-Id: I1370d9229b0606582cbd828de84ee2717dca3daf Reviewed-by: Yoann Lopes <yoann.lopes@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>
* | Fix QCamera::lockStatus() documentation.Yoann Lopes2015-08-241-1/+1
| | | | | | | | | | Change-Id: I1f7c063ef1e465ba658f637754b10b7af44b8373 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Yoann Lopes2015-08-2419-97/+258
|\| | | | | | | | | | | | | Conflicts: src/imports/multimedia/qdeclarativeaudio.cpp Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13
| * QMediaPlayer: clear current playlist on deletion.Yoann Lopes2015-08-191-0/+2
| | | | | | | | | | | | | | | | | | | | Makes sure the current playlist is unbound when QMediaPlayer is destroyed. Change-Id: If25efa67bf79af0326f6125d9615165a2c7dd6bb Reviewed-by: Jim Hodapp <jim.hodapp@canonical.com> Reviewed-by: Loïc Molinari <loic.molinari@canonical.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * GStreamer: refactored widget and window control.Yoann Lopes2015-08-184-32/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of always using xvimagesink as GStreamer backend for the widget and window control (works only with X11), we now try to pick a video sink that fits the current configuration. It first tries a set of known video sinks that can work with the Qt platform plugin in use. If none is available, it dynamically picks a video sink available on the system that can be used with our backend. Even if the video sink is now picked in a smarter way, xcb is still the only supported platform plugin. The reason is that it's the only Unix plugin which can provide a valid native window handle. Additional work is needed to support other plugins like wayland or directfb. Change-Id: I3843dea363d6a0b85a6cc1f2952783b743e48ac6 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * Fix QCamera viewfinder capabilities functions..Yoann Lopes2015-08-182-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | - 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>
| * GStreamer: added convenience function in QGstUtils.Yoann Lopes2015-08-131-0/+1
| | | | | | | | | | | | | | -> qt_gst_element_get_factory_name(GstElement *elem) Change-Id: Icf806488b49fbcdecdd605b6316bd1ef8796a883 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * Fix camera plugin selection.Yoann Lopes2015-08-121-8/+3
| | | | | | | | | | | | | | | | When requesting a camera plugin for a given device id, it should fall back to any available plugin if that device id is not found. Change-Id: I685294c7fdcaa72bce70178b0aae2ec92e79e107 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * Remove obsolete check in QMediaServiceChristian Strømme2015-08-121-2/+0
| | | | | | | | | | | | | | The macro QT_NO_MEMBER_TEMPLATES was removed eons ago. Change-Id: Ifc4f3ac8bcf1e9b42fad5dcfb101e3446a254abc Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * Bind the playlist connected to a player.Loïc Molinari2015-08-121-0/+2
| | | | | | | | | | Change-Id: I3c2e00773c88f671bdffcfe8c8175330ca405d4a Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * Fix qdoc warnings.Yoann Lopes2015-08-116-17/+69
| | | | | | | | | | Change-Id: Ie351f33f88270186b7df0f9cd671fa4e31624231 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Doc: update qml module version to 5.5.Yoann Lopes2015-08-117-21/+6
| | | | | | | | | | | | | | | | | | And remove import statements from snippets. Change-Id: I109beabd445186f96f0750b6f23fb623c125181e Task-number: QTBUG-47620 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Emit mediaAboutToBeRemoved() before mediaRemoved() in QMediaPlaylist.Loïc Molinari2015-08-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | When a new playlist's mediaObject is set, the content is cleared and the mediaRemoved() signal is emitted without a former mediaAboutToBeRemoved(). This is an issue for QAbstractItemModel implementations, like the coming QDeclarativePlaylist, which call beginInsertRow() and endInsertRows() in the respective signal handlers. Change-Id: I7ec512ff2736e92858df94d9479741e05162e1f0 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * Check and fix up bounds in QMediaPlaylist methods.Loïc Molinari2015-08-101-6/+16
| | | | | | | | | | Change-Id: I665d665139dbe9663b20ecb08fa3dab9cbe3f899 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * Clean up QMediaPlayer documentation.Loïc Molinari2015-08-101-7/+7
| | | | | | | | | | Change-Id: I2d744542270f283ccd8ba0160aeda7faa56b2b86 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Fix 2 more tr()-contexts of messages in QPlaylistFileParserPrivate.Friedemann Kleint2015-08-191-2/+2
| | | | | | | | | | | | | | Use QPlaylistFileParser instead of QObject. Change-Id: I5dd4b56f7f580ca4089db67bbfabdd58ef7e2778 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Fix tr()-context of messages in QPlaylistFileParserPrivate.Friedemann Kleint2015-08-191-1/+2
| | | | | | | | | | | | | | Use QPlaylistFileParser instead of QObject. Change-Id: I83f6b0384fc60b356a8ae8b316d2aaa768e7ac4d Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Add audio role API to QMediaPlayer.Jim Hodapp2015-08-108-2/+335
| | | | | | | | | | | | Change-Id: Ia5e3e2fe714f10b6aad62f0a4801c607905c7e0d Task-number: QTBUG-41054 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 22:37:44 +0000