projects / platform / adaptation / intel_mfld / mmfw-sysconf-mfld-blackbay.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6fe5b10)
Activating mfldv4l2camsrc
authorPrzemyslaw Marek <przemyslaw.marek@ixonos.com>
Thu, 19 Jul 2012 08:23:12 +0000 (11:23 +0300)
committerPrzemyslaw Marek <przemyslaw.marek@ixonos.com>
Thu, 19 Jul 2012 10:00:07 +0000 (13:00 +0300)
Change-Id: I4739720b8ff84d914c5fc886b27e722ff8e21b63

mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini patch | blob | history
mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini patch | blob | history
mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini patch | blob | history
packaging/mmfw-sysconf-mfld-blackbay.changes patch | blob | history

diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
index b31a078..67147a4 100644 (file)
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
@@ -33,8 +33,8 @@ ConfCtrlFile0 = mmfw_camcorder_dev_video_pri.ini
 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
 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 = videotestsrc | 0,0
+VideosrcElement = mfldv4l2camsrc | 0,0
 UseVideoscale = 0
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
 UseZeroCopyFormat = 0
 UseVideoscale = 0
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
 UseZeroCopyFormat = 0
@@ -51,7 +51,7 @@ DisplayDevice = 0 || 0
 ;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface
 Videosink = 0,1,3 || 0
 ;VideosinkElementX = ximagesink | 4,0 | force-aspect-ratio,1 | handle-events,1 | qos,0 | sync,0
 ;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface
 Videosink = 0,1,3 || 0
 ;VideosinkElementX = ximagesink | 4,0 | force-aspect-ratio,1 | handle-events,1 | qos,0 | sync,0
-VideosinkElementX = xvimagesink | 5,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-buffer,0 | qos,0 | sync,0
+VideosinkElementX = xvimagesink | 5,0 | draw-borders,0 | force-aspect-ratio,0 | enable-last-buffer,0 | qos,0 | sync,0
 VideosinkElementEvas = evasimagesink | 0,0
 ;VideosinkElementGL = glimagesink | 0,0
 VideosinkElementNull = fakesink | 2,0 | qos,0 | sync,0
 VideosinkElementEvas = evasimagesink | 0,0
 ;VideosinkElementGL = glimagesink | 0,0
 VideosinkElementNull = fakesink | 2,0 | qos,0 | sync,0
diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini
index 7f656ed..17cd0c9 100644 (file)
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini
@@ -28,14 +28,14 @@ CaptureResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 || 640,480
 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
 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
-PictureFormat = 4,7,8 || 4
+PictureFormat = 4,5,7,8 || 5
 Overlay = 0,1 || 1
 ; Recommand preview format for capture
 ;;; 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, 14:INTERLEAVED_JPEG_UYVY
 Overlay = 0,1 || 1
 ; Recommand preview format for capture
 ;;; 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, 14:INTERLEAVED_JPEG_UYVY
-RecommendPreviewFormatCapture = 7
+RecommendPreviewFormatCapture = 5
 ; Recommand preview format for record
 ;;; 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, 14:INTERLEAVED_JPEG_UYVY
 ; Recommand preview format for record
 ;;; 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, 14:INTERLEAVED_JPEG_UYVY
-RecommendPreviewFormatRecord = 7
+RecommendPreviewFormatRecord = 5
 
 
 [Strobe]
 
 
 [Strobe]
diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini
index 7875531..c386d5a 100644 (file)
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini
@@ -21,21 +21,21 @@
 ;;; 0:PRIMARY_CAMERA, 1:SECONDARY_CAMERA
 ; Input index - MSL value(convert array index)
 ;;; -1:NONE, 0:CAMERA0, 1:CAMERA1
 ;;; 0:PRIMARY_CAMERA, 1:SECONDARY_CAMERA
 ; Input index - MSL value(convert array index)
 ;;; -1:NONE, 0:CAMERA0, 1:CAMERA1
-InputIndex = -255,0 || 0
+InputIndex = -255,1 || 1
 DeviceName = virtual driver
 PreviewResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 || 640,480
 CaptureResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 || 640,480
 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
 DeviceName = virtual driver
 PreviewResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 || 640,480
 CaptureResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 || 640,480
 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
-PictureFormat = 4,7,8 || 4
+PictureFormat = 4,5,7,8 || 5
 Overlay = 0,1 || 1
 ; Recommand preview format for capture
 ;;; 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, 14:INTERLEAVED_JPEG_UYVY
 Overlay = 0,1 || 1
 ; Recommand preview format for capture
 ;;; 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, 14:INTERLEAVED_JPEG_UYVY
-RecommendPreviewFormatCapture = 7
+RecommendPreviewFormatCapture = 5
 ; Recommand preview format for record
 ;;; 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, 14:INTERLEAVED_JPEG_UYVY
 ; Recommand preview format for record
 ;;; 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, 14:INTERLEAVED_JPEG_UYVY
-RecommendPreviewFormatRecord = 7
+RecommendPreviewFormatRecord = 5
 
 
 [Strobe]
 
 
 [Strobe]
diff --git a/packaging/mmfw-sysconf-mfld-blackbay.changes b/packaging/mmfw-sysconf-mfld-blackbay.changes
index ef1df07..e6e3db0 100644 (file)
--- a/packaging/mmfw-sysconf-mfld-blackbay.changes
+++ b/packaging/mmfw-sysconf-mfld-blackbay.changes
@@ -1,3 +1,7 @@
+* Thu Jul 19 2012 przemyslaw.marek@ixonos.com <przemyslaw.marek@ixonos.com> build/2012-07-09.074620@b2db6a0
+[ Przemyslaw Marek ]
+- Activating mfldv4l2camsrc
+
 * Wed Jul 11 2012 telle-tiia.pitkanen@ixonos.com <telle-tiia.pitkanen@ixonos.com> build/2012-07-09.074620@b0c2c75
 - Activating videotestsrc and adding placeholder for mfldv4l2camsrc for camera-sample test app
 
 * Wed Jul 11 2012 telle-tiia.pitkanen@ixonos.com <telle-tiia.pitkanen@ixonos.com> build/2012-07-09.074620@b0c2c75
 - Activating videotestsrc and adding placeholder for mfldv4l2camsrc for camera-sample test app
 
Domain: System / Uncategorized;