summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeongmo Yang <jm80.yang@samsung.com>2020-09-02 12:07:46 +0900
committerJeongmo Yang <jm80.yang@samsung.com>2020-09-02 12:08:55 +0900
commit19a985e4e26b2136162596e5f0e4b57e1435c167 (patch)
treeb7df0a93e1ca4458679110a13890bee3977ff9ab
parent0fce33f353c89e8c437513d1a110f20a0a420566 (diff)
downloadcamera-19a985e4e26b2136162596e5f0e4b57e1435c167.tar.gz
camera-19a985e4e26b2136162596e5f0e4b57e1435c167.tar.bz2
camera-19a985e4e26b2136162596e5f0e4b57e1435c167.zip
- Skip camera_attr_get_display_roi_area() if display mode is not CAMERA_DISPLAY_MODE_CUSTOM_ROI in _camera_set_display(). [Version] 0.4.39 [Issue Type] Optimization Change-Id: I97ad53a69a54ea14ce286df4d99e785d56055661 Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
-rw-r--r--packaging/capi-media-camera.spec2
-rw-r--r--src/camera.c10
2 files changed, 7 insertions, 5 deletions
diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec
index 4bbb8d2..3baeb57 100644
--- a/packaging/capi-media-camera.spec
+++ b/packaging/capi-media-camera.spec
@@ -1,6 +1,6 @@
Name: capi-media-camera
Summary: A Camera API
-Version: 0.4.38
+Version: 0.4.39
Release: 0
Group: Multimedia/API
License: Apache-2.0
diff --git a/src/camera.c b/src/camera.c
index 9baa0c0..ae8991f 100644
--- a/src/camera.c
+++ b/src/camera.c
@@ -3196,18 +3196,20 @@ int _camera_set_display(camera_h camera, mm_display_type_e type, void *display)
camera_get_display_mode(camera, &mode);
camera_get_display_rotation(camera, &rotation);
camera_is_display_visible(camera, &visible);
- camera_attr_get_display_roi_area(camera, &x, &y, &width, &height);
- LOGD("current setting : flip %d, mode %d, rotation %d, visible %d, roi %d,%d,%dx%d",
- flip, mode, rotation, visible, x, y, width, height);
+ LOGD("current setting : flip %d, mode %d, rotation %d, visible %d",
+ flip, mode, rotation, visible);
mm_ret = mm_display_interface_evas_set_flip(cb_info->dp_interface, flip);
mm_ret |= mm_display_interface_evas_set_mode(cb_info->dp_interface, mode);
mm_ret |= mm_display_interface_evas_set_rotation(cb_info->dp_interface, rotation);
mm_ret |= mm_display_interface_evas_set_visible(cb_info->dp_interface, visible);
- if (mode == CAMERA_DISPLAY_MODE_CUSTOM_ROI)
+ if (mode == CAMERA_DISPLAY_MODE_CUSTOM_ROI) {
+ camera_attr_get_display_roi_area(camera, &x, &y, &width, &height);
+ LOGD("current setting : roi %d,%d,%dx%d", x, y, width, height);
mm_ret |= mm_display_interface_evas_set_roi_area(cb_info->dp_interface, x, y, width, height);
+ }
//LCOV_EXCL_STOP
}
}