summaryrefslogtreecommitdiffstats
path: root/src/plugins/android
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-137-63/+105
|\
| * Android: Fix texture leak in QAndroidTextureVideoOutputChristian Strømme2016-08-124-55/+51
| * Android: fix freeze when taking pictures on some devicesYoann Lopes2016-08-122-1/+11
| * 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
| * Android: fix imageCaptured() signalYoann Lopes2016-08-122-7/+37
* | 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-016-22/+62
|\|
| * Android camera: use closest viewfinder resolutionAnatoly Stolbov2016-07-271-2/+13
| * Make sure JNI_OnLoad is not called more than onceBogDan Vatra2016-07-201-0/+5
| * Android: Fix OpenGL texture name leakPavel Golikov2016-07-061-1/+7
| * Android: Fix attach- and detachFromGLContext()Christian Strømme2016-07-053-19/+37
* | This module doesn't need an Activity to work, a Context object is enoughBogDan Vatra2016-07-261-6/+5
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-302-1/+4
|\|
| * Android: Fix crash in AndroidCamere::open()Christian Strømme2016-06-031-1/+0
| * Android: flush the current video frame when the video output is reset.Yoann Lopes2016-06-031-0/+4
* | Implement QCameraViewfinderSettingsControl2 interface for AndroidRuslan Baratov2016-06-0210-45/+519
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-104-13/+63
|\|
| * Android: improve texture rendering on API level >= 16.Yoann Lopes2016-05-104-13/+57
| * Android: detect more error cases when rendering frames to textures.Yoann Lopes2016-05-091-0/+3
| * Android: correctly use mutex for texture rendering.Yoann Lopes2016-05-091-0/+3
* | Remove the traces of the discontinued android-no-sdk platformv5.7.0-beta1Eirik Aavitsland2016-04-122-3/+1
* | Android: Use the new QtAndroidPrivate::runOnAndroidThreadSyncBogDan Vatra2016-04-062-47/+27
* | Android: Use default API version (16)BogDan Vatra2016-03-171-1/+0
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-072-9/+11
|\|
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-252-9/+11
* | Updated license headersAntti Kokko2016-01-1985-1192/+1702
* | Merge remote-tracking branch 'origin/5.6' into devChristian Strømme2016-01-1538-402/+1544
|\|
| * 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
| * | Android: Media player improvments.Christian Strømme2016-01-081-27/+39
| * | Android: Call release() in AndroidMediaMetadataRetriever's destructor.Christian Strømme2016-01-073-3/+2
| * | Android: Make the meta-data reader asyncChristian Strømme2016-01-073-91/+128
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-074-2/+61
| |\|
| | * Android: check for exceptions in some camera operations.Yoann Lopes2015-12-034-2/+61
| * | Android: fix QMediaRecorder crashing the camera server on some devices.Yoann Lopes2015-12-048-12/+89
| * | Android: support non OpenGL video surfaces for the camera.Yoann Lopes2015-12-0428-233/+1179
| * | Android: Camera updatesChristian Strømme2015-12-041-35/+42
* | | Replace foreach with range-based forAnton Kudryavtsev2016-01-151-1/+1
|/ /
* | Add private API for conversion from QVideoFrame to QImage.Yoann Lopes2015-10-203-565/+6
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-021-8/+39
|\|
| * Android: allow to map video buffers.Yoann Lopes2015-09-081-8/+39
* | Merge remote-tracking branch 'origin/5.5' into 5.6Yoann Lopes2015-08-246-124/+140
|\|
| * Android: minor refactor of the camera frame callback.Yoann Lopes2015-08-205-123/+121
| * Android: fix video probes when recording the camera.Yoann Lopes2015-08-203-12/+30
* | Prospective fix for building QtMultimedia on Android against installed QtBaseSimon Hausmann2015-07-231-1/+1
|/
* Android: fix setting the camera preview resolution.Yoann Lopes2015-05-274-27/+21
* 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
* | QMediaPlayer: handle resource files in a cross-platform way.Yoann Lopes2015-04-077-34/+16