projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a27500b
)
camerabin: reset software zooming if not set by the photo interface
author
Adam Endrodi
<adam.endrodi@blumsoft.eu>
Thu, 15 Apr 2010 10:20:42 +0000
(13:20 +0300)
committer
Stefan Kost
<ensonic@users.sf.net>
Thu, 15 Apr 2010 10:22:16 +0000
(13:22 +0300)
Otherwise both software (videoscal+videocrop) and hardware zooming would be used.
gst/camerabin/gstcamerabin.c
patch
|
blob
|
history
diff --git
a/gst/camerabin/gstcamerabin.c
b/gst/camerabin/gstcamerabin.c
index
bd71794
..
f880793
100644
(file)
--- a/
gst/camerabin/gstcamerabin.c
+++ b/
gst/camerabin/gstcamerabin.c
@@
-1128,6
+1128,7
@@
gst_camerabin_setup_zoom (GstCameraBin * camera)
GST_INFO_OBJECT (camera, "setting zoom %d", zoom);
if (gst_camerabin_set_videosrc_zoom (camera, zoom)) {
+ gst_camerabin_set_element_zoom (camera, ZOOM_1X);
GST_INFO_OBJECT (camera, "zoom set using videosrc");
} else if (gst_camerabin_set_element_zoom (camera, zoom)) {
GST_INFO_OBJECT (camera, "zoom set using gst elements");