tizen 2.3.1 releasetizen_2.3.1_releasesubmit/tizen_2.3.1/20150915.081627tizen_2.3.1

14 files changed, 288 insertions, 82 deletions

diff --git a/mmfw-sysconf-simulator/etc/pulse/client.conf b/mmfw-sysconf-simulator/etc/pulse/client.conf
index b3738ab..8e0de79 100644
--- a/mmfw-sysconf-simulator/etc/pulse/client.conf
+++ b/mmfw-sysconf-simulator/etc/pulse/client.conf
@@ -30,4 +30,4 @@
 ; cookie-file =
 
 ; enable-shm = yes
-; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
+shm-size-bytes = 2097152 # setting this 0 will use the system-default, usually 64 MiB
diff --git a/mmfw-sysconf-simulator/etc/pulse/daemon.conf b/mmfw-sysconf-simulator/etc/pulse/daemon.conf
index 28b95c1..506fe7d 100644
--- a/mmfw-sysconf-simulator/etc/pulse/daemon.conf
+++ b/mmfw-sysconf-simulator/etc/pulse/daemon.conf
@@ -19,12 +19,12 @@
 ## more information. Default values a commented out.  Use either ; or # for
 ## commenting.
 
-; daemonize = no
+daemonize = yes
 ; fail = yes
 ; allow-module-loading = yes
 ; allow-exit = yes
 ; use-pid-file = yes
-; system-instance = no
+system-instance = yes
 ; enable-shm = yes
 ; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
 ; lock-memory = no
@@ -50,11 +50,11 @@ log-target = dlog-color
 ; log-time = no
 ; log-backtrace = 0
 
-resample-method = ffmpeg
+resample-method = speex-fixed-3
 ; enable-remixing = yes
 ; enable-lfe-remixing = no
 
-; flat-volumes = yes
+flat-volumes = no
 
 ; rlimit-fsize = -1
 ; rlimit-data = -1
diff --git a/mmfw-sysconf-simulator/etc/pulse/default.pa b/mmfw-sysconf-simulator/etc/pulse/default.pa
index e0737e8..f4807e1 100644
--- a/mmfw-sysconf-simulator/etc/pulse/default.pa
+++ b/mmfw-sysconf-simulator/etc/pulse/default.pa
@@ -111,10 +111,10 @@ load-module module-suspend-on-idle
 load-module module-console-kit
 
 ### Enable positioned event sounds
-load-module module-position-event-sounds
+#load-module module-position-event-sounds
 
 ### Cork music streams when a phone stream is active
-load-module module-cork-music-on-phone
+#load-module module-cork-music-on-phone
 
 # X11 modules should not be started from default.pa so that one daemon
 # can be shared by multiple sessions.
diff --git a/mmfw-sysconf-simulator/etc/pulse/system.pa b/mmfw-sysconf-simulator/etc/pulse/system.pa
index 0620d20..aedede5 100644
--- a/mmfw-sysconf-simulator/etc/pulse/system.pa
+++ b/mmfw-sysconf-simulator/etc/pulse/system.pa
@@ -19,14 +19,26 @@
 # This startup script is used only if PulseAudio is started in system
 # mode.
 
+### Custom policy module to route between bt<=speaker
+load-module module-policy
+
+### Stream Manager module
+load-module module-stream-mgr ipc_type=pipe
+load-module module-role-ducking global=1 volume=0
+
+### Currently do not use module-udev-detect, because there is some problem.
+### 	STATIC DEVICE LOAD
+#load-module module-alsa-sink sink_name=alsa_output.0.analog-stereo device=hw:0,3
+#load-module module-alsa-source source_name=alsa_input.0.analog-stereo device=hw:0,0
+###	AUTOMATIC DEVICE LOAD
 ### Automatically load driver modules depending on the hardware available
-.ifexists module-hal-detect.so
-#load-module module-hal-detect
-.else
-### Alternatively use the static hardware detection module (for systems that
-### lack HAL support)
+#.ifexists module-udev-detect.so
+#load-module module-udev-detect
+#.else
+### Use the static hardware detection module (for systems that lack udev/hal support)
 load-module module-detect
-.endif
+#.endif
+
 
 ### Load several protocols
 .ifexists module-esound-protocol-unix.so
@@ -36,8 +48,7 @@ load-module module-native-protocol-unix
 
 load-module module-bluetooth-discover
 
-### Custom policy module to route between bt<=speaker
-load-module module-policy
+
 
 ### Automatically restore the volume of streams and devices
 #load-module module-stream-restore
