tizen 2.4 releasetizen_2.4_mobile_releasesubmit/tizen_2.4/20151028.064447accepted/tizen/2.4/mobile/20151029.032343accepted/tizen_2.4_mobile

7 files changed, 32 insertions, 81 deletions

diff --git a/mmfw-sysconf-e3250/etc/pulse/client.conf b/mmfw-sysconf-e3250/etc/pulse/client.conf
index b78d121..afd70d9 100644
--- a/mmfw-sysconf-e3250/etc/pulse/client.conf
+++ b/mmfw-sysconf-e3250/etc/pulse/client.conf
@@ -24,7 +24,7 @@
 ; default-server =
 ; default-dbus-server =
 
-; autospawn = yes
+autospawn = no
 ; daemon-binary = /usr/bin/pulseaudio
 ; extra-arguments = --log-target=syslog
 
diff --git a/mmfw-sysconf-e3250/etc/pulse/daemon.conf b/mmfw-sysconf-e3250/etc/pulse/daemon.conf
index f790bc3..f28de28 100644
--- a/mmfw-sysconf-e3250/etc/pulse/daemon.conf
+++ b/mmfw-sysconf-e3250/etc/pulse/daemon.conf
@@ -45,8 +45,8 @@ realtime-priority = 5
 ; load-default-script-file = yes
 ; default-script-file = /etc/pulse/default.pa
 
-log-target = dlog
-log-level = debug
+log-target = dlog-color
+log-level = verbose
 ; log-meta = no
 ; log-time = no
 ; log-backtrace = 0
diff --git a/mmfw-sysconf-e3250/etc/pulse/system.pa b/mmfw-sysconf-e3250/etc/pulse/system.pa
index de6f799..b44ff09 100755
--- a/mmfw-sysconf-e3250/etc/pulse/system.pa
+++ b/mmfw-sysconf-e3250/etc/pulse/system.pa
@@ -41,7 +41,7 @@ load-module module-esound-protocol-unix
 load-module module-native-protocol-unix
 
 load-module module-bluetooth-policy
-load-module module-bluetooth-discover aptx_lib_name=libbtaptx-armv6L.so
+load-module module-bluetooth-discover
 
 ### Custom policy module to route between bt<=speaker
 load-module module-policy
diff --git a/mmfw-sysconf-e3250/usr/etc/mmfw_audio_volume.ini b/mmfw-sysconf-e3250/usr/etc/mmfw_audio_volume.ini
index ff2678a..03e9136 100644
--- a/mmfw-sysconf-e3250/usr/etc/mmfw_audio_volume.ini
+++ b/mmfw-sysconf-e3250/usr/etc/mmfw_audio_volume.ini
@@ -6,7 +6,7 @@ ringtone                       = 0, 58, 61, 64, 67, 70, 72, 74, 76, 78, 80, 82,
 media                          = 0, 59, 62, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 90
 call                           = 100, 100, 100, 100, 100, 100, 100
 voip                           = 100, 100, 100, 100, 100, 100, 100
-svoice                         = 100, 100, 100, 100, 100, 100, 100
+voice                          = 0, 59, 62, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 90
 gain_dialer                    = 1.0
 gain_touch                     = 1.0
 gain_af                        = 1.0
@@ -17,4 +17,3 @@ gain_midi                      = 1.0
 gain_booting                   = 1.0
 gain_video                     = 1.0
 gain_tts                       = 1.0
-
diff --git a/mmfw-sysconf-e3250/usr/etc/mmfw_camcorder.ini b/mmfw-sysconf-e3250/usr/etc/mmfw_camcorder.ini
index d9b8415..b62c3b5 100644
--- a/mmfw-sysconf-e3250/usr/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-e3250/usr/etc/mmfw_camcorder.ini
@@ -40,10 +40,9 @@ ImageFilterInputFormat = 7
 SupportMediaPacketPreviewCb = 0
 
 [AudioInput]
-;AudiosrcElement = audiotestsrc | 2,0 | do-timestamp,1 | slave-method,3
-AudiosrcElement = pulsesrc | 2,0 | do-timestamp,1 | slave-method,3
-AudiomodemsrcElement = voicedatasrcbin | 0,0
-;AudiomodemsrcElement = dpramsrcbin | 1,0 | blocksize,644
+AudioDevice = 0,1 || 0
+AudiosrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640
+AudiomodemsrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640
 
 [VideoOutput]
 ; DisplayDevice
@@ -55,23 +54,23 @@ DisplayMode = 0,1,2 || 0
 ; Videosink
 ;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface
 Videosink = 0,1,3 || 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
+VideosinkElementX = xvimagesink | 7,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-sample,0 | qos,0 | sync,0 | show-preroll-frame,0 | handle-expose,0
+VideosinkElementEvas = evaspixmapsink | 4,0 | enable-last-sample,0 | qos,0 | sync,0 | show-preroll-frame,0
 ;VideosinkElementGL = glimagesink | 0,0
-VideosinkElementNull = fakesink | 4,0 | qos,0 | sync,0 | enable-last-buffer,0 | show-preroll-frame,0
+VideosinkElementNull = fakesink | 4,0 | qos,0 | sync,0 | enable-last-sample,0 | show-preroll-frame,0
 UseVideoscale = 0
 VideoscaleElement = videoscale | 0,0
