Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtMultimedia
Commits
86d5c7e4
Commit
86d5c7e4
authored
10 years ago
by
Frederik Gladhorn
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.3' into dev
Change-Id: If8e5050901a320f1ff692e842f173c0062bed5fe
parents
39c26944
2bc7a39a
Changes
34
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
src/plugins/android/src/mediacapture/qandroidcameraexposurecontrol.cpp
+53
-35
...ndroid/src/mediacapture/qandroidcameraexposurecontrol.cpp
src/plugins/android/src/mediacapture/qandroidcameraflashcontrol.cpp
+12
-2
...s/android/src/mediacapture/qandroidcameraflashcontrol.cpp
src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.cpp
+61
-57
...s/android/src/mediacapture/qandroidcamerafocuscontrol.cpp
src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.h
+16
-0
...ins/android/src/mediacapture/qandroidcamerafocuscontrol.h
src/plugins/android/src/mediacapture/qandroidcameraimageprocessingcontrol.cpp
+26
-19
...src/mediacapture/qandroidcameraimageprocessingcontrol.cpp
src/plugins/android/src/mediacapture/qandroidcameraimageprocessingcontrol.h
+5
-1
...d/src/mediacapture/qandroidcameraimageprocessingcontrol.h
src/plugins/android/src/mediacapture/qandroidcameralockscontrol.cpp
+3
-3
...s/android/src/mediacapture/qandroidcameralockscontrol.cpp
src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
+4
-3
...lugins/android/src/mediacapture/qandroidcamerasession.cpp
src/plugins/android/src/mediacapture/qandroidcamerazoomcontrol.cpp
+13
-19
...ns/android/src/mediacapture/qandroidcamerazoomcontrol.cpp
src/plugins/android/src/wrappers/jni/androidcamera.cpp
+51
-29
src/plugins/android/src/wrappers/jni/androidcamera.cpp
src/plugins/android/src/wrappers/jni/androidcamera.h
+4
-4
src/plugins/android/src/wrappers/jni/androidcamera.h
src/plugins/avfoundation/camera/avfmediarecordercontrol.mm
+2
-4
src/plugins/avfoundation/camera/avfmediarecordercontrol.mm
src/plugins/coreaudio/coreaudiosessionmanager.mm
+3
-2
src/plugins/coreaudio/coreaudiosessionmanager.mm
src/plugins/directshow/camera/camera.pri
+0
-5
src/plugins/directshow/camera/camera.pri
src/plugins/directshow/camera/dscameracontrol.cpp
+35
-18
src/plugins/directshow/camera/dscameracontrol.cpp
src/plugins/directshow/camera/dscameracontrol.h
+4
-11
src/plugins/directshow/camera/dscameracontrol.h
src/plugins/directshow/camera/dscameraservice.cpp
+0
-41
src/plugins/directshow/camera/dscameraservice.cpp
src/plugins/directshow/camera/dscameraservice.h
+0
-4
src/plugins/directshow/camera/dscameraservice.h
src/plugins/directshow/camera/dscamerasession.cpp
+471
-810
src/plugins/directshow/camera/dscamerasession.cpp
src/plugins/directshow/camera/dscamerasession.h
+61
-101
src/plugins/directshow/camera/dscamerasession.h
with
824 additions
and
1168 deletions
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment