From 6590b00c1447712f49aa9958a7a136bbaafa92ec Mon Sep 17 00:00:00 2001 From: Haesu Gwon Date: Mon, 2 May 2016 16:00:53 +0900 Subject: [PATCH] [all/camera] add pan, tilt range, ptz type Change-Id: I4e41e6cf699446648449f495cea4ce0b35b3f6ee Signed-off-by: Haesu Gwon --- .../multimedia/mmfw_camcorder_dev_video_pri.ini | 16 ++++++++++++++++ .../multimedia/mmfw_camcorder_dev_video_sec.ini | 16 ++++++++++++++++ .../multimedia/mmfw_camcorder_dev_video_pri.ini | 16 ++++++++++++++++ .../multimedia/mmfw_camcorder_dev_video_pri.ini | 16 ++++++++++++++++ .../multimedia/mmfw_camcorder_dev_video_pri.ini | 16 ++++++++++++++++ .../multimedia/mmfw_camcorder_dev_video_sec.ini | 16 ++++++++++++++++ .../multimedia/mmfw_camcorder_dev_video_pri.ini | 16 ++++++++++++++++ .../multimedia/mmfw_camcorder_dev_video_sec.ini | 16 ++++++++++++++++ .../multimedia/mmfw_camcorder_dev_video_pri.ini | 16 ++++++++++++++++ packaging/mmfw-sysconf.spec | 2 +- 10 files changed, 145 insertions(+), 1 deletion(-) diff --git a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_dev_video_pri.ini index c7c9e86..e0fa03c 100644 --- a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_dev_video_pri.ini +++ b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_dev_video_pri.ini @@ -152,6 +152,22 @@ FaceZoomMode = 0 || 0 ; Face zoom level FaceZoomLevel = 0,0 || 0 +; PTZ(Pan Tilt Zoom) type +;;; 0:Mechanical, 1:Electronic +;PtzType = 0,1 || 1 + +; Pan range for mechanical movement +;PanMecha = -10,10 + +; Pan range for electronic movement +;PanElec = -10,10 + +; Tilt range for mechanical movement +;TiltMecha = -10,10 + +; Tilt range for electronic movement +;TiltElec = -10,10 + [Capture] ; Output mode diff --git a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_dev_video_sec.ini index a91db8b..dd7626d 100644 --- a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_dev_video_sec.ini +++ b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_dev_video_sec.ini @@ -152,6 +152,22 @@ FaceZoomMode = 0 || 0 ; Face zoom level FaceZoomLevel = 0,0 || 0 +; PTZ(Pan Tilt Zoom) type +;;; 0:Mechanical, 1:Electronic +;PtzType = 0,1 || 1 + +; Pan range for mechanical movement +;PanMecha = -10,10 + +; Pan range for electronic movement +;PanElec = -10,10 + +; Tilt range for mechanical movement +;TiltMecha = -10,10 + +; Tilt range for electronic movement +;TiltElec = -10,10 + [Capture] ; Output mode diff --git a/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder_dev_video_pri.ini index 57699c8..3fa0a7c 100644 --- a/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder_dev_video_pri.ini +++ b/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder_dev_video_pri.ini @@ -166,6 +166,22 @@ FaceZoomMode = 0 || 0 ; Face zoom level FaceZoomLevel = 0,0 || 0 +; PTZ(Pan Tilt Zoom) type +;;; 0:Mechanical, 1:Electronic +;PtzType = 0,1 || 1 + +; Pan range for mechanical movement +;PanMecha = -10,10 + +; Pan range for electronic movement +;PanElec = -10,10 + +; Tilt range for mechanical movement +;TiltMecha = -10,10 + +; Tilt range for electronic movement +;TiltElec = -10,10 + [Capture] ; Output mode diff --git a/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder_dev_video_pri.ini index 52f26d7..5b770de 100644 --- a/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder_dev_video_pri.ini +++ b/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder_dev_video_pri.ini @@ -172,6 +172,22 @@ FaceZoomMode = 0 || 0 ; Face zoom level FaceZoomLevel = 0,0 || 0 +; PTZ(Pan Tilt Zoom) type +;;; 0:Mechanical, 1:Electronic +PtzType = 0,1 || 1 + +; Pan range for mechanical movement +PanMecha = -10,10 + +; Pan range for electronic movement +PanElec = -10,10 + +; Tilt range for mechanical movement +TiltMecha = -10,10 + +; Tilt range for electronic movement +TiltElec = -10,10 + [Capture] ; Output mode diff --git a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_dev_video_pri.ini index dbd5fe2..fd96f16 100644 --- a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_dev_video_pri.ini +++ b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_dev_video_pri.ini @@ -165,6 +165,22 @@ FaceZoomMode = 0 || 0 ; Face zoom level FaceZoomLevel = 0,0 || 0 +; PTZ(Pan Tilt Zoom) type +;;; 0:Mechanical, 1:Electronic +;PtzType = 0,1 || 1 + +; Pan range for mechanical movement +;PanMecha = -10,10 + +; Pan range for electronic movement +;PanElec = -10,10 + +; Tilt range for mechanical movement +;TiltMecha = -10,10 + +; Tilt range for electronic movement +;TiltElec = -10,10 + [Capture] ; Output mode diff --git a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_dev_video_sec.ini index b9d590c..a8d1a35 100644 --- a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_dev_video_sec.ini +++ b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_dev_video_sec.ini @@ -165,6 +165,22 @@ FaceZoomMode = 0 || 0 ; Face zoom level FaceZoomLevel = 0,0 || 0 +; PTZ(Pan Tilt Zoom) type +;;; 0:Mechanical, 1:Electronic +;PtzType = 0,1 || 1 + +; Pan range for mechanical movement +;PanMecha = -10,10 + +; Pan range for electronic movement +;PanElec = -10,10 + +; Tilt range for mechanical movement +;TiltMecha = -10,10 + +; Tilt range for electronic movement +;TiltElec = -10,10 + [Capture] ; Output mode diff --git a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_dev_video_pri.ini index 1c21d05..cfc0902 100644 --- a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_dev_video_pri.ini +++ b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_dev_video_pri.ini @@ -169,6 +169,22 @@ FaceZoomMode = 0 || 0 ; Face zoom level FaceZoomLevel = 0,0 || 0 +; PTZ(Pan Tilt Zoom) type +;;; 0:Mechanical, 1:Electronic +;PtzType = 0,1 || 1 + +; Pan range for mechanical movement +;PanMecha = -10,10 + +; Pan range for electronic movement +;PanElec = -10,10 + +; Tilt range for mechanical movement +;TiltMecha = -10,10 + +; Tilt range for electronic movement +;TiltElec = -10,10 + [Capture] ; Output mode diff --git a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_dev_video_sec.ini index 70e77fa..c2c7cd7 100644 --- a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_dev_video_sec.ini +++ b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_dev_video_sec.ini @@ -171,6 +171,22 @@ FaceZoomMode = 0 || 0 ; Face zoom level FaceZoomLevel = 0,0 || 0 +; PTZ(Pan Tilt Zoom) type +;;; 0:Mechanical, 1:Electronic +;PtzType = 0,1 || 1 + +; Pan range for mechanical movement +;PanMecha = -10,10 + +; Pan range for electronic movement +;PanElec = -10,10 + +; Tilt range for mechanical movement +;TiltMecha = -10,10 + +; Tilt range for electronic movement +;TiltElec = -10,10 + [Capture] ; Output mode diff --git a/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder_dev_video_pri.ini index b4ddbb0..dc61517 100644 --- a/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder_dev_video_pri.ini +++ b/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder_dev_video_pri.ini @@ -165,6 +165,22 @@ FaceZoomMode = 0 || 0 ; Face zoom level FaceZoomLevel = 0,0 || 0 +; PTZ(Pan Tilt Zoom) type +;;; 0:Mechanical, 1:Electronic +;PtzType = 0,1 || 1 + +; Pan range for mechanical movement +;PanMecha = -10,10 + +; Pan range for electronic movement +;PanElec = -10,10 + +; Tilt range for mechanical movement +;TiltMecha = -10,10 + +; Tilt range for electronic movement +;TiltElec = -10,10 + [Capture] ; Output mode diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec index 68e8f2e..367db87 100644 --- a/packaging/mmfw-sysconf.spec +++ b/packaging/mmfw-sysconf.spec @@ -2,7 +2,7 @@ Name: mmfw-sysconf Summary: Multimedia Framework system configuration package -Version: 0.2.59 +Version: 0.2.60 Release: 0 Group: Multimedia/Configuration License: LGPL-2.1+ and Apache-2.0 -- 2.34.1