From 82e66211405e178fcfa18febe49724f807a90591 Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Fri, 13 Nov 2020 18:03:01 +0900 Subject: [PATCH] Remove condition to set "hal-name" property - The camera HAL interface will be initialized when "hal-name" property is set. - Duplicated camera HAL interface initialization will be removed in plugin init of tizencamerasrc. [Version] 0.10.227 [Issue Type] Update Change-Id: I4a32c5bb46f5cd4f89c002a9bebdcda0e3cac95f Signed-off-by: Jeongmo Yang --- packaging/libmm-camcorder.spec | 2 +- src/mm_camcorder_gstcommon.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec index 6befc9b..a701e7a 100755 --- 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.226 +Version: 0.10.227 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/mm_camcorder_gstcommon.c b/src/mm_camcorder_gstcommon.c index 9606dbf..7a65272 100755 --- a/src/mm_camcorder_gstcommon.c +++ b/src/mm_camcorder_gstcommon.c @@ -564,8 +564,13 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle) MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "capture-height", capture_height); MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "capture-jpg-quality", capture_jpg_quality); MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "hdr-capture", sc->info_image->hdr_capture_mode); - if (hcamcorder->is_network) - MMCAMCORDER_G_OBJECT_SET_POINTER(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "hal-name", hcamcorder->network_hal_name); + + /** + * This is for "tizencamerasrc" element only. + * The camera HAL library will be loaded when "hal-name" property is set. + * The default HAL library (libtizen-camera.so) will be loaded if 'hal-name' property is set to NULL. + */ + MMCAMCORDER_G_OBJECT_SET_POINTER(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "hal-name", hcamcorder->network_hal_name); _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_QUE, "queue", "videosrc_queue", element_list, err); -- 2.7.4