[all/camcorder] add new field "AudioDevice"

Change-Id: I13fdd879f3246263d2c699e138389d653933a1b3
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland
index 0b0cb1b..6b54675 100644 (file)
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland
@@ -38,8 +38,9 @@ UseZeroCopyFormat = 0
 DeviceCount = 2
 
 [AudioInput]
-AudiosrcElement = avsysaudiosrc | 3,0 | do-timestamp,1 | slave-method,3 | latency,0
-AudiomodemsrcElement = audiotestsrc | 2,0 | do-timestamp,1 | is-live,1
+AudioDevice = 0,1 || 0
+AudiosrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640
+AudiomodemsrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640
 
 [VideoOutput]
 ; DisplayDevice

diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x
index 9f16db4..51acee5 100644 (file)
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x
@@ -38,8 +38,9 @@ UseZeroCopyFormat = 0
 DeviceCount = 2
 
 [AudioInput]
-AudiosrcElement = avsysaudiosrc | 3,0 | do-timestamp,1 | slave-method,3 | latency,0
-AudiomodemsrcElement = audiotestsrc | 2,0 | do-timestamp,1 | is-live,1
+AudioDevice = 0,1 || 0
+AudiosrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640
+AudiomodemsrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640
 
 [VideoOutput]
 ; DisplayDevice

diff --git a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.wayland b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.wayland
index 41723e3..50ac63d 100644 (file)
--- a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.wayland
+++ b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.wayland
@@ -36,9 +36,9 @@ UseZeroCopyFormat = 0
 DeviceCount = 1
 
 [AudioInput]
-AudiosrcElement = audiotestsrc | 4,0 | do-timestamp,1 | slave-method,3 | latency,0 | is-live,1
-;AudiosrcElement = alsasrc | 3,0 | do-timestamp,1 | slave-method,3 | latency,0
-AudiomodemsrcElement = voicedatasrcbin | 0,0
+AudioDevice = 0,1 || 0
+AudiosrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640
+AudiomodemsrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640
 
 [VideoOutput]
 ; DisplayDevice

diff --git a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.x b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.x
index 5f07562..543c7fa 100644 (file)
--- a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.x
+++ b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.x
@@ -36,9 +36,9 @@ UseZeroCopyFormat = 0
 DeviceCount = 1
 
 [AudioInput]
-AudiosrcElement = audiotestsrc | 4,0 | do-timestamp,1 | slave-method,3 | latency,0 | is-live,1
-;AudiosrcElement = alsasrc | 3,0 | do-timestamp,1 | slave-method,3 | latency,0
-AudiomodemsrcElement = voicedatasrcbin | 0,0
+AudioDevice = 0,1 || 0
+AudiosrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640
+AudiomodemsrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640
 
 [VideoOutput]
 ; DisplayDevice

diff --git a/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.wayland b/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.wayland
index 41723e3..50ac63d 100644 (file)
--- a/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.wayland
+++ b/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.wayland
@@ -36,9 +36,9 @@ UseZeroCopyFormat = 0
 DeviceCount = 1
 
 [AudioInput]
-AudiosrcElement = audiotestsrc | 4,0 | do-timestamp,1 | slave-method,3 | latency,0 | is-live,1
-;AudiosrcElement = alsasrc | 3,0 | do-timestamp,1 | slave-method,3 | latency,0
-AudiomodemsrcElement = voicedatasrcbin | 0,0
+AudioDevice = 0,1 || 0
+AudiosrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640
+AudiomodemsrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640
 
 [VideoOutput]
 ; DisplayDevice

diff --git a/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.x b/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.x
index 5f07562..543c7fa 100644 (file)
--- a/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.x
+++ b/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.x
@@ -36,9 +36,9 @@ UseZeroCopyFormat = 0
 DeviceCount = 1
 
 [AudioInput]
-AudiosrcElement = audiotestsrc | 4,0 | do-timestamp,1 | slave-method,3 | latency,0 | is-live,1
-;AudiosrcElement = alsasrc | 3,0 | do-timestamp,1 | slave-method,3 | latency,0
-AudiomodemsrcElement = voicedatasrcbin | 0,0
+AudioDevice = 0,1 || 0
+AudiosrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640
+AudiomodemsrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640
 
 [VideoOutput]
 ; DisplayDevice

diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index fdaa3cc..0b651b5 100644 (file)
--- 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.5
+Version:    0.2.6
 Release:    0
 Group:      Multimedia/Configuration
 License:    Apache-2.0