summaryrefslogtreecommitdiffstats
path: root/src/plugins/android
Commit message (Expand)AuthorAgeFilesLines
* Android: implement QMediaPlayer::setPlaybackRate()Yoann Lopes2018-09-265-3/+110
* Android: Fix crash when play() is called but state is not setVal Doroshchuk2018-09-241-1/+3
* Android: Fix the player state when play() is called with no mediaVal Doroshchuk2018-08-161-2/+1
* Replace deprecated qSort() by std::sort()Friedemann Kleint2018-02-281-2/+4
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-061-1/+0
|\
| * Revert "Android: Set the correct scan line for the video surface format"v5.10.0-rc3v5.10.0-rc2v5.10.0Christian Stromme2017-11-281-1/+0
* | 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
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-271-0/+1
|\|
| * Android: Set the correct scan line for the video surface formatChristian Strømme2017-10-231-0/+1
* | Replace Q_NULLPTR with nullptrKevin Funk2017-09-271-2/+2
* | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-2223-133/+133
* | Android: remove support for local/debug deploymentJake Petroules2017-09-064-26/+20
|/
* Android: Fix crash caused by stale video-frame objectsChristian Strømme2017-04-272-18/+36
* Android: Run-time permission checks for cameraChristian Strømme2017-04-233-1/+16
* Android: Fix camera preview orientationChristian Strømme2017-04-203-0/+19
* Android: Add run-time permission check for recordingChristian Strømme2017-03-303-0/+16
* Android: Add convenience method for checking and requesting permissionsChristian Strømme2017-03-222-0/+31
* Android: Add logging categoryChristian Strømme2017-03-223-2/+57
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-262-8/+8
|\
| * Merge remote-tracking branch 'origin/5.7.1' into 5.7Liang Qi2016-11-242-8/+8
| |\
| | * Pass the context to QtAndroidMediaPlayerBogDan Vatra2016-09-282-8/+8
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-112-3/+4
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-042-3/+4
| |\ \ | | |/ | |/|
| | * Mark AndroidCameraInfo as movableChristian Strømme2016-11-011-0/+1
| | * Android: emit mediaStatus changes before state changesYoann Lopes2016-10-281-3/+3
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-179-89/+143
|\| |
| * | 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.7' into devLiang Qi2016-08-027-28/+67
|\| |
| * | 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.7' into devEdward Welbourne2016-07-212-1/+4
|\| |
| * | 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
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-1110-45/+519
|\| |
| * | Implement QCameraViewfinderSettingsControl2 interface for AndroidRuslan Baratov2016-06-0210-45/+519
* | | Android: fix media player volume.Yoann Lopes2016-06-091-12/+1
|/ /
* | 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