@@ -46,6 +57,11 @@ load-module module-policy
 ### Automatically restore the default sink/source when changed by the user during runtime
 load-module module-default-device-restore
 
+.ifexists module-dbus-protocol.so
+### If you want to allow TCP connections, set access to "remote" or "local,remote".
+load-module module-dbus-protocol access=local
+.endif
+
 ### Automatically move streams to the default sink if the sink they are
 ### connected to dies, similar for sources
 load-module module-rescue-streams
@@ -62,4 +78,8 @@ load-module module-suspend-on-idle
 ### Set default source (not to use alsa_sink monitor which is index 0)
 set-default-source alsa_input.0.analog-stereo
 
+load-module module-null-sink
+load-module module-null-source
+
 load-module module-remap-sink sink_name=mono_alsa master=alsa_output.0.analog-stereo channels=1
+load-sample camera-shutter /usr/share/sounds/mm-camcorder/capture_shutter_02.wav
diff --git a/mmfw-sysconf-simulator/usr/etc/gst-openmax.conf b/mmfw-sysconf-simulator/usr/etc/gst-openmax.conf
index 9c0203c..9c0203c 100755..100644
--- a/mmfw-sysconf-simulator/usr/etc/gst-openmax.conf
+++ b/mmfw-sysconf-simulator/usr/etc/gst-openmax.conf
diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_audio_pcm_dump.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_audio_pcm_dump.ini
new file mode 100644
index 0000000..54e2d2e
--- /dev/null
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_audio_pcm_dump.ini
@@ -0,0 +1,12 @@
+
+[pcm_dump]
+
+# playback
+
+pa_sink                        = n
+pa_sink_input                  = n
+
+# capture
+
+pa_source                      = n
+pa_source_output               = n
diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_audio_volume.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_audio_volume.ini
new file mode 100755
index 0000000..f361b01
--- /dev/null
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_audio_volume.ini
@@ -0,0 +1,20 @@
+[volumes]
+system                         = 0, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 82, 84, 86, 88, 90
+notification                   = 0, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 95
+alarm                          = 0, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 90
+ringtone                       = 0, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 90
+media                          = 0, 44, 48, 52, 56, 61, 66, 70, 74, 78, 82, 85, 88, 91, 94, 97
+call                           = 60, 65, 70, 76, 82, 88, 94, 100
+voip                           = 60, 65, 70, 76, 82, 88, 94, 100
+voice                          = 0, 55, 58, 61, 64, 67, 70, 73, 76, 79, 82, 85, 88, 91, 94, 97
+gain_dialer                    = 1.00
+gain_touch                     = 1.00
+gain_af                        = 0.70
+gain_shutter1                  = 0.14
+gain_shutter2                  = 1.00
+gain_camcording                = 0.30
+gain_midi                      = 1.00
+gain_booting                   = 0.40
+gain_video                     = 0.90
+gain_tts                       = 1.00
+
diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
index 457c57e..6fb2e22 100644
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
@@ -35,34 +35,36 @@ VideosrcElement = v4l2src | 1,1 | do-timestamp,1 | device,/dev/video0
 UseVideoscale = 0
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
 UseZeroCopyFormat = 0
+DeviceCount = 2
+SupportMediaPacketPreviewCb = 0
 
 [AudioInput]
-AudiosrcElement = avsysaudiosrc | 3,0 | do-timestamp,1 | slave-method,3 | latency,0
+AudiosrcElement = pulsesrc | 2,0 | do-timestamp,1 | slave-method,3
 AudiomodemsrcElement = audiotestsrc | 2,0 | do-timestamp,1 | is-live,1
 
 [VideoOutput]
 ; DisplayDevice
 ;;; 0: MAIN LCD, 1: SUB LCD, 2:TV OUT, 3: MAIN LCD and SUB LCD, 4: MAIN LCD and TV OUT
 DisplayDevice = 0 || 0
+; DisplayMode
+;;; 0: Default, 1: Pri Video ON and Sec Video Full-Screen, 2: Pri Video OFF and Sec Video Full-Screen
+DisplayMode = 0 || 0
 ; Videosink
 ;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface
 Videosink = 0,1,3 || 0
