Fix extra preview mode

- For MM_CAMCORDER_EXTRA_PREVIEW_MODE_PIPELINE_SRCPAD
 : It's failed to link because camerasrc element and capsfilter for extra preview are not in same bin.
- For MM_CAMCORDER_EXTRA_PREVIEW_MODE_PIPELINE_ELEMENT
 : It's missed to set "hal-name" to initialize handle of camera HAL interface.

[Version] 0.10.283
[Issue Type] Bug fix

Change-Id: I175f24e907ede75cda1b9af7ad879fb721d4eca8
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec
index a3b69b8..9acfe8a 100755 (executable)
--- a/packaging/libmm-camcorder.spec
+++ b/packaging/libmm-camcorder.spec
@@ -1,7 +1,7 @@
 Name:       libmm-camcorder
 Summary:    Camera and recorder library
-Version:    0.10.282
-Release:    1
+Version:    0.10.283
+Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz

diff --git a/src/mm_camcorder_gstcommon.c b/src/mm_camcorder_gstcommon.c
index 29d4ddb..41e8b52 100644 (file)
--- a/src/mm_camcorder_gstcommon.c
+++ b/src/mm_camcorder_gstcommon.c
@@ -684,10 +684,6 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle)
 #endif
        }
 
-       /* extra preview */
-       if (extra_preview_enable)
-               _mmcamcorder_initialize_extra_preview_mode(handle);
-
        /* set user buffer fd to videosrc element */
        if (hcamcorder->support_user_buffer) {
                control = GST_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst);
@@ -858,6 +854,10 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle)
                element_list = NULL;
        }
 
+       /* extra preview */
+       if (extra_preview_enable)
+               _mmcamcorder_initialize_extra_preview_mode(handle);
+
        return MM_ERROR_NONE;
 
 pipeline_creation_error:

diff --git a/src/mm_camcorder_stillshot.c b/src/mm_camcorder_stillshot.c
index 8bd9bf2..0a6c85f 100644 (file)
--- a/src/mm_camcorder_stillshot.c
+++ b/src/mm_camcorder_stillshot.c
@@ -433,6 +433,7 @@ static int __mmcamcorder_extra_preview_mode_init_pipeline(MMHandleType handle, M
 
                _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_EXT_SRC, videosrc_name, "vsrc_e_src", element_list, err);
 
+               MMCAMCORDER_G_OBJECT_SET_POINTER(sc->element[_MMCAMCORDER_VIDEOSRC_EXT_SRC].gst, "hal-name", NULL);
                MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_EXT_SRC].gst, "camera-id", hcamcorder->extra_preview.camera_id[0]);
 
                _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSRC_EXT_SRC].gst, videosrc_element);