camera source name change and not use encodebin anymore.

Change-Id: Ibef478c543756397a39f2102ad179f1e23acb545

diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
index fa7147c..b2c74fa 100644 (file)
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
@@ -34,7 +34,7 @@ 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 = mfldv4l2camsrc | 0,0
+VideosrcElement = camerasrc | 0,0
 UseVideoscale = 0
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
 UseZeroCopyFormat = 0
@@ -77,7 +77,7 @@ JPEG = jpegenc | 0,0
 PNG = pngenc | 0,0
 
 [Capture]
-UseEncodebin = 1
+UseEncodebin = 0
 UseCaptureMode = 0
 VideoscaleElement = videoscale | 1,0 | method,1
 

diff --git a/packaging/mmfw-sysconf-mfld-blackbay.changes b/packaging/mmfw-sysconf-mfld-blackbay.changes
index f6e23fb..10f4a9d 100644 (file)
--- a/packaging/mmfw-sysconf-mfld-blackbay.changes
+++ b/packaging/mmfw-sysconf-mfld-blackbay.changes
@@ -1,6 +1,9 @@
 * Thu Nov 08 2012 Yan Yin <yan.yin@intel.com> accepted/trunk/20121029.202429@bebf926
 - use vaapiupload for software decoded video.
 
+* Sat Oct 27 2012 Marko Ollonen <marko.ollonen@ixonos.com> accepted/trunk/20121025.174022@c6a577f
+- camera source name change and not use encodebin anymore.
+
 * Thu Oct 25 2012 Jussi Saavalainen <jussi.saavalainen@ixonos.com> submit/trunk/20121025.114059@93cc83c
 - Limit camera pipelines to 800x576 during viewfinder debugging