-;VideosinkElementX = ximagesink | 4,0 | force-aspect-ratio,1 | handle-events,1 | qos,0 | sync,0
-VideosinkElementX = xvimagesink | 5,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-buffer,0 | qos,0 | sync,0
-VideosinkElementEvas = evasimagesink | 3,0 | enable-last-buffer,0 | qos,0 | sync,0
-;VideosinkElementGL = glimagesink | 0,0
+VideosinkElementX = xvimagesink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-buffer,0 | qos,0 | sync,0 | show-preroll-frame,0
+VideosinkElementEvas = evaspixmapsink | 4,0 | enable-last-buffer,0 | qos,0 | sync,0 | show-preroll-frame,0
 VideosinkElementNull = fakesink | 3,0 | qos,0 | sync,0 | enable-last-buffer,0
 UseVideoscale = 0
 VideoscaleElement = videoscale | 1,0 | method,1
 
 [VideoEncoder]
-H263 = emulenc_h263p | 0,0
-MPEG4 = emulenc_mpeg4 | 0,0
-THEORA = theoraenc | 1,0 | num-bufs,4
+H263 = maru_h263penc | 0,0
+MPEG4 = maru_mpeg4enc | 0,0
 
 [AudioEncoder]
 AMR = amrnbenc | 0,0
-AAC = ffenc_aac | 0,0
+AAC = maru_aacenc | 0,0
 WAVE = wavenc | 0,0
 VORBIS = vorbisenc | 0,0
 
@@ -82,7 +84,7 @@ UseVideoEncoderQueue = 1
 VideoProfile = 0
 VideoAutoAudioConvert = 1
 VideoAutoAudioResample = 0
-VideoAutoColorSpace = 0
+VideoAutoColorSpace = 1
 AudioProfile = 1
 AudioAutoAudioConvert = 1
 AudioAutoAudioResample = 0
diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini
index 1437420..5087251 100644
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini
@@ -25,11 +25,15 @@ InputIndex = 0,-255 || 0
 DeviceName = virtual driver
 PreviewResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
 CaptureResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
+VideoResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
 FPS = 30 || 30
 ; PictureForamt - MSL value
 ;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
 PictureFormat = 4,7,8 || 4
 Overlay = 0,1 || 1
+; Recommend display rotation
+;;; 0:NONE, 1:90, 2:180, 3:270
+RecommendDisplayRotation = 0
 ; Recommend preview format for capture
 ;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED, 14:INTERLEAVED_JPEG_UYVY
 RecommendPreviewFormatCapture = 7
@@ -39,6 +43,9 @@ RecommendPreviewFormatRecord = 7
 ; Recommend preview resolution
 ;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9)
 RecommendPreviewResolution = 640,480 | 352,288 || 640,480
+; Camera facing direction
+;;; 0:REAR, 1:FRONT
+FacingDirection = 0
 
 
 [Strobe]
@@ -73,11 +80,9 @@ WhiteBalance = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
 ;;; 21:SOLARIZATION_4, 22:SKETCH_1, 23:SKETCH_2, 24:SKETCH_3, 25:SKETCH_4
 ColorTone = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
 
-; Flip - real setting value
-;;; 0:NONE, 1:VERTICAL, 2:HORIZONTAL
 ; Flip - MSL value(convert array index)
-;;; 0:HORIZONTAL, 1:VERTICAL, 2:NONE
-;Flip = 2,1,0 || 0
+;;; 0:NONE, 1:HORIZONTAL, 2:VERTICAL, 3:BOTH
+Flip = 0,-255,-255,-255 || 0
 
 ; Wide Dynamic Range - real setting value
 ;;; N/A
@@ -109,7 +114,7 @@ WDR = 0,-255,-255 || 0
 ;;; N/A
 ; Focus mode - MSL value(convert array index)
 ;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
-FocusMode = -255,0,-255,-255,-255,-255 || 0
+FocusMode = 0,-255,-255,-255,-255,-255 || 0
 
 ; Auto focus type - real setting value
 ;;; N/A
@@ -146,6 +151,12 @@ ProgramMode = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255
 ;;; 0:OFF, 1:ON, 2:AUTO, 3:MOVIE_ON
 AntiHandshake = 0,-255,-255,-255 || 0
 
+; Video-stabilization - real setting value
+;;; 0:OFF, 1:ON
+; Video-stabilization - MSL value(convert array index)
+;;; 0:OFF, 1:ON
+VideoStabilization = 0 || 0
+
 ; Face zoom mode
 ;;; 0:OFF, 1:ON
 FaceZoomMode = 0 || 0
@@ -159,7 +170,7 @@ FaceZoomLevel = 0,0 || 0
 ;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
 OutputMode = 4,7,8,13 || 13
 JpegQuality = 0,100 || 50
