merge with master

diff --git a/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder_dev_video_pri.ini
index cebd690..fae0ddd 100644 (file)
--- a/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder_dev_video_pri.ini
+++ b/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder_dev_video_pri.ini
@@ -25,8 +25,8 @@ InputIndex = 0,-255 || 0
 DeviceName = mt9e013
 PreviewResolution = 176,144 | 800,600 | 1600,1200 | 1600,940 | 1024,600 | 1280,720 || 800,600
 CaptureResolution = 176,144 | 320,240 | 352,288 | 640,480 | 800,600 | 1024,600 | 1280,720 | 1280,960 | 1920,1080 | 2048,1536 | 3264,1836 | 3264,2448 || 2048,1536
-DisplayRect = 0,0 | 0,112 || 0,112
-DisplayResolution = 480,640 | 580,800 | 600,800 | 600,1024 || 600,800
+DisplayRect = 0,0 | 0,112 || 0,0
+DisplayResolution = 480,640 | 580,800 | 600,800 | 600,1024 || 600,1024
 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

diff --git a/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder_dev_video_sec.ini
index e5c83fd..a7a0517 100644 (file)
--- a/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder_dev_video_sec.ini
+++ b/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder_dev_video_sec.ini
@@ -26,8 +26,8 @@ DeviceName = mt9m114
 PreviewResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 | 1280,720 || 640,480
 CaptureResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 | 800,600 | 1280,720 | 1280,960 || 1280,960
 FPS = 30 || 30
-DisplayRect = 0,0 | 0,112 || 0,112
-DisplayResolution = 480,640 | 580,800 | 600,800 | 600,1024 || 600,800
+DisplayRect = 0,0 | 0,112 || 0,0
+DisplayResolution = 480,640 | 580,800 | 600,800 | 600,1024 || 600,1024
 
 ; 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

diff --git a/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_player.ini b/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_player.ini
index 4164a5d..f420f63 100644 (file)
--- a/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_player.ini
+++ b/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_player.ini
@@ -12,7 +12,7 @@ videosink element x = vaapisink
 videosink element evas = evasimagesink
 videosink element fake = fakesink
 
-video converter element = vaapiupload
+video converter element = 
 
 audiosink element = avsysaudiosink 
 

diff --git a/packaging/mmfw-sysconf-mfld-blackbay.changes b/packaging/mmfw-sysconf-mfld-blackbay.changes
index c9c3900..e8c4f8c 100644 (file)
--- a/packaging/mmfw-sysconf-mfld-blackbay.changes
+++ b/packaging/mmfw-sysconf-mfld-blackbay.changes
@@ -1,3 +1,6 @@
+* Fri Feb 22 2013 Telle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com> submit/tizen_2.0/20130130.104401@5b22e07
+- Enable preview in full screen. Fixes TZSP-5123
+
 * Wed Jan 30 2013 Jussi Saavalainen <jussi.saavalainen@ixonos.com> submit/tizen_2.0/20130125.020945@0741db7
 - camera: Enable CBR rate-control mode for h.264 encoding
 - remove and rename some dirs to avoid confusion

diff --git a/packaging/system_mfld.pa b/packaging/system_mfld.pa
index db1a9a6..119adea 100644 (file)
--- a/packaging/system_mfld.pa
+++ b/packaging/system_mfld.pa
@@ -17,9 +17,6 @@ load-module module-suspend-on-idle
 #load-module module-udev-detect
 load-module module-bluetooth-discover
 
-#Custom policy module to route between bt<=speaker
-load-module module-policy
-
 load-module module-alsa-sink sink_name=alsa_output.0.analog-stereo device=speaker format=s24-32le channels=2 rate=48000
 load-module module-alsa-sink sink_name=alsa_headset device=headset format=s24-32le channels=2 rate=48000
 load-module module-alsa-source source_name=source.builtinmic device=builtinmic format=s24-32le channels=2 rate=48000
@@ -27,6 +24,9 @@ load-module module-alsa-source source_name=source.builtinmic device=builtinmic f
 update-sink-proplist alsa_output.0.analog-stereo device.bus="builtin"
 update-sink-proplist alsa_headset device.bus="wired"
 
+#Custom policy module to route between bt<=speaker
+load-module module-policy
+
 set-default-sink alsa_output.0.analog-stereo
 set-default-source source.builtinmic