summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update copyright headersAntti Kokko2015-02-121259-9791/+9079
* Camera zoom control - version for the AVFoundation pluginTimur Pocheptsov2015-02-055-1/+294
* AVFCameraExposureControl - exposure control for iOSTimur Pocheptsov2015-02-055-2/+756
* AVFCameraFocusControl - focus control for iOS / OS XTimur Pocheptsov2015-02-056-3/+474
* Camera: update viewfinder settings on Loaded status.Yoann Lopes2015-02-041-1/+3
* iOS video frame render implementation.James Turner2015-02-048-61/+575
* Add video filtering support to VideoOutputLaszlo Agocs2015-02-0333-70/+1541
* Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devYoann Lopes2015-01-2316-358/+119
|\
| * Merge remote-tracking branch 'origin/5.4' into devYoann Lopes2015-01-1916-358/+119
| |\
| | * Bump versionOswald Buddenhagen2015-01-161-1/+1
| | * Add resolution and fps on mfw_v4lsrcLaszlo Agocs2015-01-123-5/+63
| | * Migrate to categorized logging in Quick 2 video outputLaszlo Agocs2015-01-092-23/+15
| | * Support byte ordered QImage formats in pixelFormatFromImageFormatLaszlo Agocs2015-01-091-0/+3
| | * Support YUV420P in the i.MX6 video nodeLaszlo Agocs2015-01-061-0/+1
| | * Fix: static linking on Linux with both PulseAudio and Alsa pluginsGabriel Hege2014-12-228-38/+38
| | * remove unnecessary LICENSE.GPLv2Jani Heikkinen2014-12-221-292/+0
* | | Fix initialization orderLaszlo Agocs2015-01-191-1/+1
|/ /
* | Rename camera classes to avoid name clash.James Turner2015-01-159-56/+59
* | New camera viewfinder settings API.Yoann Lopes2015-01-1320-43/+1171
* | AVFImageCaptureControl - invalid connectionTimur Pocheptsov2015-01-081-17/+8
* | Add missing includes for QDataStream/QIODevice.Friedemann Kleint2015-01-0710-0/+11
* | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2014-12-2912-25/+223
|\ \
| * | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-1712-25/+223
| |\|
| | * Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-12-171-0/+111
| | |\
| | | * Added 5.4.0 change file.v5.4.0Yoann Lopes2014-12-031-0/+111
| | * | Bump versionOswald Buddenhagen2014-12-121-1/+1
| | * | winrt: Add missing QAbstractVideoSurface::stop() call.Andrew Knight2014-12-111-2/+4
| | * | winrt: Fix encoding propertiesAndrew Knight2014-12-111-4/+17
| | * | winrt: Fix camera auto rotationAndrew Knight2014-12-114-0/+26
| | * | Make it compile with no-openglLaszlo Agocs2014-12-111-0/+4
| | * | Remove private API use from video orientation handlerAndrew Knight2014-12-111-3/+1
| | * | GStreamer: better camera device name logic.Yoann Lopes2014-12-091-0/+2
| | * | OpenSL ES: volume support for QAudioInput.Yoann Lopes2014-12-032-5/+17
| | * | Fix VideoOutput autoOrientation when switching cameras.Yoann Lopes2014-12-032-11/+41
* | | | Fix some typos in strings.Dmitry Shachnev2014-12-253-9/+9
|/ / /
* | | Disable warning about QObject::event being hiddenThiago Macieira2014-12-031-0/+6
* | | Add additional exposure modes to QCameraExposure.Andrew den Exter2014-11-287-9/+172
* | | Add a color filter property to QCameraImageProcessing.Andrew den Exter2014-11-289-7/+212
* | | Add support for face detection focus point mode to camerabin backend.Andrew den Exter2014-11-282-28/+235
* | | Implement exposure and whitebalance lock for gstreamer camera.Andrew den Exter2014-11-284-18/+227
* | | Allow supported camera locks to change after initialization.Andrew den Exter2014-11-283-32/+26
* | | GStreamer: port to 1.0.Yoann Lopes2014-11-2771-1374/+3661
* | | Merge remote-tracking branch 'origin/5.4' into devYoann Lopes2014-11-2712-22/+24
|\| |
| * | Remove unused private membersThiago Macieira2014-11-255-11/+0
| * | Fix Clang warning about comparison of different signsThiago Macieira2014-11-241-1/+1
| * | Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-11-216-10/+23
| |\|
| | * Fix bogus videonode plugin handlingv5.4.0-rc1Laszlo Agocs2014-11-185-9/+22
| | * WinRT: Fix compilation after ANGLE updateMaurice Kalinowski2014-11-171-1/+1
| |/
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-2112-23/+100
|\|
| * Check whether current context can be obtained when deleting textures.Friedemann Kleint2014-11-062-4/+12