-MultishotNumber = 1,255 || 1
+MultishotNumber = 1,1 || 1
 SensorEncodedCapture = 0
 ; Support HDR
 ;;; 0: OFF, 1: ON, 2: ON and Original
@@ -168,6 +179,7 @@ SupportHDR = 0,-255,-255 || 0
 
 [Detect]
 ; Detect mode
+;;; No need to convert
 ;;; 0:OFF, 1:ON
 DetectMode = 0,-255 || 0
 ;DetectNumber - Not support
diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini
index 6434b0a..5fa733e 100644
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini
@@ -25,11 +25,15 @@ InputIndex = -255,0 || 0
 DeviceName = virtual driver
 PreviewResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
 CaptureResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
+VideoResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
 FPS = 30 || 30
 ; PictureForamt - MSL value
 ;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
 PictureFormat = 4,7,8 || 4
 Overlay = 0,1 || 1
+; Recommend display rotation
+;;; 0:NONE, 1:90, 2:180, 3:270
+RecommendDisplayRotation = 0
 ; Recommend preview format for capture
 ;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED, 14:INTERLEAVED_JPEG_UYVY
 RecommendPreviewFormatCapture = 7
@@ -39,6 +43,9 @@ RecommendPreviewFormatRecord = 7
 ; Recommend preview resolution
 ;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9)
 RecommendPreviewResolution = 640,480 | 352,288 || 640,480
+; Camera facing direction
+;;; 0:REAR, 1:FRONT
+FacingDirection = 1
 
 
 [Strobe]
@@ -73,11 +80,9 @@ WhiteBalance = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
 ;;; 21:SOLARIZATION_4, 22:SKETCH_1, 23:SKETCH_2, 24:SKETCH_3, 25:SKETCH_4
 ColorTone = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
 
-; Flip - real setting value
-;;; 0:NONE, 1:VERTICAL, 2:HORIZONTAL
 ; Flip - MSL value(convert array index)
-;;; 0:HORIZONTAL, 1:VERTICAL, 2:NONE
-;Flip = 2,1,0 || 0
+;;; 0:NONE, 1:HORIZONTAL, 2:VERTICAL, 3:BOTH
+Flip = 0,-255,-255,-255 || 0
 
 ; Wide Dynamic Range - real setting value
 ;;; N/A
@@ -109,7 +114,7 @@ WDR = 0,-255,-255 || 0
 ;;; N/A
 ; Focus mode - MSL value(convert array index)
 ;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
-FocusMode = -255,0,-255,-255,-255,-255 || 0
+FocusMode = 0,-255,-255,-255,-255,-255 || 0
 
 ; Auto focus type - real setting value
 ;;; N/A
@@ -146,6 +151,12 @@ ProgramMode = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255
 ;;; 0:OFF, 1:ON, 2:AUTO, 3:MOVIE_ON
 AntiHandshake = 0,-255,-255,-255 || 0
 
+; Video-stabilization - real setting value
+;;; 0:OFF, 1:ON
+; Video-stabilization - MSL value(convert array index)
+;;; 0:OFF, 1:ON
+VideoStabilization = 0 || 0
+
 ; Face zoom mode
 ;;; 0:OFF, 1:ON
 FaceZoomMode = 0 || 0
@@ -159,7 +170,7 @@ FaceZoomLevel = 0,0 || 0
 ;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
 OutputMode = 4,7,8,13 || 13
 JpegQuality = 0,100 || 50
-MultishotNumber = 1,255 || 1
+MultishotNumber = 1,1 || 1
 SensorEncodedCapture = 0
 ; Support HDR
 ;;; 0: OFF, 1: ON, 2: ON and Original
diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini
index 75871ae..13fdc13 100644
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini
@@ -1,61 +1,61 @@
-[general] 
+[general]
 
-; if disabled typefind element will used directely 
-use decodebin = no ; async state change problem exist 
+; if disabled typefind element will used directely
+use decodebin = no ; async state change problem exist
 
-use sink handler = yes 
+use sink handler = yes
 
-disable segtrap = yes ; same effect with --gst-disable-segtrap 
+disable segtrap = yes ; same effect with --gst-disable-segtrap
 
 ; set default videosink element according to video surface type(X, EVAS, NULL)
 videosink element x = xvimagesink
-videosink element evas = evasimagesink
+videosink element evas = evaspixmapsink
 videosink element fake = fakesink
 
 video converter element = ffmpegcolorspace
 
