From bc9fc5da42b17b92d52905de2dbd84bf4f87482d Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Mon, 18 Dec 2017 12:01:25 +0900 Subject: [PATCH] [camcorder] Remove unused fields and rename device related files [Version] 0.2.124 [Profile] Common [Issue Type] Update [Dependency module] N/A [Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-4.0-unified_20171207.4] Change-Id: I3537a1ccf0f236feb594fc55f257a7500b7f502a Signed-off-by: Jeongmo Yang --- mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini | 3 --- ...camcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} | 0 ...camcorder_dev_video_sec.ini => mmfw_camcorder_camera1.ini} | 0 mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder.ini | 3 --- ...camcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} | 0 mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder.ini | 3 --- ...camcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} | 0 mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder.ini | 3 --- ...camcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} | 0 ...camcorder_dev_video_sec.ini => mmfw_camcorder_camera1.ini} | 0 mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder.ini | 3 --- ...camcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} | 0 mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder.ini | 3 --- ...camcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} | 0 ...camcorder_dev_video_sec.ini => mmfw_camcorder_camera1.ini} | 0 mmfw-sysconf-target-tw1/etc/multimedia/mmfw_camcorder.ini | 3 --- mmfw-sysconf-target-tw2/etc/multimedia/mmfw_camcorder.ini | 3 --- mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder.ini | 3 --- ...camcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} | 0 packaging/mmfw-sysconf.spec | 4 ++-- 20 files changed, 2 insertions(+), 29 deletions(-) rename mmfw-sysconf-simulator/etc/multimedia/{mmfw_camcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} (100%) rename mmfw-sysconf-simulator/etc/multimedia/{mmfw_camcorder_dev_video_sec.ini => mmfw_camcorder_camera1.ini} (100%) rename mmfw-sysconf-target-artik10/etc/multimedia/{mmfw_camcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} (100%) rename mmfw-sysconf-target-hawkp/etc/multimedia/{mmfw_camcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} (100%) rename mmfw-sysconf-target-n4/etc/multimedia/{mmfw_camcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} (100%) rename mmfw-sysconf-target-n4/etc/multimedia/{mmfw_camcorder_dev_video_sec.ini => mmfw_camcorder_camera1.ini} (100%) rename mmfw-sysconf-target-rpi3/etc/multimedia/{mmfw_camcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} (100%) rename mmfw-sysconf-target-tm1/etc/multimedia/{mmfw_camcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} (100%) rename mmfw-sysconf-target-tm1/etc/multimedia/{mmfw_camcorder_dev_video_sec.ini => mmfw_camcorder_camera1.ini} (100%) rename mmfw-sysconf-target-u3/etc/multimedia/{mmfw_camcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} (100%) diff --git a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini index 837e097..949390f 100644 --- a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini +++ b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini @@ -28,9 +28,6 @@ ModelName = TIZEN_SDK ;DisabledAttributes = camera-optical-zoom camera-af-touch-x camera-af-touch-y camera-exposure-value camera-f-number camera-shutter-speed camera-hold-af-after-capturing filter-flip filter-hue display-src-x display-src-y display-src-width display-src-height tag-image-description strobe-control strobe-capabilities strobe-mode detect-mode detect-number detect-focus-select detect-select-number detect-status || NO_DEFAULT_VALUE [VideoInput] -UseConfCtrl = 1 -ConfCtrlFile0 = mmfw_camcorder_dev_video_pri.ini -ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini VideosrcElement = v4l2src | 1,1 | do-timestamp,1 | device,/dev/video0 UseVideoscale = 0 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1 diff --git a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_camera0.ini similarity index 100% rename from mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_dev_video_pri.ini rename to mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_camera0.ini diff --git a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_camera1.ini similarity index 100% rename from mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_dev_video_sec.ini rename to mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_camera1.ini diff --git a/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder.ini index a1a4e76..f7d5842 100644 --- a/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder.ini +++ b/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder.ini @@ -25,9 +25,6 @@ SyncStateChange = 1 ModelName = ARTIK [VideoInput] -UseConfCtrl = 1 -ConfCtrlFile0 = mmfw_camcorder_dev_video_pri.ini -ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini VideosrcElement = v4l2src | 1,1 | do-timestamp,1 | device,/dev/video101 UseVideoscale = 0 UseZeroCopyFormat = 0 diff --git a/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder_camera0.ini similarity index 100% rename from mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder_dev_video_pri.ini rename to mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder_camera0.ini diff --git a/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder.ini index 264d751..8c35165 100644 --- a/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder.ini +++ b/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder.ini @@ -26,9 +26,6 @@ ModelName = GT-TIZEN ;DisabledAttributes = camera-optical-zoom camera-af-touch-x camera-af-touch-y camera-exposure-value camera-f-number camera-shutter-speed camera-hold-af-after-capturing filter-flip filter-hue display-src-x display-src-y display-src-width display-src-height tag-image-description strobe-control strobe-capabilities strobe-mode detect-mode detect-number detect-focus-select detect-select-number detect-status || NO_DEFAULT_VALUE [VideoInput] -UseConfCtrl = 1 -ConfCtrlFile0 = mmfw_camcorder_dev_video_pri.ini -ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini VideosrcElement = tvcamerasrc | 1,1 | do-timestamp,1 | device,/dev/video241 UseVideoscale = 1 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1 diff --git a/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder_camera0.ini similarity index 100% rename from mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder_dev_video_pri.ini rename to mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder_camera0.ini diff --git a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder.ini index 4c940ac..4d73fad 100644 --- a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder.ini +++ b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder.ini @@ -26,9 +26,6 @@ ModelName = GT-TIZEN ;DisabledAttributes = camera-optical-zoom camera-af-touch-x camera-af-touch-y camera-exposure-value camera-f-number camera-shutter-speed camera-hold-af-after-capturing filter-flip filter-hue display-src-x display-src-y display-src-width display-src-height tag-image-description strobe-control strobe-capabilities strobe-mode detect-mode detect-number detect-focus-select detect-select-number detect-status || NO_DEFAULT_VALUE [VideoInput] -UseConfCtrl = 1 -ConfCtrlFile0 = mmfw_camcorder_dev_video_pri.ini -ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini VideosrcElement = videotestsrc | 2,0 | do-timestamp,1 | is-live,1 UseVideoscale = 1 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1 diff --git a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_camera0.ini similarity index 100% rename from mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_dev_video_pri.ini rename to mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_camera0.ini diff --git a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_camera1.ini similarity index 100% rename from mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_dev_video_sec.ini rename to mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_camera1.ini diff --git a/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder.ini index 095820f..80c8e83 100644 --- a/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder.ini +++ b/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder.ini @@ -26,9 +26,6 @@ ModelName = GT-TIZEN ;DisabledAttributes = camera-optical-zoom camera-af-touch-x camera-af-touch-y camera-exposure-value camera-f-number camera-shutter-speed camera-hold-af-after-capturing filter-flip filter-hue display-src-x display-src-y display-src-width display-src-height tag-image-description strobe-control strobe-capabilities strobe-mode detect-mode detect-number detect-focus-select detect-select-number detect-status || NO_DEFAULT_VALUE [VideoInput] -UseConfCtrl = 1 -ConfCtrlFile0 = mmfw_camcorder_dev_video_pri.ini -ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini VideosrcElement = v4l2src | 1,0 | do-timestamp,1 UseVideoscale = 1 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1 diff --git a/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder_camera0.ini similarity index 100% rename from mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder_dev_video_pri.ini rename to mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder_camera0.ini diff --git a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder.ini index 63f809a..062c79e 100644 --- a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder.ini +++ b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder.ini @@ -26,9 +26,6 @@ ModelName = TM1 ;DisabledAttributes = camera-optical-zoom camera-af-touch-x camera-af-touch-y camera-exposure-value camera-f-number camera-shutter-speed camera-hold-af-after-capturing filter-flip filter-hue display-src-x display-src-y display-src-width display-src-height tag-image-description strobe-control strobe-capabilities strobe-mode detect-mode detect-number detect-focus-select detect-select-number detect-status || NO_DEFAULT_VALUE [VideoInput] -UseConfCtrl = 1 -ConfCtrlFile0 = mmfw_camcorder_dev_video_pri.ini -ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini VideosrcElement = camerasrc | 2,0 | do-timestamp,1 | num-alloc-buf,7 UseVideoscale = 0 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1 diff --git a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_camera0.ini similarity index 100% rename from mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_dev_video_pri.ini rename to mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_camera0.ini diff --git a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_camera1.ini similarity index 100% rename from mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_dev_video_sec.ini rename to mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_camera1.ini diff --git a/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_camcorder.ini index 42e3833..7b9f424 100644 --- a/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_camcorder.ini +++ b/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_camcorder.ini @@ -26,9 +26,6 @@ ModelName = TW1 ;DisabledAttributes = camera-optical-zoom camera-af-touch-x camera-af-touch-y camera-exposure-value camera-f-number camera-shutter-speed camera-hold-af-after-capturing filter-flip filter-hue display-src-x display-src-y display-src-width display-src-height tag-image-description strobe-control strobe-capabilities strobe-mode detect-mode detect-number detect-focus-select detect-select-number detect-status || NO_DEFAULT_VALUE [VideoInput] -UseConfCtrl = 1 -ConfCtrlFile0 = mmfw_camcorder_dev_video_pri.ini -ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini ;VideosrcElement = v4l2src | 1,0 | do-timestamp,1 UseVideoscale = 1 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1 diff --git a/mmfw-sysconf-target-tw2/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-target-tw2/etc/multimedia/mmfw_camcorder.ini index 42e3833..7b9f424 100644 --- a/mmfw-sysconf-target-tw2/etc/multimedia/mmfw_camcorder.ini +++ b/mmfw-sysconf-target-tw2/etc/multimedia/mmfw_camcorder.ini @@ -26,9 +26,6 @@ ModelName = TW1 ;DisabledAttributes = camera-optical-zoom camera-af-touch-x camera-af-touch-y camera-exposure-value camera-f-number camera-shutter-speed camera-hold-af-after-capturing filter-flip filter-hue display-src-x display-src-y display-src-width display-src-height tag-image-description strobe-control strobe-capabilities strobe-mode detect-mode detect-number detect-focus-select detect-select-number detect-status || NO_DEFAULT_VALUE [VideoInput] -UseConfCtrl = 1 -ConfCtrlFile0 = mmfw_camcorder_dev_video_pri.ini -ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini ;VideosrcElement = v4l2src | 1,0 | do-timestamp,1 UseVideoscale = 1 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1 diff --git a/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder.ini index 095820f..80c8e83 100644 --- a/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder.ini +++ b/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder.ini @@ -26,9 +26,6 @@ ModelName = GT-TIZEN ;DisabledAttributes = camera-optical-zoom camera-af-touch-x camera-af-touch-y camera-exposure-value camera-f-number camera-shutter-speed camera-hold-af-after-capturing filter-flip filter-hue display-src-x display-src-y display-src-width display-src-height tag-image-description strobe-control strobe-capabilities strobe-mode detect-mode detect-number detect-focus-select detect-select-number detect-status || NO_DEFAULT_VALUE [VideoInput] -UseConfCtrl = 1 -ConfCtrlFile0 = mmfw_camcorder_dev_video_pri.ini -ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini VideosrcElement = v4l2src | 1,0 | do-timestamp,1 UseVideoscale = 1 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1 diff --git a/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder_camera0.ini similarity index 100% rename from mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder_dev_video_pri.ini rename to mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder_camera0.ini diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec index 9eaf31a..fb2f218 100644 --- a/packaging/mmfw-sysconf.spec +++ b/packaging/mmfw-sysconf.spec @@ -1,7 +1,7 @@ Name: mmfw-sysconf Summary: Multimedia Framework system configuration package -Version: 0.2.123 -Release: 1 +Version: 0.2.124 +Release: 0 Group: Multimedia/Configuration License: LGPL-2.1 and Apache-2.0 Source0: mmfw-sysconf-%{version}.tar.gz -- 2.34.1