upload tizen1.0 source

9 files changed, 65 insertions, 31 deletions

diff --git a/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_camcorder.ini b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder.ini
index 123d48b..123d48b 100644
--- a/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder.ini
diff --git a/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_pri.ini
index aad4711..aad4711 100644
--- a/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_camcorder_dev_video_pri.ini
+++ b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_pri.ini
diff --git a/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_sec.ini
index 4a55a13..9b06129 100644
--- a/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_camcorder_dev_video_sec.ini
+++ b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_sec.ini
@@ -42,13 +42,13 @@ RecommendPreviewFormatRecord = 7
 
 
 [Strobe]
-; Strobe control - real setting value
-;;; 1:OFF, 2:ON, 3:AUTO, 4:MOVIE_ON
-; Strobe control - MSL value(convert array index)
-;;; 0:OFF, 1:ON, 2:AUTO, 3:MOVIE_ON
-StrobeControl = 1,2,3,4 || 3
+;StrobeControl - Not support
 ;StrobeCapabilities - Not support
-;StrobeMode - Not support
+; Strobe mode - real setting value
+;;; 0:BASE, 1:OFF, 2:AUTO, 3:ON, 4:TORCH, 5:MAX
+; Strobe mode - MSL value(convert array index)
+;;; 0:OFF, 1:ON, 2:AUTO, 3:REDEYE_REDUCTION, 4:SLOW_SYNC, 5:FRONT_CURTAIN, 6:REAR_CURTAIN, 7:PERMANENT
+StrobeMode = 1,-255,-255,-255,-255,-255,-255,-255 || 1
 ;StrobeStatus - Not support
 ;StrobeEV - Not support
 
@@ -95,13 +95,13 @@ DigitalZoom = 0,30 || 0
 ;;; Not Support, no need to convert
 ; Focus mode - MSL value(convert array index)
 ;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
-FocusMode = -255,-255,-255,-255,-255,-255 || 0
+FocusMode = 0,-255,-255,-255,-255,-255 || 0
 
 ; Auto focus type - real setting value
 ;;; 0:NORMAL, 1:MACRO, 2:FULL
 ; Auto focus - MSL value(convert array index)
 ;;; 0:NONE, 1:NORMAL, 2:MACRO, 3:FULL
-AFType = -255,-255,-255,-255 || 0
+AFType = 0,-255,-255,-255 || 0
 
 ; Auto exposure type - real setting value
 ;;; 0:BASE, 1:MATRIX, 2:CENTER, 3:SPOT, 4:MAX
diff --git a/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_player.ini b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_player.ini
index 68177a5..68177a5 100644
--- a/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_player.ini
+++ b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_player.ini
diff --git a/mmfw-sysconf-simulator/opt/etc/mmfw_camcorder.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
index bdb3883..bdb3883 100644
--- a/mmfw-sysconf-simulator/opt/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
diff --git a/mmfw-sysconf-simulator/opt/etc/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini
index d8b9ab3..7f656ed 100644
--- a/mmfw-sysconf-simulator/opt/etc/mmfw_camcorder_dev_video_pri.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini
@@ -39,13 +39,13 @@ RecommendPreviewFormatRecord = 7
 
 
 [Strobe]
-; Strobe control - real setting value
-;;; 1:OFF, 2:ON, 3:AUTO, 4:MOVIE_ON
-; Strobe control - MSL value(convert array index)
-;;; 0:OFF, 1:ON, 2:AUTO, 3:MOVIE_ON
-;StrobeControl = 1,2,3,4 || 3
+;StrobeControl - Not support
 ;StrobeCapabilities - Not support
-;StrobeMode - Not support
+; Strobe mode - real setting value
+;;; 0:BASE, 1:OFF, 2:AUTO, 3:ON, 4:TORCH, 5:MAX
+; Strobe mode - MSL value(convert array index)
+;;; 0:OFF, 1:ON, 2:AUTO, 3:REDEYE_REDUCTION, 4:SLOW_SYNC, 5:FRONT_CURTAIN, 6:REAR_CURTAIN, 7:PERMANENT
+StrobeMode = 1,-255,-255,-255,-255,-255,-255,-255 || 1
 ;StrobeStatus - Not support
 ;StrobeEV - Not support
 
diff --git a/mmfw-sysconf-simulator/opt/etc/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini
index 712fda9..7875531 100644
--- a/mmfw-sysconf-simulator/opt/etc/mmfw_camcorder_dev_video_sec.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini
@@ -39,13 +39,13 @@ RecommendPreviewFormatRecord = 7
 
 
 [Strobe]
