summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeongmo Yang <jm80.yang@samsung.com>2020-11-06 14:01:17 +0900
committerJeongmo Yang <jm80.yang@samsung.com>2020-11-06 14:01:17 +0900
commit006e72aa681eae48f47b8907e7e469a7b7dcf248 (patch)
treed169ea73a67955e45e5881e8ebe93bb0476c2725
parentb1be1b52bc38e9af2297b29c6999761bc1c7dc04 (diff)
downloadlibmm-camcorder-006e72aa681eae48f47b8907e7e469a7b7dcf248.tar.gz
libmm-camcorder-006e72aa681eae48f47b8907e7e469a7b7dcf248.tar.bz2
libmm-camcorder-006e72aa681eae48f47b8907e7e469a7b7dcf248.zip
Set device type as camera id in case of network camerasubmit/tizen/20201106.064606accepted/tizen/unified/20201109.123503
[Version] 0.10.226 [Issue Type] Update Change-Id: I5301c47bd34f6f87e1a9bc27066e904621fdb8af Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
-rwxr-xr-xpackaging/libmm-camcorder.spec2
-rwxr-xr-xsrc/mm_camcorder_gstcommon.c8
2 files changed, 7 insertions, 3 deletions
diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec
index 1863d5b..6befc9b 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.225
+Version: 0.10.226
Release: 0
Group: Multimedia/Libraries
License: Apache-2.0
diff --git a/src/mm_camcorder_gstcommon.c b/src/mm_camcorder_gstcommon.c
index 87eff91..9606dbf 100755
--- a/src/mm_camcorder_gstcommon.c
+++ b/src/mm_camcorder_gstcommon.c
@@ -585,11 +585,15 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle)
_mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, VideosrcElement);
/* Set video device index */
+ if (hcamcorder->is_network) {
+ MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "camera-id", hcamcorder->device_type);
+ } else {
#ifdef _MMCAMCORDER_CAMERA_CONF_MGR_SUPPORT
- MMCAMCORDER_G_OBJECT_SET_POINTER(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "device-name", hcamcorder->conf_device_info.node);
+ MMCAMCORDER_G_OBJECT_SET_POINTER(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "device-name", hcamcorder->conf_device_info.node);
#else
- MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "camera-id", input_index->default_value);
+ MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "camera-id", input_index->default_value);
#endif
+ }
/* set user buffer fd to videosrc element */
if (hcamcorder->support_user_buffer) {