From bf6a893e8435db25fed96b8d538f18cfefbd4661 Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Wed, 12 Jun 2019 18:15:40 +0900 Subject: [PATCH] Bug fix - pan and tilt setting [Version] 0.10.184 [Profile] Common [Issue Type] Bug fix Change-Id: Iaa994900dd12903e6b5f535a3eae66d79c8fec4f Signed-off-by: Jeongmo Yang --- packaging/libmm-camcorder.spec | 2 +- src/mm_camcorder_attribute.c | 9 +++- src/mm_camcorder_configure.c | 1 + src/mm_camcorder_platform.c | 98 +++++++++++++++++----------------- 4 files changed, 58 insertions(+), 52 deletions(-) diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec index 47f13ae..54de2d5 100644 --- a/packaging/libmm-camcorder.spec +++ b/packaging/libmm-camcorder.spec @@ -1,6 +1,6 @@ Name: libmm-camcorder Summary: Camera and recorder library -Version: 0.10.183 +Version: 0.10.184 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/mm_camcorder_attribute.c b/src/mm_camcorder_attribute.c index 719c0fe..c066d49 100644 --- a/src/mm_camcorder_attribute.c +++ b/src/mm_camcorder_attribute.c @@ -2636,7 +2636,7 @@ bool _mmcamcorder_commit_camera_ptz_type(MMHandleType handle, int attr_idx, cons for (item = controls ; item && item->data ; item = item->next) { CameraControlChannel = item->data; _mmcam_dbg_log("CameraControlChannel->label %s", CameraControlChannel->label); - if (!strcmp(CameraControlChannel->label, "ptz")) { + if (!strcmp(CameraControlChannel->label, "ptz_type")) { if (gst_camera_control_set_value(CameraControl, CameraControlChannel, value->value.i_val)) { _mmcam_dbg_warn("set ptz type %d done", value->value.i_val); return TRUE; @@ -4739,7 +4739,12 @@ bool _mmcamcorder_set_attribute_to_camsensor2(MMHandleType handle) unsigned int i = 0; int ret = TRUE; int attr_idxs[] = { - MM_CAM_STROBE_MODE + MM_CAM_STROBE_MODE, + MM_CAM_CAMERA_PTZ_TYPE, + MM_CAM_CAMERA_PAN_MECHA, + MM_CAM_CAMERA_PAN_ELEC, + MM_CAM_CAMERA_TILT_MECHA, + MM_CAM_CAMERA_TILT_ELEC }; mmf_return_val_if_fail(hcamcorder, FALSE); diff --git a/src/mm_camcorder_configure.c b/src/mm_camcorder_configure.c index a245b44..e578ab8 100644 --- a/src/mm_camcorder_configure.c +++ b/src/mm_camcorder_configure.c @@ -826,6 +826,7 @@ int _mmcamcorder_conf_init(MMHandleType handle, int type, camera_conf *configure { "VideoStabilization", CONFIGURE_VALUE_INT_ARRAY, {NULL} }, { "FaceZoomMode", CONFIGURE_VALUE_INT_ARRAY, {NULL} }, { "FaceZoomLevel", CONFIGURE_VALUE_INT_RANGE, {NULL} }, + { "PtzType", CONFIGURE_VALUE_INT_ARRAY, {NULL} }, { "PanMecha", CONFIGURE_VALUE_INT_RANGE, {NULL} }, { "PanElec", CONFIGURE_VALUE_INT_RANGE, {NULL} }, { "TiltMecha", CONFIGURE_VALUE_INT_RANGE, {NULL} }, diff --git a/src/mm_camcorder_platform.c b/src/mm_camcorder_platform.c index 2c23331..1400985 100644 --- a/src/mm_camcorder_platform.c +++ b/src/mm_camcorder_platform.c @@ -285,51 +285,6 @@ static _MMCamcorderInfoConverting g_caminfo_convert[CAMINFO_CONVERT_NUM] = { NULL, }, { - CONFIGURE_TYPE_CTRL, - CONFIGURE_CATEGORY_CTRL_CAMERA, - MM_CAM_CAMERA_PAN_MECHA, - MM_CAMCORDER_ATTR_NONE, - "PanMecha", - MM_CAMCONVERT_TYPE_INT_RANGE, - NULL, - }, - { - CONFIGURE_TYPE_CTRL, - CONFIGURE_CATEGORY_CTRL_CAMERA, - MM_CAM_CAMERA_PAN_ELEC, - MM_CAMCORDER_ATTR_NONE, - "PanElec", - MM_CAMCONVERT_TYPE_INT_RANGE, - NULL, - }, - { - CONFIGURE_TYPE_CTRL, - CONFIGURE_CATEGORY_CTRL_CAMERA, - MM_CAM_CAMERA_TILT_MECHA, - MM_CAMCORDER_ATTR_NONE, - "TiltMecha", - MM_CAMCONVERT_TYPE_INT_RANGE, - NULL, - }, - { - CONFIGURE_TYPE_CTRL, - CONFIGURE_CATEGORY_CTRL_CAMERA, - MM_CAM_CAMERA_TILT_ELEC, - MM_CAMCORDER_ATTR_NONE, - "TiltElec", - MM_CAMCONVERT_TYPE_INT_RANGE, - NULL, - }, - { - CONFIGURE_TYPE_CTRL, - CONFIGURE_CATEGORY_CTRL_CAMERA, - MM_CAM_CAMERA_PTZ_TYPE, - MM_CAMCORDER_ATTR_NONE, - "PtzType", - MM_CAMCONVERT_TYPE_INT_ARRAY, - NULL, - }, - {/* 10 */ CONFIGURE_TYPE_CTRL, CONFIGURE_CATEGORY_CTRL_STROBE, MM_CAM_STROBE_CONTROL, @@ -374,7 +329,7 @@ static _MMCamcorderInfoConverting g_caminfo_convert[CAMINFO_CONVERT_NUM] = { MM_CAMCONVERT_TYPE_INT_RANGE, NULL, }, - { + {/* 10 */ CONFIGURE_TYPE_CTRL, CONFIGURE_CATEGORY_CTRL_EFFECT, MM_CAM_FILTER_SATURATION, @@ -419,7 +374,7 @@ static _MMCamcorderInfoConverting g_caminfo_convert[CAMINFO_CONVERT_NUM] = { MM_CAMCONVERT_TYPE_INT_ARRAY, &_mmcamcorder_enum_conv_colortone, }, - {/* 20 */ + { CONFIGURE_TYPE_CTRL, CONFIGURE_CATEGORY_CTRL_EFFECT, MM_CAM_CAMERA_WDR, @@ -464,7 +419,7 @@ static _MMCamcorderInfoConverting g_caminfo_convert[CAMINFO_CONVERT_NUM] = { MM_CAMCONVERT_TYPE_INT_RANGE, NULL, }, - { + {/* 20 */ CONFIGURE_TYPE_CTRL, CONFIGURE_CATEGORY_CTRL_PHOTOGRAPH, MM_CAM_CAMERA_FOCUS_MODE, @@ -509,7 +464,7 @@ static _MMCamcorderInfoConverting g_caminfo_convert[CAMINFO_CONVERT_NUM] = { MM_CAMCONVERT_TYPE_INT_ARRAY, NULL, }, - {/* 30 */ + { CONFIGURE_TYPE_CTRL, CONFIGURE_CATEGORY_CTRL_PHOTOGRAPH, MM_CAM_CAMERA_SHUTTER_SPEED, @@ -545,6 +500,51 @@ static _MMCamcorderInfoConverting g_caminfo_convert[CAMINFO_CONVERT_NUM] = { MM_CAMCONVERT_TYPE_INT_ARRAY, &_mmcamcorder_enum_conv_ahs, }, + { + CONFIGURE_TYPE_CTRL, + CONFIGURE_CATEGORY_CTRL_PHOTOGRAPH, + MM_CAM_CAMERA_PAN_MECHA, + MM_CAMCORDER_ATTR_NONE, + "PanMecha", + MM_CAMCONVERT_TYPE_INT_RANGE, + NULL, + }, + {/* 30 */ + CONFIGURE_TYPE_CTRL, + CONFIGURE_CATEGORY_CTRL_PHOTOGRAPH, + MM_CAM_CAMERA_PAN_ELEC, + MM_CAMCORDER_ATTR_NONE, + "PanElec", + MM_CAMCONVERT_TYPE_INT_RANGE, + NULL, + }, + { + CONFIGURE_TYPE_CTRL, + CONFIGURE_CATEGORY_CTRL_PHOTOGRAPH, + MM_CAM_CAMERA_TILT_MECHA, + MM_CAMCORDER_ATTR_NONE, + "TiltMecha", + MM_CAMCONVERT_TYPE_INT_RANGE, + NULL, + }, + { + CONFIGURE_TYPE_CTRL, + CONFIGURE_CATEGORY_CTRL_PHOTOGRAPH, + MM_CAM_CAMERA_TILT_ELEC, + MM_CAMCORDER_ATTR_NONE, + "TiltElec", + MM_CAMCONVERT_TYPE_INT_RANGE, + NULL, + }, + { + CONFIGURE_TYPE_CTRL, + CONFIGURE_CATEGORY_CTRL_PHOTOGRAPH, + MM_CAM_CAMERA_PTZ_TYPE, + MM_CAMCORDER_ATTR_NONE, + "PtzType", + MM_CAMCONVERT_TYPE_INT_ARRAY, + NULL, + }, { CONFIGURE_TYPE_CTRL, CONFIGURE_CATEGORY_CTRL_CAPTURE, -- 2.34.1