summaryrefslogtreecommitdiffstats
path: root/src/plugins/android
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-03-171-2/+2
|\|
| * Android: fix some MediaPlayer signals not being emitted on first load.Yoann Lopes2015-03-041-2/+2
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-132-10/+15
|\|
| * Android: fix adjusting camera viewfinder resolution.Yoann Lopes2015-02-111-9/+14
| * Encode urls passed to media player properlyJoni Poikelin2015-02-101-1/+1
* | Update copyright headersAntti Kokko2015-02-1279-553/+553
* | Add video filtering support to VideoOutputLaszlo Agocs2015-02-032-2/+3
* | Add additional exposure modes to QCameraExposure.Andrew den Exter2014-11-281-0/+50
|/
* Fix bogus videonode plugin handlingv5.4.0-rc1Laszlo Agocs2014-11-181-1/+1
* Android: Use the new findClass() method.Christian Strømme2014-10-174-73/+60
* Android: fix some problems with the media player.Yoann Lopes2014-09-263-82/+69
* Android: fix QMediaPlayer's state and mediaStatus signals.Yoann Lopes2014-09-242-3/+53
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-017-47/+113
|\
| * Android: fix retrieving metadata from assets, qrc and remote files.Yoann Lopes2014-08-257-47/+113
* | Update license headers and add new license filesAntti Kokko2014-08-2479-1615/+983
|/
* Android: Make sure we check and clear exceptions from the camera.Christian Strømme2014-07-143-36/+59
* Android: fix setting camera parameters from QML.Yoann Lopes2014-07-108-136/+189