summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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>
* Fix up a few doc issuesMichael Goddard2012-01-1712-9/+37
| | | | | | | | | | | | | * lingering references to Mobility * missing group tags on some classes meant they went missing * put classes into functional groups as well (e.g. audio, camera) * added some of the qdoc files to OTHER_FILES so they show up in Creator There are still a lot of warnings since it seems like qdoc is not processing the controls directory. Change-Id: I036f8826ae63f8273b3e649cb32c091d964ce830 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Changed QCamera::captureMode property to QFlagsDmytro Poplavskiy2012-01-172-8/+9
| | | | | | | | | This enables the expression of extra camera modes like viewfinder only or capture during video recording. Change-Id: Ie02fdeef5eb7fd6fc2f133c1afb0141e37c22b06 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Remove antiquated \since lines in docs.Michael Goddard2012-01-167-7/+0
| | | | | | | They aren't useful in the case of QtMultimedia{Kit} Change-Id: If1b0b6625763c85907fb05beb9c440046472ddef Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Added overview documentation for the radioJonas Rabbe2012-01-122-0/+4
| | | | | Change-Id: I71b072512db51f23b0aed82545b504f9efc824d0 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Update year in Nokia copyright headers.Jason McDonald2012-01-1213-13/+13
| | | | | | | Update headers from before 2011 that were missed in the previous commit. Change-Id: Ib0fd91a39ffc57117fe01280e34519c3f914fac0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated QtMultimedia declarative module to version 5.0Jonas Rabbe2012-01-1110-22/+47
| | | | | | | | | | | | The QtMultimedia module should have version 5.0 to align with Qt 5 in general. This change updates the version, but keeps 4.0 versions of the elements for compatability purposes. Documentation and examples has also been updated to reflect this version change. Change-Id: Ica10c1a5ecc2c7233192a65e04ff77eb33a77e30 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added documentation for the Radio and RadioData QML elements.Jonas Rabbe2012-01-112-0/+422
| | | | | Change-Id: I60c98b23138664543a1738ae93043432f66c8ab8 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add the spot for spot metering mode.Michael Goddard2012-01-063-0/+53
| | | | | | | Not yet fully documented in QML - needs a bit of an overhaul first. Change-Id: Ic11684858fb872d0b4dcedf60b390571371db252 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Properly handle the case where QtWidgets is not available.Michael Goddard2012-01-063-3/+3
| | | | | | | | | | | | | | | It does use a config test for now, just to make it clearer. The Mac backend currently requires widgets, but most of the others should work without it (just not supporting QVideoWidget/WindowControl). The QVideoDeviceControl interface was modified to remove the QIcon usage - it was never implemented. Unfortunately even the QML examples need widgets for the wrapper application, and will need to be ported to QtGui based wrapper. Change-Id: I8a55ad5cf09ab51749510bf16f49de0bd3f0bcdb Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-0626-26/+26
| | | | | Change-Id: Ib82c1be5548443ef1f5e97b3d5641a2f55d212af Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QtMultimedia: Fix compiler warnings.Friedemann Kleint2012-01-055-7/+7
| | | | | | | | | | | - Fix deprecated QDeclarative includes. - Comment out unused parameter. - Remove trailing comma from enumeration value (Clang) Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Change-Id: I31d54a12505f4e3a48eb4b7736a48d5dacc2c0d9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Adding hasAudio and hasVideo properties to QML MediaPlayerMithra Pattison2011-12-292-0/+37
| | | | | | | | | | Adding hasAudio and hasVideo to MediaPlayer QML object to allow users to determine whether the current media has audio and/or video streams. Also adding notifies for when these properties change. Change-Id: Ife7606e148f0c0ad558b4019c68c70973c199c08 Reviewed-by: Sergey Dubitskiy Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added Video.qml to QtMultimedia, Video componentAngus Cummings2011-12-233-1/+109
| | | | | Change-Id: I0f5707a7cae931988aaddced23ad157105d0643b Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove the module prefix from a number of includes.Michael Goddard2011-12-095-7/+7
| | | | | | | Since I get build failures due to other changes in lower modules. Change-Id: Iac6a814071c019de25db52daf941185337fad14a Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Registered CameraFlash qml typeDmytro Poplavskiy2011-12-081-0/+2
| | | | | Change-Id: I0d05006dcfd690b2246bc0ccfea468168b207333 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QtMultimedia: Fix warnings about declarative/quick.Friedemann Kleint2011-12-056-8/+8
| | | | | Change-Id: Ic9323b222641e41dae05cb4b0dccb6531e845676 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Implemented QDeclarativeCameraCapture::setMetadataDmytro Poplavskiy2011-12-012-3/+9
| | | | | | | QMetaDataWriterControl is used if it's available. Change-Id: I18fd36c411b6d3c397ff22ebfea9b2c0e878cdeb Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Add orientation support to VideoOutput.Michael Goddard2011-11-254-11/+126
| | | | | | | | | Just uses an integer to represent the degrees rotation from standard. Only supports multiples of 90 - other rotation can be done with standard QML. Change-Id: Id4013169c5d9da473b6e5be94ba341da21c2f2a3 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Updated I420 video node to be consistent with RGB node implementation.Dmytro Poplavskiy2011-11-242-94/+120
| | | | | | | | | | Don't keep the frame after it was uploaded to texture; Upload frame data during rendering (in material shader updateState) instead of updatePaintNode(). Change-Id: Ia6a4063bfa02d4d20f75735649fe4f777cf50494 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* VideoOutput: release video frames when the video surface is stopped.Dmytro Poplavskiy2011-11-223-0/+24
| | | | | | | | It's necessary to release video frames during media pipeline shutdown or reconfiguration. Change-Id: I386ad4d173b8731f257ec9272ef8c46a27769bd0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed qtmultimedia imports -qtnamespace issues.Toby Tomkins2011-11-214-0/+12
| | | | | Change-Id: Ie7896faf92b3cc5fdf2b6dbe885913c2669e6e36 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 23:24:01 +0000