summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-30492-498/+498
| | | | | | | | | | 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>
* Moved zoom related properties out of QCameraFocusControlDmytro Poplavskiy2012-01-276-110/+383
| | | | | Change-Id: I16f9b80ebbacc0b325530e81c291dc030763b65e Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add a viewfinder resolution control for camera.Michael Goddard2012-01-273-0/+187
| | | | | | | For attempting to set the resolution. Change-Id: I9f3b189b90fee95bf6430e9a74a6599ebcc38697 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@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>
* Add a volume (gain) property to QAudioInput.Michael Goddard2012-01-255-0/+138
| | | | | | | | Only implemented for PulseAudio so far, but the API does explain that it's optional. Change-Id: I4543a1c81d810fe92bb08f1ed13f3a3534a371e4 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* QCameraExposure API refactoringDmytro Poplavskiy2012-01-255-180/+184
| | | | | | | | | | | | | 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>
* Fix some static analysis defects.Michael Goddard2012-01-256-11/+21
| | | | | | | | | A few silly errors, a few unlikely errors, a few changes that should not have resulted in a problem but makes the code clearer. Change-Id: Id2c82e9317d53822e4da13c94dec9595ea33b07a Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Add a feedback control for Camera.Michael Goddard2012-01-253-0/+287
| | | | | | | To control capture sounds etc. Change-Id: I4db63587be9c74f78c93081d9d46477e34f4a042 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Fix header changes for wmfLing Hu2012-01-243-3/+3
| | | | | Change-Id: I9d06dd9a39f26851589b1c1f259db8de2ee992a0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Removed QMediaServiceProvider parameter from media objects constructors.Dmytro Poplavskiy2012-01-2415-45/+35
| | | | | | | | | | | | | 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>
* Disable wmf for nowLing Hu2012-01-241-1/+1
| | | | | Change-Id: I4d28741a6546dfafc5c60c7ccdc34d814276b518 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Disabled CameraBin2 based camera backend.Dmytro Poplavskiy2012-01-231-3/+4
| | | | | | | It's not currently tested enough to be enabled. Change-Id: I3c8eb7a81af982b6c98b733755d19c78f2f1c5ed Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Implement QAudioDeviceInfo operator==/!=Michael Goddard2012-01-232-1/+28
| | | | | | | | | | | | | Compares some of the useful parts, but perhaps should be made more tolerant. Also refactored the auto test to properly skip if there are no (output) devices, rather than manually skip. Task-number: QTBUG-13723 Change-Id: I3b83f87a440a83f4237fa119a23009bc99e7626a Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Removed camera simulator backend.Dmytro Poplavskiy2012-01-2325-2963/+0
| | | | | | | It's not used on any Qt5 platform. Change-Id: Ia5a97523c84fe273a265355cc51a1cfa68701085 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-23508-508/+508
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: Ie8cd560b6d9a2c6e552b6be1ad8bc96c80a6535c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update documentation.Michael Goddard2012-01-231-0/+2
| | | | | | | | | | | | Rewrite the module overview, add video and audio overviews, and update the camera overview. Tweak the radiooverview slightly. Still missing some links for examples and some fleshing out but hopefully a lot better. Change-Id: Id6486e20ba4a09c36d7739e327d4f9910ad083a5 Reviewed-by: Jonas Rabbe <jonas.rabbe@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-2039-858/+673
| | | | | | | | 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-198-12/+12
| | | | | | | | Since it seems it was never implemented, don't keep the legacy spelling. Change-Id: Idc918548a4ed643ba7da35e97ce08f401e74303f Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* QAudioRecorder: fixed handling the missing inputs control.Dmytro Poplavskiy2012-01-191-1/+5
| | | | | | | | Added check for null audioEndpointSelector control in QAudioRecorder::audioInputs() Change-Id: I506dcea9e8d3a468319acf2489cd4d803a5c187d Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Replaced QAudioCaptureSource with QAudioRecorder.Dmytro Poplavskiy2012-01-197-334/+379
| | | | | | | | | | QAudioCaptureSource name is confusing, it's essentially an audio recording service but it's not evident from API. QAudioRecorder replaces QAudioCaptureSource+QMediaRecorder combination. Change-Id: I0082d766fc0d1b8d5ecbfc527f13e715add730c8 Reviewed-by: Michael Goddard <michael.goddard@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 compile of quicktime pluginRohan McGovern2012-01-1817-56/+42
| | | | | | | | | | | | | This code was including the qmacdefines_mac.h header from QtWidgets, which has recently been removed. Using the header is no longer necessary. Note that the qmacdefines_mac.h contained a workaround for some mac system headers declaring variables named `slots'. Replace that workaround with the standard no_keywords method. Change-Id: Icd47a562d64953692e50a9fea8bb4a9c8424375c Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Use relative instead of absolute SUBDIRS, as usual.Rohan McGovern2012-01-181-4/+4
| | | | | | | | | | There doesn't seem to be any reason for using the full path to subdirs here. Using the full path is unconventional, and it causes the makefile targets to be named after the full path to the subdir, which is unnecessarily long and also unpredictable. Change-Id: I88361b50a4814b5b063f6d84bc68ff6955af1960 Reviewed-by: Michael Goddard <michael.goddard@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-1713-25/+138
| | | | | | | | | | - 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-1777-63/+193
| | | | | | | | | | | | | * 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-1718-67/+72
| | | | | | | | | 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-1681-1319/+0
| | | | | | | They aren't useful in the case of QtMultimedia{Kit} Change-Id: If1b0b6625763c85907fb05beb9c440046472ddef Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Remove out-of-line uses of qMalloc/qFree/qRealloc.Robin Burchell2012-01-152-8/+8
| | | | | | | | | | Per http://codereview.qt-project.org/#change,11562, we are trying to remove these in favour of direct allocation, or (in the case of inline code) specialised out-of-line wrappers. Change-Id: If3fb6c4851633bdbb2b2771de0180c668bb01d14 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix build for the camera support of QtMultimedia GStreamer plugin.Alexis Menard2012-01-142-17/+1
| | | | | | | | | Include the correct header file (it was renamed) and also remove duplicate declaration. Change-Id: I2683851e9fd0978427273c4739f47b54e1af743b Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add a metaData property to QVideoFrame.Michael Goddard2012-01-132-4/+55
| | | | | Change-Id: I6614cd86e3e1e170277bfc751222b5b42cb657eb Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Polish the video documentation a bit.Michael Goddard2012-01-136-55/+127
| | | | | | Change-Id: I7f76f710b64379ae6935cd86aed37914a7f85d0b Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Added overview documentation for the radioJonas Rabbe2012-01-124-0/+7
| | | | | Change-Id: I71b072512db51f23b0aed82545b504f9efc824d0 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Update year in Nokia copyright headers.Jason McDonald2012-01-12438-438/+438
| | | | | | | Update headers from before 2011 that were missed in the previous commit. Change-Id: Ib0fd91a39ffc57117fe01280e34519c3f914fac0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Improve the QCameraFocus and QCameraImageProcessing documentation.Michael Goddard2012-01-113-31/+193
| | | | | | | Also adds documentation for QCameraFocusZone. Change-Id: I805806e9a683244b0c03553e00bebb41e6767ff1 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Updated QtMultimedia declarative module to version 5.0Jonas Rabbe2012-01-1111-23/+48
| | | | | | | | | | | | 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>
* Remove widgets config test.Michael Goddard2012-01-119-13/+13
| | | | | | | | | Since it's not guaranteed that other Qt modules will be built by the time qmake is run (and config.tests are created) we can't rely on compilation. Just check the module.pri variable for widgets instead. Change-Id: I352cf6427b748b89b69ec17588ce0dd83065090f Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fix for QSoundEffect crash bugMithra Pattison2012-01-061-1/+2
| | | | | | | | | | | | When multiple QSoundEffect instances play the same wav source file simultaneously, the system would crash due to some instances not waiting for the underlying pulse audio stream to complete its setup logic. QSoundEffect now waits for the stream to attain the correct state before playing the sound. Change-Id: Ib5a1e6bc3f1cc314054f9cdc89c10100ad546721 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add the spot for spot metering mode.Michael Goddard2012-01-069-2/+106
| | | | | | | 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-0636-123/+160
| | | | | | | | | | | | | | | 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-0667-67/+67
| | | | | Change-Id: Ib82c1be5548443ef1f5e97b3d5641a2f55d212af Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QtMultimedia: Fix compiler warnings.Friedemann Kleint2012-01-057-9/+9
| | | | | | | | | | | - 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>
* Restructure the source code a little.Michael Goddard2012-01-05122-164/+193
| | | | | Change-Id: I995b0fb33bdda7f01bf6266c1c50a1b17eba6760 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* add Q_OBJECT to QMediaGaplessPlaybackControlLing Hu2012-01-041-0/+1
| | | | | Change-Id: I010b14f7900bd168012bb876f708397eec4dfa4b Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add new gapless playback control interfaceLing Hu2012-01-043-3/+250
| | | | | | Change-Id: If14c20af6da81dd65177102c9b955e3ebd40c722 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 16:43:50 +0000