[simulator/player,camera] changed codecs that are used in the emulator.

Change-Id: I68ac20b45a77003bb8881b2b7f51e2d586c0efc3

diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
index de210ba..e6a8af8 100644 (file)
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
@@ -55,8 +55,8 @@ UseVideoscale = 0
 VideoscaleElement = videoscale | 1,0 | method,1
 
 [VideoEncoder]
-H263 = emulenc_h263p | 0,0
-MPEG4 = emulenc_mpeg4 | 0,0
+H263 = maru_h263penc | 0,0
+MPEG4 = maru_mpeg4enc | 0,0
 THEORA = theoraenc | 1,0 | num-bufs,4
 
 [AudioEncoder]

diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini
index 95fb89f..333acac 100644 (file)
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini
@@ -23,7 +23,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 = ffdec_, omx_
+element exclude keyword = emuldec_, ffdec_, omx_
 
 async start = yes 
 

diff --git a/packaging/mmfw-sysconf-simulator.spec b/packaging/mmfw-sysconf-simulator.spec
index 959f681..ae767b8 100644 (file)
--- a/packaging/mmfw-sysconf-simulator.spec
+++ b/packaging/mmfw-sysconf-simulator.spec
@@ -1,6 +1,6 @@
 Name:       mmfw-sysconf-simulator
 Summary:    Multimedia Framework system configuration package
-Version:    0.1.70
+Version:    0.1.71
 Release:    0
 Group:      TO_BE/FILLED_IN
 License:    Apache-2.0