summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia
Commit message (Collapse)AuthorAgeFilesLines
* Fixed QML video playback on MacDmytro Poplavskiy2012-06-295-0/+352
| | | | | | | | | | | | Use the same CIImage based video frames as with QGraphicsVideoItem, but since CIImages can't be rendered directly in Scene Graph, the frame is rendered to FBO first. Task-number: QT-5423 Change-Id: I16f7e6351578bae21f8642a8028538c441e1f544 Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Rename availabilityError to availability.Michael Goddard2012-06-299-41/+35
| | | | | | | It's perhaps clearer in the usual case. Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Add default initialisation to various multimedia classesMithra Pattison2012-06-252-4/+11
| | | | | Change-Id: I902de05984fdae152e2678e4cf2d401a0b670703 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Add the QtBase/lib directory as a library path, not just frameworks.Michael Goddard2012-06-251-1/+1
| | | | | | | | This meant that any non-framework libraries there weren't found (like the multimedia helper libraries). Change-Id: Iacd99f82763d39fc47c779c9498dfd5e1cc0e743 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Fix a number of other qdoc issues.Michael Goddard2012-06-1513-215/+192
| | | | | | | | | | | | | | * Several places needed the forward class declaration hack * Missing/wrong minor version numbers on imports * A few typos * Any number of attempts to work around qdoc * A few missing docs * Tweaked soundeffect docs Change-Id: I3c2ab998a11cbb0956712e0423e01fdb70f5bfff Reviewed-by: Peter Yard <peter.yard@nokia.com> Reviewed-by: Angus Cummings <angus.cummings@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Replace a writable position() property with a seek() method.Michael Goddard2012-06-142-23/+50
| | | | | | | | Seeking is sometimes asynchronous, and more importantly nearly every one using a slider for seeking ends up with a binding loop. Change-Id: I45d92e19b0276c8b97c51c073754d1c9d3dc611e Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Updating brief layout of QML typesAngus Cummings2012-06-1413-15/+15
| | | | | | Change-Id: I1dcd7bf7427f25bb9e19cbe3c7e17808b0fc9708 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Peter Yard <peter.yard@nokia.com>
* Remove the legacy QML API.Michael Goddard2012-06-0811-2189/+322
| | | | | | | | This means no version 4.0 (which was never released) and no Qt.multimediakit alternative import. Change-Id: Iaacf047b0d72381a4a8cd975e036135ed11ea383 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* A number of documentation fixes.Michael Goddard2012-06-073-6/+6
| | | | | | | | | | | | | | * Remove references to private QMediaServiceProvider class and point new backend writers to irc/mailing lists * Wrong or missing parameter names * Fix a few links * Correct a few property data types * Various other things to keep qdoc happier Change-Id: I5c8800d65c00f0783541afef35990bd3918acab7 Reviewed-by: Angus Cummings <angus.cummings@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
* Use QPointer instead of QWeakPointer to track QObjects.Stephen Kelly2012-06-071-3/+4
| | | | | | | The latter is to be deprecated. Change-Id: I01998be880feba0819a9bc51f9bec48fd4601789 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Call the base QQuickItem geometryChanged function in our override.Michael Goddard2012-06-051-0/+2
| | | | | | | | Otherwise you get strange errors like the width/height of a VideoOutput element are 0. Change-Id: Ib123112b513f5ed2f0ce24da6dbfe00e20551d74 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fixing doc errors in MediaPlayer and CameraFlashAngus Cummings2012-06-012-77/+678
| | | | | | | | | properties were not showing up for either type. There were namespace errors in flash, and mediaplayer docs needed to be copied from audio. Change-Id: I53fa721ec9e0cfa1aee3586c7e3eb608b9a1b465 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Added missing QDeclarativeCamera::CaptureViewfinder enum valueDmytro Poplavskiy2012-05-182-0/+4
| | | | | Change-Id: I75844e3a943a76649d1b51f0c845a4bf8b200a8e Reviewed-by: Ling Hu <ling.hu@nokia.com>
* QML VideoOutput: don't keep video frames for more than necessaryDmytro Poplavskiy2012-05-162-17/+31
| | | | | | | | The frame can be released as soon as it pushed to video node. Change-Id: Ib2621cc2a001629e722bf15b6e1ca09323170870 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Expose camera status to QML Camera elementDmytro Poplavskiy2012-05-162-0/+75
| | | | | | | | It's exposed as Camera.cameraStatus property. Change-Id: Id3b477266d3a666b7a2a61cd4579f0e3f873d3b8 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Minor doc fixes for QMLAngus Cummings2012-05-1614-135/+147
| | | | | | | | | | renaming QML element to QML type removing some \fn tags that were making the docs not build some rewording some new signal docs Change-Id: I9b350dad1780276959aef4105e53b91082a6083e Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Fixed QML Camera errors reportingDmytro Poplavskiy2012-05-142-8/+27
| | | | | | | | Added missing connection to QCamera::error() signal Added Camera.errorCode property Change-Id: Ie0dd71d760b4b5b79b2aefaba97bc383ef2a9750 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Improved QDeclarativeCameraRecorder errors reportingDmytro Poplavskiy2012-05-142-6/+35
| | | | | | | | | | | Added QDeclarativeCameraRecorder::Error enum to allow specify error codes as CameraRecorder.FormatError. Added QDeclarativeCameraRecorder::errorCode property. Change-Id: Iac5522c3110591493b98e59db18dbfc2d3b7496f Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Don't use QtDeclarative compat moduleKent Hansen2012-05-143-3/+3
| | | | | | | Use QtQml instead. Change-Id: I7618ba89a2ed288f7043ae402ac091a924598f03 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Support QVideoWindowControl in the QtQuick Video element.Thomas McGuire2012-05-038-252/+804
| | | | | | Change-Id: I953899a3ec92856955d36528057b0d45f9c26394 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Added QMediaRecorder::status propertyDmytro Poplavskiy2012-05-022-0/+50
| | | | | | | | | | | | | QMediaRecorder::state property represents the user request and changed synchronously during record(), pause() or stop() calls. Recorder status is changed asynchronously and represents the actual status of media recorder. This also makes API more consistent with QMediaPlayer and QCamera. Change-Id: I80b4aaa70bb88e555c492908da8c29d0fc5ed5ea Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Fix compilation after qtbase:8f85b84f4eaa85ff5c02ec5e65fd6706a10690b9.Friedemann Kleint2012-04-243-4/+4
| | | | | | | Remove QDeclarative compatibility module code. Change-Id: Ib24c0c027c899e7eb30b3c8550a483d0d8b2b77f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Change Video and VideoOutput docs to mention ScreenSaverAngus Cummings2012-04-162-0/+26
| | | | | Change-Id: If7a03e9eafd351eec484a568802c75d955b68ecf Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QDeclarativeVideoOutput: correctly disconnect _q_updateMediaObjectLev Zelenskiy2012-04-161-1/+1
| | | | | | | | | Fixed a bug where _q_updateMediaObject() slot wasn't disconnected correctly. Change-Id: I45696fc850dc59ff6f1cc45da15b87c280c29088 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Use QtMultimedia 5.0 in the QML Video element doc.Thomas McGuire2012-04-131-1/+1
| | | | | Change-Id: I5e549b321a549d2b4abc058cf08d81329df3562e Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix a number of doc errors and warnings.Michael Goddard2012-04-114-65/+92
| | | | | | | | | | | * 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>
* Updated a lot of minor fixes to the docs and removed warnings from qdocJonas Rabbe2012-04-0513-20/+30
| | | | | Change-Id: Ib7fd75fb93c038f9e8fa9d71b6ad01fb27b97622 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add typeinfo for the declarative plugin for Qt MultimediaJonas Rabbe2012-04-043-1/+1366
| | | | | | | | | | | | For Qt Creator to correctly typecheck and auto-complete QML types and objects, the typeinfo must be exported and added to the qmldir file. This patch contains those changes, and an update to make updating the typeinfo file easier in the future. Change-Id: I988f22d3ca81839662cce4aed9d5297f7c5fbf32 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Moved video plugins around to prevent accidental unloadingJonas Rabbe2012-04-021-1/+1
| | | | | | | | | | | | If several different plugins are located in the same place, and are loaded by different instances of QFactoryLoader, like we use, then plugins that are used elsewhere can be unloaded. By ensuring that the plugins are alone in their directory, then they will not have this problem. Change-Id: Id95b81ddf46435278fe43a4769e2d39f6b973a84 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
* Don't delete video node factories owned by the plugin loader.Andrew den Exter2012-03-232-3/+10
| | | | | | | | | | | Make the fallback factories members instead of creating on the heap so there's no need to delete members of the m_videoNodeFactories some of which may be shared with other current and future video outputs. Change-Id: I3d2e32e52479b12ff64e31a2ed527336d94a191b Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* resolving some warnings in qtmultimedia docsAngus Cummings2012-03-222-10/+10
| | | | | Change-Id: I9df926f64548a5d53382448ca4eef8d428339aa3 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Added VideoLight camera flash mode.Dmytro Poplavskiy2012-03-221-0/+1
| | | | | | | | Unlike the torch mode, it's enabled only while camera is active. Change-Id: Ib92349ac190586c5aa8e49a8fddbdf937e757fd0 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* changing include from qdeclarativeinfo to qmlinfo in qdeclarativeaudio.cppThomas Senyk2012-03-211-1/+1
| | | | | Change-Id: I7244f6c7b3743dfe5532f1d13c2afef256a2cdbc Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Updated plugins to use new plugin architectureJonas Rabbe2012-03-207-22/+9
| | | | | | | | | | | | | | | | | | | 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>
* Fixed the qml Camera.imageCapture.imageExposed signal connectionDmytro Poplavskiy2012-03-201-1/+1
| | | | | | | | Trivial fix. Change-Id: I522e3186ce9284e3aa0fb84296bc3c1e663e8577 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Make QDeclarativeAudio use QMediaPlayer instead of the controls.Michael Goddard2012-03-168-302/+332
| | | | | | | | | | Very minor changes in semantics due to previous differences: * negative positions are not supported any more (clamped to >= 0) * setting muted to the same value previously set to the control itself won't signal any more. Change-Id: Iacf4310508d853ae82b63dee28095fce12b6ff28 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Merge the QDeclarativeMediaBase and QDeclarativeAudio classes.Michael Goddard2012-03-165-767/+558
| | | | | | | | | Since there is only one subclass of base. Next step is to clean up QDeclarativeAudio Change-Id: Ibda8c3006efa165b58372a011121f04a39458562 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Updated declarative components to use the QML moduleJonas Rabbe2012-03-1415-30/+32
| | | | | Change-Id: I4b49466ba5248683c2285f98ce17bc2c24bba515 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Made QRadioData bind to QRadioTuner to avoid using multiple servicesJonas Rabbe2012-03-124-27/+53
| | | | | | | | | | | | | | | | | | | | | QRadioData has been updated to be a QMediaBindableInterface, and it will bind to a QRadioTuner instance, i.e. a QMediaObject that provides a service which implements the QRadioDataControl. This change is reflected in the declarative implementations of radio tuner and data. There is a new `radioData` property in the Radio element which will give access to the declarative RadioData element for the tuner. If a RadioData element is created in QML, it will have an anonymous tuner which communicates with the underlying media service (which is pretty much the same how the QRadioTuner and QRadioData classes work previously). Updated radio tuner and data test cases to use availability control and extended the mock media service to allow providing a number of controls rather than just one (needed for testing availability of all classes extending from or using QMediaObject). Change-Id: Id41dde66eee529decd828fd2dcdfe4a54c0e81f4 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QCamera capture documentation fixesDmytro Poplavskiy2012-03-121-0/+10
| | | | | | | Added documentation for camera capture queue behavior. Change-Id: I4989f94c5de0edb3ac99135dcb3e11d76195a880 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove unimplemented BG playback feature.Michael Goddard2012-03-054-244/+0
| | | | | | | Prototype that wasn't implemented should be removed for 5.0. Change-Id: I3b90658ad8dc0b64003a5bb741fc3c93c7d87dff Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Expose availability from the backend to C++ and QML.Michael Goddard2012-03-0211-14/+246
| | | | | | | | | | | | | | The availabilityError property was static based on the service, but it can change at run time, so add the plumbing to allow the backend to report it itself. Also make sure that both QML and C++ expose the availability. The radio tuner and data controls previously had properties (but no signals) for availability - these have been removed. Change-Id: I9240cf93e2a51b14cd38642f9312ae3c75f05361 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Remove the usage of deprecated qdoc macros.Casper van Donderen2012-03-0213-253/+253
| | | | | | | | | | QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: Iec1c616e0d9a915a31a661916805916e19495dc9 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Expose the audio and video encoding modes through QML as well.Michael Goddard2012-02-292-0/+93
| | | | | | | They were missing. Change-Id: I0bb08c5e4721c27d2dcec818c0ee33f42c8df959 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Docs: fix qml links and standalone build for MultimediaPeter Yard2012-02-2213-259/+273
| | | | | Change-Id: Ia3f1e49aef203911bb5cf1ee062c9100be213b38 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add the hasAudio/hasVideo properties from MediaPlayer to Video.Michael Goddard2012-02-172-0/+16
| | | | | | Change-Id: I167184c3622c4fcb0843b17f2ab803b0bbf104fa Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add Video_4.qml to the packaging.Michael Goddard2012-02-171-1/+1
| | | | | | Change-Id: I0a6036a979ab00a2885c56450d1db9497b1cff0c Reviewed-by: Angus Cummings <angus.cummings@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Tweak some more documentation.Michael Goddard2012-02-147-143/+106
| | | | | | | | | | | A lot of the previous Qt Mobility API methods were still present, so they are gone now. Also removed some of the C++ documentation since it's not public API anyway. Made a group for camera QML APIs and used that for the list in the camera overview documentation. Change-Id: I0864bd2230a42596e951b68d0df1211766c90dfc Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Documentation updates for declarative camera elements.Michael Goddard2012-02-137-38/+358
| | | | | | | A number of things were missing. Change-Id: Ic4eb2e88804b519478eeae733cc5f473b717270d Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Added loading of video node factories from pluginsJonas Rabbe2012-02-089-204/+30
| | | | | | | | | | | | | | | This change will allow us to add new video node factories that can be loaded dynamically at runtime. The previous video node factories, I420 and RGB have been kept as static parts of the Qt Multimedia imports, but can be moved to plugins at a later date. For plugins to be able to find and use QSGVideoNode, the class has to be exported. Change-Id: Idbead9a8ad33619cebe90fcec92eb29cf52ae9bd Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 15:15:49 +0000