summaryrefslogtreecommitdiffstats
path: root/src/multimedia/camera
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headersAntti Kokko2015-02-1215-105/+105
| | | | | | | | | 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>
* New camera viewfinder settings API.Yoann Lopes2015-01-136-3/+671
| | | | | | | | | | | | | | | | 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>
* Add additional exposure modes to QCameraExposure.Andrew den Exter2014-11-282-0/+20
| | | | | | | | | [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-282-1/+79
| | | | | | | [ChangeLog] New color filter property for QCameraImageProcessing. Change-Id: I999e349e3e4f284b533fa62ba50903fbd21cb400 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Allow supported camera locks to change after initialization.Andrew den Exter2014-11-282-21/+15
| | | | | | | | | A camera backend may not be able to report which locks it supports until after it is loaded, so query support on demand instead of caching the value available at construction time. Change-Id: I56fb1adee980ebc2fa893da3c983a6dce26329c0 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Update license headers and add new license filesAntti Kokko2014-08-2413-244/+140
| | | | | | | | | - 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>
* Use Q_CONSTRUCTOR_FUNCTION macro to register multimedia meta types.Yoann Lopes2014-05-305-58/+33
| | | | | | Task-number: QTBUG-39131 Change-Id: I2493c9e3e6f0065d0441a74ff240d7d91fbe059c Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Fix crash in QCameraInfo when no camera is available on the system.Yoann Lopes2014-03-171-1/+1
| | | | | Change-Id: I04bea9d6afcf567c64788c3765cc6626dc9cd482 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* New QCameraInfo class.Yoann Lopes2014-02-289-115/+700
| | | | | | | | | | | | | | | | | | | | The class allows to get the list of available cameras on the system as well as getting some static information about them such as their unique ID, display name, physical position and sensor orientation. This makes QCamera::availableDevices() and QCamera::deviceDescription() obsolete. This patch contains the API, documentation and auto-tests but not the actual implementation by each backend (except for retrieving the default camera device). [ChangeLog][QtMultimedia] Added new QCameraInfo class [ChangeLog][QtMultimedia] QCamera: availableDevices() and deviceDescription() are deprecated, use QCameraInfo instead Change-Id: I64fd65729ab26a789468979ed5444ee90bb82cd0 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Normalize signal & slot signatures in connectionThiago Macieira2014-02-031-2/+2
| | | | | | | Profiling shows Qt Creator spends 2% of its load time normalizing Change-Id: I1a4bef16be79ced35c47da865153ebe1bee22f9c Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Use the backend to notify the QCamera state changes.Yoann Lopes2013-12-051-9/+1
| | | | | | | | | | We were emitting the stateChanged() signal no matter what was actually done by the backend. QCamera now emits this signal only if the backend actually changed the state. Task-number: QTBUG-35070 Change-Id: I9f32361cd815dbcc366ad30033692f9ae732ec46 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-1910-20/+20
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/doc/qtmultimedia.qdocconf src/plugins/blackberry/mediaplayer/bbmetadata.cpp src/plugins/blackberry/mediaplayer/bbmetadata.h tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
| * Fix lupdate-Warning in qcamera.cpp.Friedemann Kleint2013-02-061-1/+1
| | | | | | | | | | | | | | qcamera.cpp:183: Cannot invoke tr() like this Change-Id: Ia8f29c02bbc4b91c6542d9ed44136094e1e8a2e1 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * Doc: Fixed random QDoc warningsVenugopal Shivashankar2013-01-154-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed \snippet paths - Minor language edits - Removed unnecessary multiple page commands in a single comment block. For example, \fn and \qmlsignal in a single comment block is not allowed. Such instances must be documented in separate comment blocks. Change-Id: I65f4518499e2600c4e1807356d4116c575e48c19 Reviewed-by: Andy Nichols <andy.nichols@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Update copyright year in Digia's license headersSergio Ahumada2013-01-1010-10/+10
| | | | | | | | | | | | Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-285-20/+0
|/ | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Id95d10f5d9c146d9eb496119af6a8b8501ffcb17 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Fix syncqt-warnings.Friedemann Kleint2012-11-195-20/+20
| | | | | | | Use include with module name for the multimedia-classes. Change-Id: I8da1a4015a162959b604cd859aee139e246e3f6c Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Rename namespace QtMultimedia -> QMultimediaSze Howe Koh2012-11-064-9/+9
| | | | | | | | | | | | | | | | Main code, examples, tests and docs updated. Method: 1. Mass find+replace "QtMultimedia::" -> "QMultimedia::" 2. Hand-modified declaration in qtmedianamespace.h/cpp For consistency (with minimal disruption), namespaces with a "Qt" prefix will be renamed. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Remove stale QT_MODULE() usage casesSergio Ahumada2012-10-255-10/+0
| | | | | | | As of Qt5, this macro is defined to be empty; simply get rid of these leftovers. Change-Id: Id24056c0afd013904b1e098dc49e502038fd77a4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2410-240/+240
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Id77334cfb15de096941c88e32d04ca07b4eb4709 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Rename availabilityError to availability.Michael Goddard2012-06-294-9/+9
| | | | | | | It's perhaps clearer in the usual case. Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Rename a few controls.Michael Goddard2012-06-293-5/+5
| | | | | | | | | | The encoder controls could be confused with actual encoding, so make clear they are just settings. Also, the end point selector controls were not named very well. Change-Id: I27f8bf9c865c5f295abad97c01ef98752af42613 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Fixing some doc errors for overviewAngus Cummings2012-06-081-1/+2
| | | | | Change-Id: Ic502abf295d402678bb28e68bfacc76ae05ee8ec Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed typo in QCamera::Status documentationDmytro Poplavskiy2012-05-181-1/+1
| | | | | Change-Id: I8ee9db0e91eceaa20a46713370a9cbd03ead6444 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Very minor C++ doc changesAngus Cummings2012-05-164-14/+14
| | | | | | | | | Reordering some enum's so values are listed ascending Replace 'The' with 'the' in some briefs Change-Id: Ibc5042389687598ddaaf11e72acaa688b85fd4cf Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Added QCamera::UnloadingStatus and StoppingStatus values.Dmytro Poplavskiy2012-05-012-0/+10
| | | | | | | | | | | These statuses are useful when the camera is stopped and/or unloaded asynchronously. Previously the status was changed to LoadedStatus or UnloadedStatus immediately, even while camera was still active. Change-Id: Id11021a150b0d34791ea631d7a62086cc0727220 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Fix a number of doc errors and warnings.Michael Goddard2012-04-111-6/+6
| | | | | | | | | | | * 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-055-9/+27
| | | | | Change-Id: Ib7fd75fb93c038f9e8fa9d71b6ad01fb27b97622 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added VideoLight camera flash mode.Dmytro Poplavskiy2012-03-222-4/+8
| | | | | | | | 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>
* QCamera capture documentation fixesDmytro Poplavskiy2012-03-121-1/+12
| | | | | | | Added documentation for camera capture queue behavior. Change-Id: I4989f94c5de0edb3ac99135dcb3e11d76195a880 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Don't request renderer control if null surface is set as video output.Dmytro Poplavskiy2012-03-121-1/+8
| | | | | | | | | | | | | QCamera and QMediaPlayer are likely to wait for valid surface to be passed to the renderer control before startup, so after player->setVideoOutput(nullSurface) player will not start playback. If the renderer control was already requested before for valid surface it should be released when the null surface is assigned. Change-Id: I3f78f2d82e61fae5f305874874c0ffbc4cb7dc1d Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fix some memory leaks.Michael Goddard2012-03-054-0/+6
| | | | | | | | Adjusted a unit test or two to make leaks easier to find, and then fixed a few leaks. Change-Id: I47a20df8de7cac113d34a2015f76a65ab957dedd Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Expose availability from the backend to C++ and QML.Michael Goddard2012-03-022-13/+2
| | | | | | | | | | | | | | 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>
* Moved QMediaServiceProvider to private header.Dmytro Poplavskiy2012-02-061-1/+1
| | | | | | | It's not intended to be used by applications. Change-Id: I2acc26180ebb5c2419438169827f39aaf4578389 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Changed QCameraFocus::focusMode type to QFlags based FocusModesDmytro Poplavskiy2012-02-022-10/+10
| | | | | | | It was intended to be QFlags based from the start. Change-Id: I0919b3440eb18e84fc596fb894f18a53e5ff1da0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QCameraImageProcessingControl API fixesDmytro Poplavskiy2012-02-022-128/+78
| | | | | | | | | | | | | | | | Moved white balance preset from the separate methods to QCameraImageProcessingControl::ProcessingParameter; Separated absolute contrast/saturation/sharpening/denoising settings with adjustments to backend decided values, with QCameraImageProcessing using adjustments versions. Changed type of parameters from int to qreal with [0..1] range for absolute values and [-1..1] for adjustments. Change-Id: I85c8781c046be6dd45bcf626c25908e1ce5f6bcb Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3010-10/+10
| | | | | | | | | | 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-271-46/+79
| | | | | Change-Id: I16f9b80ebbacc0b325530e81c291dc030763b65e Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QCameraExposure API refactoringDmytro Poplavskiy2012-01-252-71/+118
| | | | | | | | | | | | | 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-242-5/+7
| | | | | | | | | | | | | 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-2310-10/+10
| | | | | | | 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>
* Changed metadata keys type from enum to QString.Dmytro Poplavskiy2012-01-202-16/+0
| | | | | | | | 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>
* More minor doc fixes.Michael Goddard2012-01-172-3/+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-175-5/+10
| | | | | | | | | | | | | * 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-14/+18
| | | | | | | | | 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-165-137/+0
| | | | | | | They aren't useful in the case of QtMultimedia{Kit} Change-Id: If1b0b6625763c85907fb05beb9c440046472ddef Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Update year in Nokia copyright headers.Jason McDonald2012-01-1210-10/+10
| | | | | | | 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>
* Add the spot for spot metering mode.Michael Goddard2012-01-062-0/+30
| | | | | | | Not yet fully documented in QML - needs a bit of an overhaul first. Change-Id: Ic11684858fb872d0b4dcedf60b390571371db252 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 08:08:29 +0000