From 336dc4847f61713ff313cd1bbb58e85817be0142 Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Wed, 21 Mar 2018 19:37:08 +0900 Subject: [PATCH] [camcorder] Remove unused fields and rename device related files [Version] 0.2.125 [Profile] Common [Issue Type] Update [Dependency module] libmm-camcorder Change-Id: I41a7abf68435640d799763647545fb6815a6eff7 Signed-off-by: Jeongmo Yang --- mmfw-sysconf-simulator-tv/etc/multimedia/mmfw_camcorder.ini | 5 +---- ...amcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} | 0 ...amcorder_dev_video_sec.ini => mmfw_camcorder_camera1.ini} | 0 mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini | 5 +---- ...amcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} | 0 ...amcorder_dev_video_sec.ini => mmfw_camcorder_camera1.ini} | 0 .../etc/multimedia/mmfw_camcorder.ini | 5 +---- ...amcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} | 0 mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder.ini | 3 --- ...amcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} | 0 mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder.ini | 3 --- ...amcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} | 0 ...amcorder_dev_video_sec.ini => mmfw_camcorder_camera1.ini} | 0 mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder.ini | 3 --- ...amcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} | 0 mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder.ini | 3 --- ...amcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} | 0 ...amcorder_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 --- ...amcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} | 0 packaging/mmfw-sysconf.spec | 2 +- 23 files changed, 4 insertions(+), 34 deletions(-) rename mmfw-sysconf-simulator-tv/etc/multimedia/{mmfw_camcorder_dev_video_pri.ini => mmfw_camcorder_camera0.ini} (100%) rename mmfw-sysconf-simulator-tv/etc/multimedia/{mmfw_camcorder_dev_video_sec.ini => mmfw_camcorder_camera1.ini} (100%) 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-tv/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-simulator-tv/etc/multimedia/mmfw_camcorder.ini index 9bd5b98..80e8cc5 100644 --- a/mmfw-sysconf-simulator-tv/etc/multimedia/mmfw_camcorder.ini +++ b/mmfw-sysconf-simulator-tv/etc/multimedia/mmfw_camcorder.ini @@ -28,10 +28,7 @@ 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 +VideosrcElement = v4l2src | 1,0 | do-timestamp,1 UseVideoscale = 0 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1 UseZeroCopyFormat = 0 diff --git a/mmfw-sysconf-simulator-tv/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-simulator-tv/etc/multimedia/mmfw_camcorder_camera0.ini similarity index 100% rename from mmfw-sysconf-simulator-tv/etc/multimedia/mmfw_camcorder_dev_video_pri.ini rename to mmfw-sysconf-simulator-tv/etc/multimedia/mmfw_camcorder_camera0.ini diff --git a/mmfw-sysconf-simulator-tv/etc/multimedia/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-simulator-tv/etc/multimedia/mmfw_camcorder_camera1.ini similarity index 100% rename from mmfw-sysconf-simulator-tv/etc/multimedia/mmfw_camcorder_dev_video_sec.ini rename to mmfw-sysconf-simulator-tv/etc/multimedia/mmfw_camcorder_camera1.ini diff --git a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini index 822343f..61f5080 100644 --- a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini +++ b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini @@ -28,10 +28,7 @@ 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 +VideosrcElement = v4l2src | 1,0 | do-timestamp,1 UseVideoscale = 0 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1 UseZeroCopyFormat = 0 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 2d26617..37344fa 100644 --- a/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder.ini +++ b/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder.ini @@ -25,10 +25,7 @@ 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 +VideosrcElement = v4l2src | 1,0 | do-timestamp,1 UseVideoscale = 0 UseZeroCopyFormat = 0 DeviceCount = 1 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 6deb67c..5a0620a 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 276b2e8..41341c3 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 75e15b7..ca716e4 100644 --- a/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder.ini +++ b/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder.ini @@ -25,9 +25,6 @@ SyncStateChange = 1 ModelName = RPI3 [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 = 0 UseZeroCopyFormat = 0 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 e281e6b..67cac10 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 11d2c0b..5c82c7d 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 11d2c0b..5c82c7d 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 7248b73..fc4dc29 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 b70460f..56b511d 100644 --- a/packaging/mmfw-sysconf.spec +++ b/packaging/mmfw-sysconf.spec @@ -1,6 +1,6 @@ Name: mmfw-sysconf Summary: Multimedia Framework system configuration package -Version: 0.2.124 +Version: 0.2.125 Release: 0 Group: Multimedia/Configuration License: LGPL-2.1 and Apache-2.0 -- 2.34.1