-audiosink element = avsysaudiosink 
+audiosink element = pulsesink
 
-drmsrc element = filesrc 
+drmsrc element = filesrc
 
-; if yes. gstreamer will not update registry 
-skip rescan = yes 
+; if yes. gstreamer will not update registry
+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 = ffdec_, omx_
+; comma separated list of tocken which elemnts has it in it's name will not be used
+element exclude keyword = omx_
 
-async start = yes 
+async start = yes
 
 multiple codec supported = yes
 
-; parameters for initializing gstreamer 
-gstparam1 = 
-gstparam2 = 
-gstparam3 = 
-gstparam4 = 
-gstparam5 = 
+; parameters for initializing gstreamer
+gstparam1 =
+gstparam2 =
+gstparam3 =
+gstparam4 =
+gstparam5 =
 
-; generating dot file representing pipeline state 
-generate dot = no 
+; generating dot file representing pipeline state
+generate dot = no
 
-; parameter for clock provide in audiosink 
-provide clock = yes 
+; parameter for clock provide in audiosink
+provide clock = yes
 
-; allowed timeout for changing pipeline state 
-live state change timeout = 30 ; sec 
-localplayback state change timeout = 10 ; sec 
+; allowed timeout for changing pipeline state
+live state change timeout = 30 ; sec
+localplayback state change timeout = 10 ; sec
 
-; delay in msec for sending EOS 
-eos delay = 150 ; msec 
+; delay in msec for sending EOS
+eos delay = 150 ; msec
 
 
 [http streaming]
 
-httppsrc element = souphttpsrc
+httpsrc element = souphttpsrc
 
 ; if set, use file or not use memory for buffering
-http file buffer path = /opt/media
+http file buffer path = /opt/usr/media
 
 http buffering limit = 99.0 ; percent
 
@@ -79,26 +79,18 @@ rtsp do typefinding = no; if no, caps on rtspsrc:src pad will be used for autopl
 rtsp error concealment = yes
 
 
-[hw accelation] 
+[hw accelation]
 use video hw accel = no
 
 
-[sound effect]
-; preset audio filter setting
-audio filter preset = no
+[priority]
 
-; custom audio filter setting (EQ/extension)
-audio filter custom = no
+use priority setting = no
 
+demux = 95
 
-[priority] 
-
-use priority setting = no 
-
-demux = 95 
-
-videosink = 96 
+videosink = 96
 
 audiosink = 97
 
-ringbuffer = 98 
+ringbuffer = 98
diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_player_audio_effect.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_player_audio_effect.ini
new file mode 100644
index 0000000..1394608
--- /dev/null
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_player_audio_effect.ini
@@ -0,0 +1,17 @@
+[audio effect]
+; name of audio effect element
+audio effect element = audioeq
+
+; preset audio effect setting
+audio effect preset = no
+
+; custom audio effect setting (EQ/extension)
+audio effect custom = yes
+audio effect custom list = 0
+
+audio effect custom eq band num = 7 ; number of EQ bands
+audio effect custom eq band width = 33, 90, 242, 649, 1743, 4676, 12544 ; list of each EQ band width (Hz)
+audio effect custom eq band freq = 36, 98, 265, 711, 1907, 5117, 13727 ; list of each EQ band central frequency (Hz)
+
+audio effect custom min list = -12 ; list of minimum level value (the first element is for EQ, others for extension effect)
+audio effect custom max list = 12 ; list of maximum level value (the first element is for EQ, others for extension effect)
diff --git a/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-output.conf.common b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-output.conf.common
index 3204846..90c2bb0 100644
--- a/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-output.conf.common
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/paths/analog-output.conf.common
@@ -95,7 +95,7 @@
 
 [Element PCM]
 switch = ignore
-volume = merge
+volume = ignore
 override-map.1 = all
 override-map.2 = all-left,all-right
 
