summaryrefslogtreecommitdiffstats
path: root/src/plugins/android/src/mediacapture
Commit message (Expand)AuthorAgeFilesLines
* 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
* Android: don't start camera preview until the viewfinder is ready.Yoann Lopes2014-06-052-12/+26
* Android: Don't expose java calls in the control classes.Christian Strømme2014-06-043-60/+19
* Android: Rename the wrapper classesChristian Strømme2014-06-0412-78/+77
* Android: Fix namespace usage.Christian Strømme2014-05-123-0/+10
* Moved QMediaStorageLocation out of the Android plugin.Yoann Lopes2014-05-097-218/+23
* Android: Release the surface texture when not in useChristian Strømme2014-04-121-2/+8
* Android: restart camera viewfinder after a recorder error.Yoann Lopes2014-03-172-9/+15
* Android: correctly report QMediaRecorder actual output location.Yoann Lopes2014-03-172-6/+5
* Android: correctly report QMediaRecorder status.Yoann Lopes2014-03-172-33/+47
* Android: implement QCameraInfoControl.Yoann Lopes2014-02-2810-137/+236
* New QCameraInfo class.Yoann Lopes2014-02-282-0/+15
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-121-6/+11
|\
| * Android: add missing information in frames retrieved with QVideoProbe.Yoann Lopes2014-01-301-6/+11
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/stagi...Yoann Lopes2014-01-301-7/+36
|\|
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-01-221-7/+36
| |\
| | * Android: fixes custom camera focus point.Yoann Lopes2014-01-201-7/+36
* | | Android: fix crash in QAndroidCaptureSession.Yoann Lopes2014-01-291-1/+3
|/ /
* / Use QStringRef instead of QString whenever possible.Jędrzej Nowacki2014-01-151-1/+1
|/
* Android: QVideoProbe support for cameraDenis Kormalev2014-01-086-10/+207
* Android: camera moved to a dedicated threadDenis Kormalev2013-12-232-13/+31
* Android: fix camera previewDenis Kormalev2013-12-112-14/+7
* Android: fix camera viewfinder orientation.Yoann Lopes2013-12-052-6/+34
* Android: use correct format when capturing a picture to a buffer.Yoann Lopes2013-11-062-10/+40
* Android: fix camera preview showing black frames after restarting it.Yoann Lopes2013-10-292-1/+9