summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia
Commit message (Collapse)AuthorAgeFilesLines
* Add new QDeclarativePlayList 5.7 items with new QML revisionAlex Blasche2016-04-292-4/+7
| | | | | Change-Id: I1f332230e34e04a304cbe6d9b6d4a4dceb70095b Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Add missing \since tag for brightness propertyAlex Blasche2016-04-291-0/+2
| | | | | | Change-Id: I804e5ea2bac65e48ddc32c8e60ea36e143b43fc0 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Updated license headersAntti Kokko2016-01-1933-462/+660
| | | | | | | | | | | 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>
* imports: replace foreach with range-based forAnton Kudryavtsev2016-01-151-4/+4
| | | | | Change-Id: I495438c99337b9423b0a589c1c8d8171d20b0cff Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Enable using the module in a statically built applicationAndy Shaw2016-01-112-0/+13
| | | | | | Change-Id: Iafdb4359f051fcd20178f3c5f42f2cff2bf8c359 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Add moveItem(from, to) to QMediaPlaylist.Jim Hodapp2015-12-182-0/+15
| | | | | Change-Id: Ic3c2ab35529ba5056b7f0d172a434e586e6cf03d Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Added insertItems and removeItems to QML Playlist.Jim Hodapp2015-12-182-0/+39
| | | | | Change-Id: Iba4d08551016c486e88e738e35fb590d82a058a2 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Added addItems to QML Playlist for batch adding of tracks.Jim Hodapp2015-12-182-0/+24
| | | | | Change-Id: Ieb7df35ad9dd50bbc68e5305e0de9fb26c64b540 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Add camera brightness adjustment API.Denis Shienkov2015-11-232-0/+23
| | | | | | | | | | 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 "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Simon Hausmann2015-10-065-19/+54
|\
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-025-19/+54
| |\ | | | | | | | | | Change-Id: I1373622a6d1fd0e2d35df2da79860a373056387f
| | * Fixed revisions of camera-related meta objects.Marco Benelli2015-09-152-9/+17
| | | | | | | | | | | | | | | Change-Id: I91fe90122d53ce12322cecac8282ef9622869b71 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| | * Fix QML Camera::supportedViewfinderFrameRateRanges().Yoann Lopes2015-08-252-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the resolution argument as a QJSValue instead of a QSize. This allows to be more flexible and doesn't require the QML argument to be an actual QML 'size' value. It can be any object with the 'width' and 'height' properties. Added missing auto-tests for supportedViewfinderResolutions() and supportedViewfinderFrameRateRanges(). Change-Id: I6c8ae72e6dab8c9d12bbada5b8e7f45e96e9289d Task-number: QTBUG-47630 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * Fix possible crashes in QDeclarativeRadioData.Yoann Lopes2015-08-251-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | It would crash when accessing any of its properties when there is no radio backend available. Task-number: QTBUG-47859 Change-Id: Ic7c0a70ca3e9a4768359b3429ea812caece09fce Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | | Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-061-0/+11
|/ / | | | | | | | | | | Task-number: QTBUG-48595 Change-Id: I1370d9229b0606582cbd828de84ee2717dca3daf Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Fix QML revisions registration for 5.6.Yoann Lopes2015-09-152-3/+142
| | | | | | | | | | | | | | | | And update plugins.qmltypes file. Change-Id: I9b3cbeda4c8a0ce88a88f5a16fae6834dc8363d7 Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Fix MediaPlayer::playlist documentation.Yoann Lopes2015-08-242-0/+6
| | | | | | | | | | | | | | Added missing '\since 5.6' tag. Change-Id: I46e0ea8bad85fb1f51f5502766c13549c6dad9d5 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Yoann Lopes2015-08-2412-1316/+166
|\| | | | | | | | | | | | | Conflicts: src/imports/multimedia/qdeclarativeaudio.cpp Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13
| * Doc: Corrected a typo.Venugopal Shivashankar2015-08-112-3/+3
| | | | | | | | | | Change-Id: I53ab7ddf0a8c0416dce19bf2b642e7e294f3c868 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * Fix documentation for QML metaData property.Yoann Lopes2015-08-113-1231/+139
| | | | | | | | | | | | | | | | | | For Audio, Video, MediaPlayer and Camera types. Group the sub properties as a \qmlproperty group, which makes the doc much clearer. Change-Id: Id990d7b14a4c3f86768c6b3b4990845f84839944 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * Fix qdoc warnings.Yoann Lopes2015-08-112-9/+1
| | | | | | | | | | Change-Id: Ie351f33f88270186b7df0f9cd671fa4e31624231 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Doc: update qml module version to 5.5.Yoann Lopes2015-08-1112-57/+0
| | | | | | | | | | | | | | | | | | 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>
| * Improve documentation for mediaObject property.Yoann Lopes2015-08-112-19/+26
| | | | | | | | | | | | | | In Camera and MediaPlayer types. Change-Id: Iaf17dc7e5f7075ce7eeefcf7992b970d1ea99e83 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Add audio role API to QMediaPlayer.Jim Hodapp2015-08-104-3/+206
| | | | | | | | | | | | Change-Id: Ia5e3e2fe714f10b6aad62f0a4801c607905c7e0d Task-number: QTBUG-41054 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Added new playlist QML type.Loïc Molinari2015-08-107-3/+891
|/ | | | | Change-Id: I0788cc9719f427457ad0be9c9a5bfda00451a0c4 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Define QCamera::FrameRateRange as a struct.Yoann Lopes2015-06-111-2/+2
| | | | | | | | Instead of an alias for QPair<qreal, qreal>. Task-number: QTBUG-46563 Change-Id: I7e1ac68242810f7e5f7e161571a11f5de7850e29 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Fix documentation for Camera flash mode enum.Yoann Lopes2015-05-181-1/+4
| | | | | | | | Added missing documentation for Camera.FlashVideoLight and corrected it for Camera.FlashTorch. Change-Id: Ib1823b6554bd2f9db92e047fd4755ae7fb3e0f96 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Update plugins.qmltypesYoann Lopes2015-04-151-5/+74
| | | | | | Change-Id: Iaa05756066c8040fe110707eee6b7d71b2a1aa84 Task-number: QTBUG-44300 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-04-156-64/+286
|\ | | | | | | | | | | | | | | Conflicts: src/multimedia/playback/playlistfileparser.cpp src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp Change-Id: I52950def2b8283ae15797d05d4ead6a1256eba19
| * Fix incorrect signal/slot connection in QDeclarativeTorch.Yoann Lopes2015-04-141-1/+1
| | | | | | | | | | Change-Id: Id8cb716e25a2c08111f99112fbf319fb8331d64d Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * Updated plugins.qmltypes.Yoann Lopes2015-04-091-19/+241
| | | | | | | | | | | | | | Task-number: QTBUG-44300 Change-Id: Id6c8dce17e03c79f29581bd49be184a8d3e7f21b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Make the QtMultimedia singleton type a QObject.Yoann Lopes2015-04-093-43/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was a QJSValue for the sake of being as lightweight as possible and because we don't actually need any of the QObject features for that type in its current state. However, this implies that type information is not available at runtime. This is a problem for qmlplugindump which currently crashes because it always expects every QML type to have an associated meta object. We can safely make that type a QObject since it doesn't affect source compatibility in any way. This type was bound to become a QObject at some point anyway. Task-number: QTBUG-44299 Change-Id: I2d9b874f15ffc94ed95ef74fadc3b1fd193fe1ef Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Fix type of Camera's errorCode property.Yoann Lopes2015-04-081-1/+1
| | | | | | | | | | | | | | It's supposed to be of type enumeration (Error) and not QString. Change-Id: Ia3ce112efa3e87614c79b89d05313b0faa557289 Reviewed-by: Andrew Knight <qt@panimo.net>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-132-11/+9
|\| | | | | | | Change-Id: I5575a4ba13212c9bfe73a3de3ef17c6528beafc3
| * Fix some typosSergio Ahumada2015-02-112-2/+2
| | | | | | | | | | Change-Id: Iaf8f50741d3103480668b4a654a202d8a363bc45 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * Clarify documentation for QImageCapture's 'ready' property.Yoann Lopes2015-02-101-9/+7
| | | | | | | | | | | | | | | | | | | | | | Unlike what was described in the documentation, it's not permissible to call capture() while 'ready' or isReadyForCapture() is false. All backends emit an error in that case. Updated the documentation to reflect that behavior. Change-Id: Icb326e65376b65eadd4c68b67e0ee30beddf1a04 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Update copyright headersAntti Kokko2015-02-1231-215/+215
| | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I1c6faa4f59f8eca54f01ef20941fa60161dd7872 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Camera: update viewfinder settings on Loaded status.Yoann Lopes2015-02-041-1/+3
| | | | | | | | | | Change-Id: I9a341c7500b09d39554118689e6e83cd1b798e39 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* | Add video filtering support to VideoOutputLaszlo Agocs2015-02-032-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the QAbstractVideoFilter base class and integrate it with VideoOutput. This can be used to perform arbitrary filtering or image processing on the frames of a video stream of a VideoOutput element right before the OpenGL texture is provided to the scenegraph by the video node. This opens up the possibility to integrate computer vision frameworks or accelerated image processing with Qt Quick applications that display video streams using Qt Multimedia. Conceptually it is somewhat similar to QVideoProbe, this approach however allows modifying the frame, in real time with tight integration to the scenegraph node, and targets Qt Quick meaning setting up the filter and processing the results of the computations happen completely in QML. [ChangeLog] Added QAbstractVideoFilter that serves as a base class for QML video filtering elements that integrate compute, vision, and image processing frameworks with VideoOutput. Change-Id: Ice1483f8c2daec5a43536978627a7bbb64549480 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | New camera viewfinder settings API.Yoann Lopes2015-01-135-36/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There already was a control interface for the viewfinder settings but no real public C++ API and a partial QML API. This patch adds a new C++ API and improves the QML API. Supported viewfinder settings are resolution, minimumFrameRate, maximumFrameRate and pixelFormat. The camera can be queried for the supported values for each of these settings. A new control interface was created to match the new API. Change-Id: I289fea038fe46277a5516c956a64280da09ed985 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* | Disable warning about QObject::event being hiddenThiago Macieira2014-12-031-0/+6
| | | | | | | | | | | | | | | | | | Found by Clang 3.6: qdeclarativemediametadata_p.h:292:14: warning: 'QDeclarativeMediaMetaData::event' hides overloaded virtual function [-Woverloaded-virtual] qobject.h:116:18: note: hidden overloaded virtual function 'QObject::event' declared here: different number of parameters (1 vs 0) Change-Id: I4324c984649738c9625cc3eb9dddea6e2abf46a9 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Add additional exposure modes to QCameraExposure.Andrew den Exter2014-11-283-0/+30
| | | | | | | | | | | | | | | | | | [ChangeLog][GStreamer][Android] Camera exposure mode extended to support Action, Landscape, NightPortrait, Theatre, Sunset, SteadyPhoto, Fireworks, Party, Candlelight, and Barcode modes. Change-Id: I13d4bb042d27c0bd2ffcd369882b56bbabc84335 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Add a color filter property to QCameraImageProcessing.Andrew den Exter2014-11-283-1/+60
|/ | | | | | | [ChangeLog] New color filter property for QCameraImageProcessing. Change-Id: I999e349e3e4f284b533fa62ba50903fbd21cb400 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Make the multimedia examples less verboseAlex Blasche2014-09-221-0/+3
| | | | | | | | | Important warnings such as missing services are still printed though. Task-number: QTBUG-31080 Change-Id: I96fd3837c4edc58c61b97bf950b7cab05ceed014 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Update license headers and add new license filesAntti Kokko2014-08-2431-583/+335
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: Ied06887225df341064c12bcc14c259ae74116f2e Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Add missing registration of CameraViewfinder QML type.Yoann Lopes2014-07-251-0/+3
| | | | | Change-Id: If4eedd6298731953a3f86c86f0e61b850ee263aa Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* New camera selection API in QML.Yoann Lopes2014-07-176-34/+553
| | | | | | | | | | | | Also added a new QtMultimedia global object which makes it possible to retrieve the list of available cameras. It can be extended with new utility functions in the future. Includes documentation, example and auto tests. Task-number: QTBUG-23770 Change-Id: Ifea076329c3582ea99246ee1131853344a7b773f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-101-2/+2
|\ | | | | | | Change-Id: I38ebcb3da0e4d2acc9e7108c9579ea98323864e0
| * Fix documentation for QML Camera's cameraStateChanged signal.Yoann Lopes2014-07-081-2/+2
| | | | | | | | | | | | | | | | The signal name is 'cameraStateChanged' but was documented as 'stateChanged'. Change-Id: I80279613b55105a925acafc21f67c4a0917906af Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Add QML accessors for camera viewfinder properties.Andrew den Exter2014-07-095-2/+249
| | | | | | | | | | | | | | [ChangeLog] Added QML accessors for camera viewfinder properties. Change-Id: I05a2a6c552aa8606e8dc31a11d1cfdedf66c554f Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 21:36:43 +0000