diff --git a/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/profile-sets/tizen_usb.conf b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/profile-sets/tizen_usb.conf
new file mode 100644
index 0000000..31bc6a6
--- /dev/null
+++ b/mmfw-sysconf-simulator/usr/share/pulseaudio/alsa-mixer/profile-sets/tizen_usb.conf
@@ -0,0 +1,120 @@
+# This file is part of PulseAudio.
+#
+# PulseAudio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+#
+# PulseAudio is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with PulseAudio; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+; Default profile definitions for the ALSA backend of PulseAudio. This
+; is used as fallback for all cards that have no special mapping
+; assigned (and should be good enough for the vast majority of
+; cards). If you want to assign a different profile set than this one
+; to a device, either set the udev property PULSE_PROFILE_SET for the
+; card, or use the "profile_set" module argument when loading
+; module-alsa-card.
+;
+; So what is this about? Simply, what we do here is map ALSA devices
+; to how they are exposed in PA. We say which ALSA device string to
+; use to open a device, which channel mapping to use then, and which
+; mixer path to use. This is encoded in a 'mapping'. Multiple of these
+; mappings can be bound together in a 'profile' which is then directly
+; exposed in the UI as a card profile. Each mapping assigned to a
+; profile will result in one sink/source to be created if the profile
+; is selected for the card.
+;
+; Additionally, the path set configuration files can describe the
+; decibel values assigned to the steps of the volume elements. This
+; can be used to work around situations when the alsa driver doesn't
+; provide any decibel information, or when the information is
+; incorrect.
+
+
+; [General]
+; auto-profiles = no | yes                  # Instead of defining all profiles manually, autogenerate
+;                                           # them by combining every input mapping with every output mapping.
+;
+; [Mapping id]
+; device-strings = ...                      # ALSA device string. %f will be replaced by the card identifier.
+; channel-map = ...                         # Channel mapping to use for this device
+; description = ...
+; paths-input = ...                         # A list of mixer paths to use. Every path in this list will be probed.
+;                                           # If multiple are found to be working they will be available as device ports
+; paths-output = ...
+; element-input = ...                       # Instead of configuring a full mixer path simply configure a single
+;                                           # mixer element for volume/mute handling
+; element-output = ...
+; priority = ...
+; direction = any | input | output          # Only useful for?
+;
+; [Profile id]
+; input-mappings = ...                      # Lists mappings for sources on this profile, those mapping must be
+;                                           # defined in this file too
+; output-mappings = ...                     # Lists mappings for sinks on this profile, those mappings must be
+;                                           # defined in this file too
+; description = ...
+; priority = ...                            # Numeric value to deduce priority for this profile
+; skip-probe = no | yes                     # Skip probing for availability? If this is yes then this profile
+;                                           # will be assumed as working without probing. Makes initialization
+;                                           # a bit faster but only works if the card is really known well.
+;
+; [DecibelFix element]                      # Decibel fixes can be used to work around missing or incorrect dB
+;                                           # information from alsa. A decibel fix is a table that maps volume steps
+;                                           # to decibel values for one volume element. The "element" part in the
+;                                           # section title is the name of the volume element.
+;                                           #
+;                                           # NOTE: This feature is meant just as a help for figuring out the correct
+;                                           # decibel values. PulseAudio is not the correct place to maintain the
+;                                           # decibel mappings!
+;                                           #
+;                                           # If you need this feature, then you should make sure that when you have
+;                                           # the correct values figured out, the alsa driver developers get informed
+;                                           # too, so that they can fix the driver.
+;
+; db-values = ...                           # The option value consists of pairs of step numbers and decibel values.
+;                                           # The pairs are separated with whitespace, and steps are separated from
+;                                           # the corresponding decibel values with a colon. The values must be in an
+;                                           # increasing order. Here's an example of a valid string:
+;                                           #
+;                                           #     "0:-40.50  1:-38.70  3:-33.00  11:0"
+;                                           #
+;                                           # The lowest step imposes a lower limit for hardware volume and the
+;                                           # highest step correspondingly imposes a higher limit. That means that
+;                                           # that the mixer will never be set outside those values - the rest of the
+;                                           # volume scale is done using software volume.
+;                                           #
+;                                           # As can be seen in the example, you don't need to specify a dB value for
+;                                           # each step. The dB values for skipped steps will be linearly interpolated
+;                                           # using the nearest steps that are given.
+
+[General]
+auto-profiles = yes
+
+[Mapping usb-analog-stereo]
+device-strings = hw:%f
+channel-map = left,right
+paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
+priority = 10
+direction = output
+
+[Mapping usb-analog-surround-51]
+device-strings = hw:%f
+;channel-map = front-left,front-right,front-center,lfe,rear-left,rear-right
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono
+priority = 180
+direction = output
+
+; An example for defining multiple-sink profiles
+#[Profile output:analog-stereo+output:iec958-stereo+input:analog-stereo]
+#description = Foobar
+#output-mappings = analog-stereo iec958-stereo
+#input-mappings = analog-stereo