summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.5' into 5.6Yoann Lopes2015-08-2414-149/+163
|\
| * 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
| * GStreamer: refactored widget and window control.Yoann Lopes2015-08-183-14/+12
| * Fix QCamera viewfinder capabilities functions..Yoann Lopes2015-08-181-1/+3
| * Avoid races when sending EOSRicardo Salveti de Araujo2015-08-181-2/+2
| * GStreamer: added convenience function in QGstUtils.Yoann Lopes2015-08-133-8/+6
* | Make QWinRTImageEncoderControl a Q_OBJECT.Friedemann Kleint2015-08-191-0/+1
* | winrt: Fix aspect ratio deviation between preview and encoding streamsSamuel Nevala2015-08-182-70/+95
* | winrt: Add camera video probe controlsPeng Wu2015-08-107-13/+271
* | winrt: Add camera focus and focus lock controlsPeng Wu2015-08-1010-27/+1003
* | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-0914-122/+54
|\|
| * Fix warnings about unused private fieldsThiago Macieira2015-08-068-9/+5
| * Don't list avfcamerainfocontrol header and sources twiceThiago Macieira2015-08-061-2/+0
| * GStreamer: use QMediaStorageLocation to generate capture file names.Yoann Lopes2015-08-042-70/+14
| * GStreamer: fix possible integer overflow in comparison.Yoann Lopes2015-08-041-1/+1
| * winrt: Fix crash during certain video operationsPeng Wu2015-07-281-27/+10
| * GStreamer: fix supported values returned by CameraBinImageProcessing.Yoann Lopes2015-07-141-11/+22
| * WindowsAudio: Fix compiler warnings by g++/MinGW.Friedemann Kleint2015-07-131-2/+2
* | Prospective fix for building QtMultimedia on Android against installed QtBaseSimon Hausmann2015-07-231-1/+1
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-2921-53/+329
|\|
| * Merge remote-tracking branch 'origin/5.5.0' into 5.5Liang Qi2015-06-2615-17/+44
| |\
| | * Define QCamera::FrameRateRange as a struct.Yoann Lopes2015-06-111-3/+3
| | * WinRT: fix namespaced buildJoerg Bornemann2015-06-0413-13/+39
| | * winrt: fix camera preview on Lumia 530Peng Wu2015-06-031-0/+1
| | * AVFoundation: fix wrong Q_ASSERT.Yoann Lopes2015-06-021-1/+1
| * | winrt: Implement QImageEncoderControl for cameraPeng Wu2015-06-237-15/+260
| * | AVFoundation: don't use shared OpenGL contexts unless needed.Yoann Lopes2015-06-101-11/+15
| * | Media asset writer - use the right macroTimur Pocheptsov2015-06-031-10/+10
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-0349-341/+1704
|\| |
| * | AVFoundation: fix a problem when changing the camera viewfinder size.Yoann Lopes2015-06-021-1/+3
| |/
| * Video asset writer for iOSTimur Pocheptsov2015-05-2911-10/+1199
| * AVFoundation: fix default camera viewfinder pixel format.Yoann Lopes2015-05-293-41/+33
| * Android: fix setting the camera preview resolution.Yoann Lopes2015-05-274-27/+21
| * AVFoundation: additional build fixes for OSX < 10.9.Yoann Lopes2015-05-271-9/+26
| * videonode: imx6: Ensure the video node excludes padding pixelsCarlos Rafael Giani2015-05-266-4/+90
| * Updated WinRT license headers to use LGPLv3 instead of LGPLv21Jani Heikkinen2015-05-2122-220/+286
| * AVFoundation: fix retrieving maximum camera zoom value.Yoann Lopes2015-05-191-5/+5
| * AVFoundation: fix compilation on OSX < 10.9.Yoann Lopes2015-05-192-21/+37
| * WMF: fix start time of buffers provided by QAudioDecoder.Yoann Lopes2015-05-191-1/+2
| * OSX/iOS: Fix volume and muteFrank Osterfeld2015-05-111-2/+2
* | pulseaudio: Remove unused static member variableSergio Martins2015-06-011-2/+0
* | Use QSet::intersects() instead of QSet::intersect()Sergio Martins2015-05-301-2/+2
|/
* Merge remote-tracking branch 'origin/5.4' into 5.5Yoann Lopes2015-05-058-65/+83
|\
| * Merge remote-tracking branch 'origin/5.4.2' into 5.45.4Yoann Lopes2015-05-044-45/+63
| |\
| | * AVFoundation: fix microphone permission when using the camera.Yoann Lopes2015-04-234-45/+63
| * | Android: Don't delete the media recorder object twice.Christian Strømme2015-04-302-17/+13
| * | AVFoundation: correctly detect the default audio capture device.Yoann Lopes2015-04-232-3/+7
| |/
* | winrt: fix camera sample queue thread safetyPeng Wu2015-04-231-5/+18
* | winrt: fix camera preview on Lumia 630Peng Wu2015-04-161-1/+41