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: c0e758d)
Switch camera framework to use vaapisink viewfinder
authorJussi Saavalainen <jussi.saavalainen@ixonos.com>
Tue, 9 Oct 2012 08:04:04 +0000 (11:04 +0300)
committerJussi Saavalainen <jussi.saavalainen@ixonos.com>
Tue, 9 Oct 2012 08:04:04 +0000 (11:04 +0300)
Also enable software colorspace conversion for video until we have
HW encoders.

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 e192e17..09717c0 100644 (file)
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
@@ -51,13 +51,15 @@ DisplayDevice = 0 || 0
 ; Videosink
 ;;; 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 = vaapisink | 2,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
+;VideosinkElementEvas = evasimagesink | 0,0
 ;VideosinkElementGL = glimagesink | 0,0
 VideosinkElementNull = fakesink | 2,0 | qos,0 | sync,0
 UseVideoscale = 0
 VideoscaleElement = videoscale | 1,0 | method,1
+UseComplexVideosink = 1
+VideosinkDescription = vaapiupload direct-rendering=0 qos=false ! vaapisink qos=false sync=false
 
 [VideoEncoder]
 H263 = emulenc_h263 | 0,0
@@ -85,7 +87,7 @@ UseVideoEncoderQueue = 1
 VideoProfile = 0
 VideoAutoAudioConvert = 1
 VideoAutoAudioResample = 0
-VideoAutoColorSpace = 0
+VideoAutoColorSpace = 1
 AudioProfile = 1
 AudioAutoAudioConvert = 1
 AudioAutoAudioResample = 0
@@ -93,7 +95,7 @@ AudioAutoColorSpace = 0
 ImageProfile = 2
 ImageAutoAudioConvert = 0
 ImageAutoAudioResample = 0
-ImageAutoColorSpace = 0
+ImageAutoColorSpace = 1
 RecordsinkElement = filesink | 1,0 | async,0
 UseNoiseSuppressor = 0
 DropVideoFrame = 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 e31528a..9bfe9df 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
@@ -23,19 +23,19 @@
 ;;; -1:NONE, 0:CAMERA0, 1:CAMERA1
 InputIndex = 0,-255 || 0
 DeviceName = mt9e013
-PreviewResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 | 800,600 || 640,480
-CaptureResolution = 160,120 | 176,144 | 320,240 | 352,288 | 1280,960 | 1600,1200 | 3264,2448 || 3264,2448
+PreviewResolution = 320,240 | 352,288 | 640,480 | 576,720 | 576,800 | 800,600 | 1280,720 || 1280,720
+CaptureResolution = 320,240 | 352,288 | 640,480 | 1024,600 | 1280,720 | 1280,960 | 1920,1080 | 2640,1486 | 3264,1836 | 3264,2448 || 3264,2448
 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 || 7
+PictureFormat = 0,4,7,8 || 0
 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 = 0
 ; 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 = 0
 
 
 [Strobe]
@@ -151,7 +151,7 @@ AFType = -255,0,1,-255 || 0
 ; Output mode
 ;;; No need to convert
 ;;; 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
-OutputMode = 4,7,8,13 || 13
+OutputMode = 0,4,7,8,13 || 0
 JpegQuality = 0,100 || 50
 MultishotNumber = 1,255 || 1
 SensorEncodedCapture = 0
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 a805124..bf94bd1 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
@@ -23,19 +23,19 @@
 ;;; -1:NONE, 0:CAMERA0, 1:CAMERA1
 InputIndex = -255,1 || 1
 DeviceName = mt9m114
-PreviewResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 || 640,480
-CaptureResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 | 1280,960 || 1280,960
+PreviewResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 | 1280,720 || 1280,720
+CaptureResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 | 1280,720 | 1280,960 || 1280,960
 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 || 7
+PictureFormat = 0,4,7,8 || 0
 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 = 0
 ; 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 = 0
 
 
 [Strobe]
@@ -151,7 +151,7 @@ DigitalZoom = 100,800 || 100
 ; Output mode
 ;;; No need to convert
 ;;; 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
-OutputMode = 4,7,8,13 || 13
+OutputMode = 0,4,7,8,13 || 0
 JpegQuality = 0,100 || 50
 MultishotNumber = 1,255 || 1
 SensorEncodedCapture = 0
diff --git a/packaging/mmfw-sysconf-mfld-blackbay.changes b/packaging/mmfw-sysconf-mfld-blackbay.changes
index d8003c8..109ebd2 100644 (file)
--- a/packaging/mmfw-sysconf-mfld-blackbay.changes
+++ b/packaging/mmfw-sysconf-mfld-blackbay.changes
@@ -1,3 +1,6 @@
+* Tue Oct 09 2012 Jussi Saavalainen <jussi.saavalainen@ixonos.com> submit/2.0_beta/20121008.065443@aa9fb70
+- Switch camera framework to use vaapisink viewfinder
+
 * Fri Oct 05 2012 Marko Ollonen <marko.ollonen@ixonos.com> accepted/2.0_beta/20120920.114230@bb4a214
 - add focus mode info to main camera.
 
Domain: System / Uncategorized;