-VideoconvertElement = ffmpegcolorspace | 0,0
+VideoconvertElement = videoconvert | 0,0
 
 [VideoEncoder]
-H263 = ffenc_h263p | 0,0
+H263 = avenc_h263p | 1,0 | compliance, -2
 ;H264 = omx_h264enc | 0,0
-MPEG4 = ffenc_mpeg4 | 0,0
+MPEG4 = avenc_mpeg4 | 1,0 | compliance, -2
 
 [AudioEncoder]
 AMR = amrnbenc | 0,0
 ;MP3 = lame | 0,0
-AAC = ffenc_aac | 0,0
+AAC = avenc_aac | 1,0 | compliance, -2
 WAVE = wavenc | 0,0
 
 [ImageEncoder]
@@ -105,11 +104,11 @@ PassFirstVideoFrame = 0
 SupportAudioTuning = 1
 
 [Mux]
-3GP = ffmux_3gp | 0,0
-AMR = ffmux_amr | 0,0
-MP4 = ffmux_mp4 | 0,0
+3GP = avmux_3gp | 0,0
+AMR = avmux_amr | 0,0
+MP4 = avmux_mp4 | 0,0
 AVI = avimux | 0,0
 MATROSKA = matroskamux | 0,0
 WAV = wavenc | 0,0
-AAC = ffmux_adts | 0,0
+AAC = avmux_adts | 0,0
 
diff --git a/mmfw-sysconf-e3250/usr/etc/mmfw_player.ini b/mmfw-sysconf-e3250/usr/etc/mmfw_player.ini
index 54d61bf..b445680 100644..100755
--- a/mmfw-sysconf-e3250/usr/etc/mmfw_player.ini
+++ b/mmfw-sysconf-e3250/usr/etc/mmfw_player.ini
@@ -1,47 +1,45 @@
 [general]
 
-; if disabled typefind element will used directely
-use decodebin = yes ; async state change problem exist
-
-use sink handler = yes
-
 disable segtrap = yes ; same effect with --gst-disable-segtrap
 
-; set default videosink element according to video surface type(X, EVAS, NULL)
+; set default videosink element according to video surface type
 videosink element x = xvimagesink
 videosink element evas = evaspixmapsink
 videosink element fake = fakesink
 
-video converter element = ffmpegcolorspace
+video converter element = videoconvert
 
 audiosink element = pulsesink
 
-drmsrc element = filesrc
-
 ; if yes. gstreamer will not update registry
 skip rescan = yes
+
 delay before repeat = 350 ; msec
 
 ; comma separated list of tocken which elemnts has it in it's name will not be used
 element exclude keyword =
 
-async start = yes
+; comma separated list of tocken
+unsupported codec keyword = divx
 
-multiple codec supported = yes
+async start = yes
 
 ; parameters for initializing gstreamer
-;gstparam1 = --gst-disable-registry-usage ; --gst-plugin-load
+gstparam1 = --gst-debug=2
 gstparam2 =
 gstparam3 =
 gstparam4 =
 gstparam5 =
 
 ; generating dot file representing pipeline state
+; export GST_DEBUG_DUMP_DOT_DIR=
 generate dot = no
 
-; parameter for clock provide in audiosink
-provide clock for music = yes
-provide clock for video = no
+; parameter is for only video to be determined
+; which clock will be used
+; if yes, system clock will be used
+; apart from this, audiosink is clock provider for audio
+use system clock = yes
 
 ; allowed timeout for changing pipeline state
 live state change timeout = 30 ; sec
@@ -50,57 +48,13 @@ localplayback state change timeout = 10 ; sec
 ; delay in msec for sending EOS
 eos delay = 150 ; msec
 
-
 [http streaming]
 
 httpsrc element = souphttpsrc
 
 ; if set, use file or not use memory for buffering
 http file buffer path = /opt/usr/media
-
 http buffering limit = 99.0 ; percent
-
 http max size bytes = 1048576 ; bytes
-
 http buffering time = 1.2
-
 http timeout = 20 ; sec
-
-
-[rtsp streaming]
-
-rtspsrc element = secrtspsrc
-
-rtsp buffering time = 5000; msec
-
-rtsp rebuffering time = 15000; msec
-
-rtsp do typefinding = no; if no, caps on rtspsrc:src pad will be used for autoplugging
-
-rtsp error concealment = yes
-
-
-[hw accelation]
-use video hw accel = yes
-
-
-[priority]
-
-use priority setting = no
-
-demux = 95
-
-videosink = 96
-
-audiosink = 97
-
-ringbuffer = 98
-
-[subtitle]
-
-use subtitle setting = no
-
-subtitle uri =
-
-subtitle silent = no
-
diff --git a/mmfw-sysconf-e3250/usr/etc/mmfw_player_audio_effect.ini b/mmfw-sysconf-e3250/usr/etc/mmfw_player_audio_effect.ini
index 396eef7..1394608 100644
--- a/mmfw-sysconf-e3250/usr/etc/mmfw_player_audio_effect.ini
+++ b/mmfw-sysconf-e3250/usr/etc/mmfw_player_audio_effect.ini
@@ -15,4 +15,3 @@ audio effect custom eq band freq = 36, 98, 265, 711, 1907, 5117, 13727 ; list of
 
 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)
-