-; Strobe control - real setting value
-;;; 1:OFF, 2:ON, 3:AUTO, 4:MOVIE_ON
-; Strobe control - MSL value(convert array index)
-;;; 0:OFF, 1:ON, 2:AUTO, 3:MOVIE_ON
-;StrobeControl = 1,2,3,4 || 3
+;StrobeControl - Not support
 ;StrobeCapabilities - Not support
-;StrobeMode - Not support
+; Strobe mode - real setting value
+;;; 0:BASE, 1:OFF, 2:AUTO, 3:ON, 4:TORCH, 5:MAX
+; Strobe mode - MSL value(convert array index)
+;;; 0:OFF, 1:ON, 2:AUTO, 3:REDEYE_REDUCTION, 4:SLOW_SYNC, 5:FRONT_CURTAIN, 6:REAR_CURTAIN, 7:PERMANENT
+StrobeMode = 1,-255,-255,-255,-255,-255,-255,-255 || 1
 ;StrobeStatus - Not support
 ;StrobeEV - Not support
 
diff --git a/mmfw-sysconf-simulator/opt/etc/mmfw_player.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini
index a91a2d4..cbbb981 100644
--- a/mmfw-sysconf-simulator/opt/etc/mmfw_player.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini
@@ -22,7 +22,7 @@ skip rescan = yes
 delay before repeat = 50 ; msec
 
 ; comma separated list of tocken which elemnts has it in it's name will not be used 
-element exclude keyword = 
+element exclude keyword = ffdec_, omx
 
 async start = yes 
 
diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index ad43282..92a72a1 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.1.22
-Release:    1
+Release:    3
 Group:      TO_BE/FILLED_IN
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -9,13 +9,24 @@ Source0:    %{name}-%{version}.tar.gz
 %description
 Multimedia Framework system configuration package
 
+%ifarch %{arm}
+%package -n mmfw-sysconf-cleansdk-target
+Summary:    Multimedia Framework system configuration package for clean SDK target binary
+Group:      TO_BE/FILLED_IN
+
+%description -n mmfw-sysconf-cleansdk-target
+Multimedia Framework system configuration package for clean SDK target binary
 
-%package simulator
+%else
+
+%package -n mmfw-sysconf-simulator
 Summary:    Multimedia Framework system configuration package for simulator
 Group:      TO_BE/FILLED_IN
 
-%description simulator
+%description -n mmfw-sysconf-simulator
 Multimedia Framework system configuration package for simulator
+%endif
+
 
 
 %prep
@@ -24,14 +35,37 @@ Multimedia Framework system configuration package for simulator
 %build
 
 %install
-mkdir -p %{buildroot}%{_sysconfdir}/
-cp -rf  mmfw-sysconf-simulator/etc/* %{buildroot}%{_sysconfdir}/
+rm -rf %{buildroot}
 
-mkdir -p %{buildroot}/opt/etc/mmfw-sysconf/mmfw-sysconf-simulator
-cp -rf  mmfw-sysconf-simulator/opt/etc/* %{buildroot}/opt/etc/
+%ifarch %{arm}
+	mkdir -p %{buildroot}/opt/etc/mmfw-sysconf
+	cp -arf mmfw-sysconf-cleansdk-target/* %{buildroot}
+%else
+	mkdir -p %{buildroot}/opt/etc/mmfw-sysconf
+	cp -arf mmfw-sysconf-simulator/* %{buildroot}
+%endif
 
+%post 
+
+%postun 
+
+%ifarch %{arm}
+%files -n mmfw-sysconf-cleansdk-target
+%defattr(-,root,root,-)
+/etc/asound.conf
+/etc/pulse/*
+/usr/etc/*.ini
+/usr/share/pulseaudio/alsa-mixer/paths/*.conf
+/usr/share/pulseaudio/alsa-mixer/paths/*.common
+/usr/share/pulseaudio/alsa-mixer/profile-sets/*.conf
+%else
 
-%files simulator
-%{_sysconfdir}/asound.conf
-/opt/etc/*
+%files -n mmfw-sysconf-simulator
+%defattr(-,root,root,-)
+/etc/asound.conf
 /etc/pulse/*
+/usr/etc/*.ini
+/usr/share/pulseaudio/alsa-mixer/paths/*.conf
+/usr/share/pulseaudio/alsa-mixer/paths/*.common
+/usr/share/pulseaudio/alsa-mixer/profile-sets/*.conf
+%endif