summaryrefslogtreecommitdiffstats
path: root/src/plugins/android/src/mediacapture
Commit message (Expand)AuthorAgeFilesLines
* Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-2548-1003/+1003
* Update commercial license headersTarja Sundqvist2021-01-2748-1003/+1003
* Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-203-4/+17
|\
| * Android: Remove usage of qt_androidRequestPermissionVal Doroshchuk2019-11-151-1/+1
| * Android: Don't close camera when recording permission is askedVal Doroshchuk2019-11-153-3/+16
* | Introduce QVideoFrame::image()VaL Doroshchuk2019-10-311-2/+1
|/
* Android: Allow starting camera without viewfinder availableVal Doroshchuk2019-05-131-11/+32
* Android: Don't postpone setting of camera's stateVal Doroshchuk2019-05-032-19/+23
* Android: Fix status of QMediaRecorder after start/stopVal Doroshchuk2019-04-032-45/+35
* Android: Use CaptureStillImage as default capture modeVal Doroshchuk2019-03-281-1/+1
* Replace deprecated qSort() by std::sort()Friedemann Kleint2018-02-281-2/+4
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-201-3/+7
|\
| * Fix crash when an app is sent to background while capturing an imageVal Doroshchuk2017-11-101-3/+7
* | Replace Q_NULLPTR with nullptrKevin Funk2017-09-271-2/+2
* | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-2217-85/+85
|/
* Android: Run-time permission checks for cameraChristian Strømme2017-04-231-1/+1
* Android: Fix camera preview orientationChristian Strømme2017-04-201-0/+6
* Android: Add run-time permission check for recordingChristian Strømme2017-03-301-0/+9
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-131-0/+6
|\
| * Android: restart preview when image capture failsYoann Lopes2016-08-121-0/+3
| * Android: don't process capture previews when capture is canceledYoann Lopes2016-08-121-0/+3
* | Replaced old license headers with new and correct onesJani Heikkinen2016-08-122-26/+38
* | Merge remote-tracking branch 'origin/5.6' into 5.7Yoann Lopes2016-08-011-2/+13
|\ \ | |/
| * Android camera: use closest viewfinder resolutionAnatoly Stolbov2016-07-271-2/+13
* | Implement QCameraViewfinderSettingsControl2 interface for AndroidRuslan Baratov2016-06-028-45/+371
* | Updated license headersAntti Kokko2016-01-1946-646/+922
* | Merge remote-tracking branch 'origin/5.6' into devChristian Strømme2016-01-158-101/+483
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.5' into 5.6Christian Strømme2016-01-121-2/+7
| |\
| | * Android: Don't call restartViewfinder() for audio only recordings.Christian Strømme2016-01-111-2/+7
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-072-0/+31
| |\ \ | | |/
| | * Android: check for exceptions in some camera operations.Yoann Lopes2015-12-032-0/+31
| * | Android: fix QMediaRecorder crashing the camera server on some devices.Yoann Lopes2015-12-042-1/+27
| * | Android: support non OpenGL video surfaces for the camera.Yoann Lopes2015-12-047-98/+418
* | | Replace foreach with range-based forAnton Kudryavtsev2016-01-151-1/+1
|/ /
* | Add private API for conversion from QVideoFrame to QImage.Yoann Lopes2015-10-201-5/+6
|/
* Android: minor refactor of the camera frame callback.Yoann Lopes2015-08-202-44/+45
* Android: fix video probes when recording the camera.Yoann Lopes2015-08-201-1/+6
* Android: fix setting the camera preview resolution.Yoann Lopes2015-05-273-27/+18
* Merge remote-tracking branch 'origin/5.4' into 5.5Yoann Lopes2015-05-052-17/+13
|\
| * Android: Don't delete the media recorder object twice.Christian Strømme2015-04-302-17/+13
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-131-9/+14
|\ \ | |/
| * Android: fix adjusting camera viewfinder resolution.Yoann Lopes2015-02-111-9/+14
* | Update copyright headersAntti Kokko2015-02-1244-308/+308
* | Add additional exposure modes to QCameraExposure.Andrew den Exter2014-11-281-0/+50
|/
* Update license headers and add new license filesAntti Kokko2014-08-2444-830/+478
* Android: Make sure we check and clear exceptions from the camera.Christian Strømme2014-07-141-3/+4
* Android: fix setting camera parameters from QML.Yoann Lopes2014-07-108-136/+189
* Android: fix crash when stopping the camera while a recording is activeYoann Lopes2014-06-301-1/+2
* Android: fix registering recorded videos with the Android media scannerYoann Lopes2014-06-301-1/+1
* Android: correctly update camera focus zones.Yoann Lopes2014-06-301-15/+14