Enable camera pipeline buffer-sharing

Also disable software cropping (only used in QCIF video now),
on the assumption that this is handled by adjusting gstreamer-vaapi
allocation alignment.

Change-Id: Ifc9b24fcd89cebaa287d24d2a395d456514b8868

diff --git a/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder.ini b/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder.ini
index 85b523d..de8734f 100644 (file)
--- a/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder.ini
@@ -34,11 +34,12 @@ ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini
 ;VideosrcElement = avsysvideosrc | 3,0 | do-timestamp,1 | use-pad-alloc,1 | num-alloc-buf,5
 ;VideosrcElement = v4l2src | 1,1 | do-timestamp,1 | device,/dev/video0
 ;VideosrcElement = videotestsrc | 0,0
-VideosrcElement = camerasrc | 1,0 | do-timestamp,1
+VideosrcElement = camerasrc | 3,0 | do-timestamp,1 | use-mmap,0 | disable-low-res-crop,1
 UseVideoscale = 0
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
 UseZeroCopyFormat = 0
-VideoInputPostProcessor = vaapiupload | 1,0 | direct-rendering,0
+;VideoInputPostProcessor = vaapiupload | 1,0 | direct-rendering,0
+UseVaapiSharedFormat = 1
 
 [AudioInput]
 ;AudiosrcElement = avsysaudiosrc | 2,0 | do-timestamp,1 | slave-method,3

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 b6f0f23..89a14d1 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
@@ -24,7 +24,7 @@
 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
+CaptureResolution = 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,0
 DisplayResolution = 480,640 | 580,800 | 600,800 | 600,1024 || 600,1024
 FPS = 30 || 30

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 9235827..c8a37d0 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
@@ -24,7 +24,7 @@
 InputIndex = -255,1 || 1
 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
+CaptureResolution = 160,120 | 320,240 | 352,288 | 640,480 | 800,600 | 1280,720 | 1280,960 || 1280,960
 FPS = 30 || 30
 DisplayRect = 0,0 | 0,112 || 0,0
 DisplayResolution = 480,640 | 580,800 | 600,800 | 600,1024 || 600,1024

diff --git a/packaging/mmfw-sysconf-mfld-blackbay.changes b/packaging/mmfw-sysconf-mfld-blackbay.changes
index 6c532d4..428ee0b 100644 (file)
--- a/packaging/mmfw-sysconf-mfld-blackbay.changes
+++ b/packaging/mmfw-sysconf-mfld-blackbay.changes
@@ -1,3 +1,6 @@
+* Fri Mar 01 2013 Jussi Saavalainen <jussi.saavalainen@ixonos.com> accepted/tizen_2.0/20130228.212607@cceb0fe
+- Enable camera pipeline buffer-sharing TZSP-4953
+
 * Thu Feb 28 2013 Telle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com> accepted/tizen_2.0/20130226.192103@990de4b
 - Add Recommend preview resolution to fix bug TZSP-5301
 

diff --git a/packaging/mmfw-sysconf-mfld-blackbay.spec b/packaging/mmfw-sysconf-mfld-blackbay.spec
index edf618c..728eca3 100644 (file)
--- a/packaging/mmfw-sysconf-mfld-blackbay.spec
+++ b/packaging/mmfw-sysconf-mfld-blackbay.spec
@@ -1,6 +1,6 @@
 Name:       mmfw-sysconf-mfld-blackbay
 Summary:    Multimedia Framework system configuration package
-Version:    0.1.23
+Version:    0.1.24
 Release:    2
 Group:      TO_BE/FILLED_IN
 License:    Apache-2.0/LGPL v2.1