summaryrefslogtreecommitdiffstats
path: root/src/plugins/android/src/common
Commit message (Expand)AuthorAgeFilesLines
* Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-255-104/+104
* Update commercial license headersTarja Sundqvist2021-01-275-104/+104
* Android: Remove usage of qt_androidRequestPermissionVal Doroshchuk2019-11-152-3/+8
* Android: Don't close camera when recording permission is askedVal Doroshchuk2019-11-152-0/+6
* Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-11-142-0/+38
|\
| * Android: Fix fetching video frame data from the GUI thread5.13Val Doroshchuk2019-11-122-0/+38
* | Remove usages of deprecated APIsSona Kurazyan2019-08-081-1/+1
|/
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-022-8/+17
|\
| * Android: Fix memory leak of GL resourcesVal Doroshchuk2019-01-312-8/+17
* | Android: Change video frame format from BGR32 to ABGR32Val Doroshchuk2018-10-031-1/+1
|/
* 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-10-271-0/+1
|\|
| * Android: Set the correct scan line for the video surface formatChristian Strømme2017-10-231-0/+1
* | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-221-7/+7
|/
* Android: Fix crash caused by stale video-frame objectsChristian Strømme2017-04-272-18/+36
* Android: Add convenience method for checking and requesting permissionsChristian Strømme2017-03-222-0/+31
* Android: Add logging categoryChristian Strømme2017-03-222-0/+53
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-132-51/+47
|\
| * Android: Fix texture leak in QAndroidTextureVideoOutputChristian Strømme2016-08-122-51/+47
* | Merge remote-tracking branch 'origin/5.6' into 5.7Yoann Lopes2016-08-011-1/+7
|\|
| * Android: Fix OpenGL texture name leakPavel Golikov2016-07-061-1/+7
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-301-0/+4
|\|
| * Android: flush the current video frame when the video output is reset.Yoann Lopes2016-06-031-0/+4
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-102-13/+44
|\|
| * Android: improve texture rendering on API level >= 16.Yoann Lopes2016-05-102-13/+38
| * 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
* | Updated license headersAntti Kokko2016-01-194-56/+80
|/
* Android: support non OpenGL video surfaces for the camera.Yoann Lopes2015-12-046-156/+150
* Add private API for conversion from QVideoFrame to QImage.Yoann Lopes2015-10-202-560/+0
* Android: allow to map video buffers.Yoann Lopes2015-09-081-8/+39
* Update copyright headersAntti Kokko2015-02-125-35/+35
* Update license headers and add new license filesAntti Kokko2014-08-245-95/+55
* Android: Don't expose java calls in the control classes.Christian Strømme2014-06-043-40/+7
* Android: Rename the wrapper classesChristian Strømme2014-06-042-5/+4
* Android: fix calling start() and stop() on the video surface.Yoann Lopes2014-05-301-1/+1
* Android: Fix QtSurfaceTextureChristian Strømme2014-03-272-9/+10
* Android: Make the Mediaplayer more robustChristian Strømme2014-03-213-14/+28
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-01-222-28/+175
|\
| * Android: fixed video rendering with multiple media players.Yoann Lopes2014-01-202-28/+175
* | Android: optimized NV21 top ARGB32 conversion.Yoann Lopes2014-01-171-15/+550
|/
* Android: fixed image capture preview.Yoann Lopes2013-10-015-10/+27
* Android: refactor video renderer.Yoann Lopes2013-10-013-259/+93
* Android: Adapt the multimedia plugin to new QJNI APIChristian Strømme2013-09-202-3/+3
* Android: added camera support.Yoann Lopes2013-09-126-0/+762