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

[platform/adaptation/intel_mfld/mmfw-sysconf-mfld-blackbay.git] / mmfw-sysconf-mfld-blackbay / usr / etc / mmfw_camcorder.ini

diff --git a/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder.ini b/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder.ini
index de8734f..e086c71 100644 (file)
--- a/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder.ini
@@ -1,7 +1,5 @@
 ; < Camera/Camcorder Configure Main INI file >
 ;
-; - SDK Camera
-;
 ; - Header List -
 ; 1.  General
 ; 2.  VideoInput
@@ -24,25 +22,23 @@
 SyncStateChange = 1
 ;GSTInitOption = --gst-enable-tiny-registry --gst-disable-segtrap || NOT-USE-DEFAULT_VALUE
 ;GSTInitOption = --gst-debug=3,avsysvideosrc:4 || NOT-USE-DEFAULT_VALUE
-ModelName = TIZEN_SDK
+ModelName = MFLD-BLACKBAY-TIZEN
 ;DisabledAttributes = camera-optical-zoom camera-af-touch-x camera-af-touch-y camera-exposure-value camera-f-number camera-shutter-speed camera-hold-af-after-capturing filter-flip filter-hue display-src-x display-src-y display-src-width display-src-height tag-image-description strobe-control strobe-capabilities strobe-mode detect-mode detect-number detect-focus-select detect-select-number detect-status || NO_DEFAULT_VALUE
 
 [VideoInput]
 UseConfCtrl = 1
 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
 ;VideosrcElement = videotestsrc | 0,0
 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
+DeviceCount = 2
 ;VideoInputPostProcessor = vaapiupload | 1,0 | direct-rendering,0
 UseVaapiSharedFormat = 1
 
 [AudioInput]
-;AudiosrcElement = avsysaudiosrc | 2,0 | do-timestamp,1 | slave-method,3
 AudiosrcElement = pulsesrc | 1,0 | do-timestamp,1
 AudiomodemsrcElement = audiotestsrc | 2,0 | do-timestamp,1 | is-live,1
 
@@ -54,20 +50,18 @@ DisplayDevice = 0 || 0
 ;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface
 Videosink = 0,1,3 || 0
 VideosinkElementX = vaapisink | 1,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
+VideosinkElementEvas = evasimagesink | 0,0
 VideosinkElementNull = fakesink | 2,0 | qos,0 | sync,0
 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
-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
@@ -85,7 +79,7 @@ UseCaptureMode = 0
 VideoscaleElement = videoscale | 1,0 | method,1
 
 [Record]
-UseAudioEncoderQueue = 1
+UseAudioEncoderQueue = 0
 UseVideoEncoderQueue = 1
 VideoProfile = 0
 VideoAutoAudioConvert = 0
@@ -105,13 +99,8 @@ DropVideoFrame = 0
 PassFirstVideoFrame = 0
 
 [Mux]
-;3GP = ffmux_3gp_ext | 0,0
-;3GP = ffmux_3gp | 0,0
 3GP = 3gppmux | 1,0 | faststart,0
-;AMR = ffmux_amr_ext | 0,0
 AMR = ffmux_amr | 0,0
-;MP4 = ffmux_mp4_ext | 0,0
-;MP4 = mp4mux | 0,0
 MP4 = qtmux | 1,0 | faststart,0
 OGG = oggmux | 0,0
 WAV = wavenc | 0,0