summaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* 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-223-11/+11
| | | | | 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-208-24/+11
| | | | | | | | | | | | | | | | | | | 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-1424-61/+63
| | | | | 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-0221-267/+267
| | | | | | | | | | 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>
* Update audioengine overview doc & reference docLing Hu2012-02-218-89/+89
| | | | | Change-Id: If1061b3dc113f4354d741c536d63cbe36e7a65eb Reviewed-by: Michael Goddard <michael.goddard@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>
* Add some recent things to the overview docs.Michael Goddard2012-02-098-9/+27
| | | | | | | Also clean up a few other doc related bits and pieces. Change-Id: I56714e1811e38a7225131c1d141430b49f5f509c 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>
* API changes to QML element MediaPlayer aka AudioAngus Cummings2012-02-0813-203/+1971
| | | | | | | | | | | | | | | | | | Changed Video.qml for new API Removed lowercase enum copies, replaced with calling parent (VideoOutput, MediaPlayer) enums Removed properties playing, paused Removed signals started, resumed Added readonly property playbackState Added signal playing Added autoPlay property Fixed unit tests for new API Added backwards compatibility for QtMultimedia 4 Change-Id: I27c91cd46d91402b8c4c42bb7d4961ad67909aeb Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Updated declarative camera image processing with C++ API changesDmytro Poplavskiy2012-02-072-41/+42
| | | | | | | | | Changed ranges and meaning of image adjustments parameters. Change-Id: I1710bfabc4f216c83df7983a871bffb474cfbcc2 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Updated declarative camera recorder with C++ API changes.Dmytro Poplavskiy2012-02-072-12/+46
| | | | | | | | | | | Added key,value parameters to metadataChanged() signal; Added a separate actualLocation property to desribe the path of recorded file. It may be different from outputLocation when default location is used. Change-Id: I5a4b77833b6458a19ed7e1dcf7e53fc7400cdf21 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Expose capture request id in the declarative camera.Dmytro Poplavskiy2012-02-072-28/+34
| | | | | | | | It's useful to associate imageCaptured/Saved signals data with capture requests. Change-Id: I3e98c4a194403bd338a1b5313d8736b4baf79961 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Moved QMediaServiceProvider to private header.Dmytro Poplavskiy2012-02-062-2/+2
| | | | | | | It's not intended to be used by applications. Change-Id: I2acc26180ebb5c2419438169827f39aaf4578389 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Documentation tweaks.Michael Goddard2012-02-061-0/+57
| | | | | | | | | Mostly move widgets classes into the QtMultimediaWidgets module, but also mark a few mostly internal playlist classes as \internal. A few other tweaks. Change-Id: If0e376410bf2187cafb24f583108c6beb7b910a9 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Add AudioEngine with new implementationLing Hu2012-02-0629-1/+6140
| | | | | Change-Id: I5eebe662ecbce9814ed3e763db56df9be737d11f Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Removed QFlags from declarative camera properties.Dmytro Poplavskiy2012-02-064-18/+16
| | | | | | | | | It doesn't work, while even without QFlags camera.captureMode = Camera.CaptureVideo + Camera.CaptureStillImage works correctly. Change-Id: I00727ad37cbf33e0c6d557a9da08160d6ea4bdc9 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Changed QCameraFocus::focusMode type to QFlags based FocusModesDmytro Poplavskiy2012-02-021-3/+3
| | | | | | | It was intended to be QFlags based from the start. Change-Id: I0919b3440eb18e84fc596fb894f18a53e5ff1da0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added more encoding settings to declarative camera recorder.Dmytro Poplavskiy2012-02-012-1/+96
| | | | | | Change-Id: If2ec0297a2db5fedaf27c009fb8d55ccf4254c21 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Split QMediaRecorder::setEncodingSettings to separate setters.Dmytro Poplavskiy2012-02-012-13/+4
| | | | | | | | | | It's easier to change only the necessary part of encoding settings. The settings are applied during the next event loop or before recording starts. Change-Id: Ia2b5c93826a302212aa7f79a0c75e4cbaaf1dd7a Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added antennaConnected property to QRadioTuner and radio qml elementJonas Rabbe2012-01-302-0/+15
| | | | | | Change-Id: I5af8487277e0444629c710c6a0a4e890a8d35c6f Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3039-39/+39
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I20e5215108c6ebd5f8474fed5c3665118e4791e6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix some surface assignment errors.Michael Goddard2012-01-271-2/+9
| | | | | | | | On destruction and changing sources, make sure we don't clobber the surface property if it's been changed. Change-Id: I3080b98a547911543a391c8bc040792d260782fd Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Add a rendered and content rectangle properties to VideoOutput QML.Michael Goddard2012-01-272-22/+331
| | | | | | | | | | | | | So you can align controls with an edge of the rendered area. There's also some convenience functions for mapping source to and from destination coordinates. Also tweaked the updateGeometry function to bail out if no input parameters have changed, rather than doing some more boring maths. Added a unit test for a lot of the class, too. Change-Id: I943bb45e4e56356247d5d6deb5d446222edcb7ca Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* QCameraExposure API refactoringDmytro Poplavskiy2012-01-251-6/+4
| | | | | | | | | | | | | QCameraExposureControl: Separated requested from actual exposure values. Removed ParameterFlags, it's confusing and seldom used. Moved ExposureMode and MeteringMode to parameters. QCameraExposure: Added requestedAperture/ShutterSpeed/Iso getters Change-Id: I408586d85e6c9de0c8a711c32b3c90ea46052270 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Removed QMediaServiceProvider parameter from media objects constructors.Dmytro Poplavskiy2012-01-241-0/+1
| | | | | | | | | | | | | QMediaServiceProvider should be removed from the public API, to provide media objects with a custom media service. A protected QMediaPlayer/QCamera/QRadioTuner/etc constructor with QMediaService* parameter is a cleaner and more flexible solution. Change-Id: I335cce4bbebe0e548c3df338f206e7be7c93c3dd Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-2339-39/+39
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: Ie8cd560b6d9a2c6e552b6be1ad8bc96c80a6535c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed mapping video frames in SG nodesDmytro Poplavskiy2012-01-202-36/+32
| | | | | | | | Since it's possible to map video frame in R/O mode multiple times it's always necessary to map it before accessing frame data. Change-Id: I13f58085a0b19dba772e0b75c64d9f07d1ac2a58 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Document two VideoOutput properties.Michael Goddard2012-01-201-0/+17
| | | | | | | Still needs polish. Change-Id: Ida24f1ecd0c8a41e9fd6e34ed68cfe1ed8181c00 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Changed metadata keys type from enum to QString.Dmytro Poplavskiy2012-01-206-170/+166
| | | | | | | | This allows to combine metaData and extendedMetaData and simplify metadata handling on both backend and application sides. Change-Id: I136eedc86c215be3485db101c43069ca7c82101b Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Use US spelling for organization.Michael Goddard2012-01-192-6/+6
| | | | | | | | Since it seems it was never implemented, don't keep the legacy spelling. Change-Id: Idc918548a4ed643ba7da35e97ce08f401e74303f Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add a simple Torch class that wraps the camera flash.Michael Goddard2012-01-194-2/+283
| | | | | | | | Since nearly all programmable torch hardware doubles as camera flash hardware, offer this class here that wraps the QCameraFlashControl. Change-Id: Ib2c061c21c14221d67477d8a3fd89a76fc26ed71 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fixed wrong type for autoLoad property in Video element.Jonas Rabbe2012-01-171-1/+1
| | | | | | Change-Id: I803fc3950fd652cb1c2d547636111cdc23b42939 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added documentation for the convenience Video elementJonas Rabbe2012-01-174-1164/+763
| | | | | | Change-Id: I1963e312c65ec4cc91a54410e86f0606a285086c Reviewed-by: Angus Cummings <angus.cummings@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* More minor doc fixes.Michael Goddard2012-01-172-1/+3
| | | | | | | | | | - Missing enums - Misspelt \fn etc - Missing QSoundEffect C++ docs - A few typos etc Change-Id: I3418e79b5d50a7ab86e54d79676c33d06954bef5 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 04:21:44 +0000