Enable 1080p 'preview' resolution and remove extra queueing from pipeline

This enables 1080p record in the UI level, and slightly reduces
scheduling overhead. Also add 15fps support and set exposure
compensation limits to correct values.

Change-Id: I4caea1d841ed9217d5900d949e2e3897d348af82

diff --git a/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder.ini b/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder.ini
index 6ffabe8..e086c71 100644 (file)
--- a/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder.ini
@@ -55,13 +55,13 @@ VideosinkElementNull = fakesink | 2,0 | qos,0 | sync,0
 UseVideoscale = 0
 VideoscaleElement = videoscale | 1,0 | method,1
 UseComplexVideosink = 1
 UseVideoscale = 0
 VideoscaleElement = videoscale | 1,0 | method,1
 UseComplexVideosink = 1

-VideosinkDescription = queue max-size-buffers=4 leaky=2 ! vaapisink sync=false rotation=270 enable-last-buffer=false
+VideosinkDescription = vaapisink sync=false rotation=270 enable-last-buffer=false

 
 [VideoEncoder]
 H263 = vaapiencodeh263 | 0,0
 MPEG4 = vaapiencodempeg4 | 0,0
 THEORA = theoraenc | 1,0 | num-bufs,4
 
 [VideoEncoder]
 H263 = vaapiencodeh263 | 0,0
 MPEG4 = vaapiencodempeg4 | 0,0
 THEORA = theoraenc | 1,0 | num-bufs,4

-H264 = vaapiencodeh264 | 2,0 | slice-num,2 | rate-control,1
+H264 = vaapiencodeh264 | 3,0 | slice-num,2 | rate-control,1 | profile,77

 
 [AudioEncoder]
 AMR = amrnbenc | 0,0
 
 [AudioEncoder]
 AMR = amrnbenc | 0,0


@@ -79,7 +79,7 @@ UseCaptureMode = 0
 VideoscaleElement = videoscale | 1,0 | method,1
 
 [Record]
 VideoscaleElement = videoscale | 1,0 | method,1
 
 [Record]

-UseAudioEncoderQueue = 1
+UseAudioEncoderQueue = 0

 UseVideoEncoderQueue = 1
 VideoProfile = 0
 VideoAutoAudioConvert = 0
 UseVideoEncoderQueue = 1
 VideoProfile = 0
 VideoAutoAudioConvert = 0

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 6590129..55c88ab 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
@@ -23,11 +23,11 @@
 ;;; -1:NONE, 0:CAMERA0, 1:CAMERA1
 InputIndex = 0,-255 || 0
 DeviceName = mt9e013
 ;;; -1:NONE, 0:CAMERA0, 1:CAMERA1
 InputIndex = 0,-255 || 0
 DeviceName = mt9e013

-PreviewResolution = 176,144 | 800,600 | 1600,1200 | 1600,940 | 1024,600 | 1280,720 || 800,600
+PreviewResolution = 176,144 | 800,600 | 1600,1200 | 1600,940 | 1024,600 | 1280,720 | 1920,1080 || 800,600

 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
 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
+FPS = 15 | 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 = 0,4,7,8 || 0
 ; 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 = 0,4,7,8 || 0


@@ -62,7 +62,7 @@ StrobeMode = 1,2,0,-255,-255,-255,-255,-255 || 0
 
 
 [Effect]
 
 
 [Effect]

-Brightness = 1,20 || 10
+Brightness = 0,8 || 4

 Contrast = 1,20 || 10
 Saturation = 1,20 || 10
 Sharpness = 1,20 || 10
 Contrast = 1,20 || 10
 Saturation = 1,20 || 10
 Sharpness = 1,20 || 10

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 ecb9c09..a2d1769 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
@@ -62,7 +62,8 @@ StrobeMode = 0,-255,-255,-255,-255,-255,-255,-255 || 0
 
 
 [Effect]
 
 
 [Effect]

-Brightness = 1,20 || 10
+;Brightness (better known as exposure value) setting not supported for mt9m114
+Brightness = 0,0 || 0

 Contrast = 1,20 || 10
 Saturation = 1,20 || 10
 Sharpness = 1,20 || 10
 Contrast = 1,20 || 10
 Saturation = 1,20 || 10
 Sharpness = 1,20 || 10