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: 5ed592d)
Update configs against upstream changes.
authorTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Fri, 1 Mar 2013 10:36:06 +0000 (12:36 +0200)
committerTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Thu, 7 Mar 2013 08:30:42 +0000 (10:30 +0200)
Change-Id: I6cfb8b9d1044bbf081c1a221366d1b10815a480a

mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder.ini patch | blob | history
mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder_dev_video_pri.ini patch | blob | history
mmfw-sysconf-mfld-blackbay/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-mfld-blackbay/usr/etc/mmfw_camcorder.ini b/mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder.ini
index de8734f..6ffabe8 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,9 +50,7 @@ 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
@@ -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
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 89a14d1..6590129 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
@@ -1,6 +1,6 @@
 ; < Camera/Camcorder Configure Control INI file >
 ;
-; - SDK Camera. Mega Camera.
+; - Aptina 8Mp, 1/3.2-inch, CMOS Image Sensor
 ;
 ; - Header List -
 ; 1.  Camera
@@ -32,15 +32,21 @@ FPS = 30 || 30
 ;;; 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
 Overlay = 0,1 || 1
-; Recommand preview format for capture
+; Recommend display rotation
+;;; 0:NONE, 1:90, 2:180, 3:270
+RecommendDisplayRotation = 0
+; Recommend 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 = 0
-; Recommand preview format for record
+; Recommend 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 = 0
 ; Recommend preview resolution
 ;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9)
 RecommendPreviewResolution = 800,600 | 1024,600 || 800,600
+; Camera facing direction
+;;; 0:REAR, 1:FRONT
+FacingDirection = 0
 
 
 [Strobe]
@@ -54,6 +60,7 @@ StrobeMode = 1,2,0,-255,-255,-255,-255,-255 || 0
 ;StrobeStatus - Not support
 ;StrobeEV - Not support
 
+
 [Effect]
 Brightness = 1,20 || 10
 Contrast = 1,20 || 10
@@ -141,10 +148,22 @@ ISO = 5,-255,4,3,2,1,0,-255 || 1
 ProgramMode = 0,2,3,4,-255,-255,-255,-255,-255,5,-255,-255,-255,-255,-255 || 0
 
 ; Anti-handshake - real setting value
-;;; 0:OFF, 1:Capture, 2:Movie
+;;; N/A
 ; Anti-handshake - MSL value(convert array index)
 ;;; 0:OFF, 1:ON, 2:AUTO, 3:MOVIE_ON
-;AntiHandshake = 0,1,-255,2 || 0
+AntiHandshake = 0,-255,-255,-255 || 0
+
+; Video-stabilization - real setting value
+;;; 0:OFF, 1:ON
+; Video-stabilization - MSL value(convert array index)
+;;; 0:OFF, 1:ON
+VideoStabilization = 0 || 0
+
+; Face zoom mode
+;;; 0:OFF, 1:ON
+FaceZoomMode = 0 || 0
+; Face zoom level
+FaceZoomLevel = 0,0 || 0
 
 
 [Capture]
@@ -155,6 +174,9 @@ OutputMode = 0,4,7,8,13 || 0
 JpegQuality = 0,100 || 95
 MultishotNumber = 1,255 || 1
 SensorEncodedCapture = 0
+; Support HDR
+;;; 0: OFF, 1: ON, 2: ON and Original
+SupportHDR = 0,-255,-255 || 0
 
 
 [Detect]
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 c8a37d0..ecb9c09 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
@@ -1,6 +1,6 @@
 ; < Camera/Camcorder Configure Control INI file >
 ;
-; - SDK Camera - VGA Camera
+; - Aptina 1.3MP 1/6 inch, 1280 x 960
 ;
 ; - Header List -
 ; 1.  Camera
@@ -23,35 +23,40 @@
 ;;; -1:NONE, 0:CAMERA0, 1:CAMERA1
 InputIndex = -255,1 || 1
 DeviceName = mt9m114
-PreviewResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 | 1280,720 || 640,480
-CaptureResolution = 160,120 | 320,240 | 352,288 | 640,480 | 800,600 | 1280,720 | 1280,960 || 1280,960
-FPS = 30 || 30
+PreviewResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 | 1024,600 | 1280,720 || 640,480
+CaptureResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 | 800,600 | 1280,720 | 1280,960 || 1280,960
 DisplayRect = 0,0 | 0,112 || 0,0
 DisplayResolution = 480,640 | 580,800 | 600,800 | 600,1024 || 600,1024
-
+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 = 0,4,7,8 || 0
 Overlay = 0,1 || 1
-; Recommand preview format for capture
+; Recommend display rotation
+;;; 0:NONE, 1:90, 2:180, 3:270
+RecommendDisplayRotation = 0
+; Recommend 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 = 0
-; Recommand preview format for record
+; Recommend 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 = 0
 ; Recommend preview resolution
 ;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9)
 RecommendPreviewResolution = 640,480 | 1024,600 || 640,480
+; Camera facing direction
+;;; 0:REAR, 1:FRONT
+FacingDirection = 1
 
 
 [Strobe]
 ;StrobeControl - Not support
 ;StrobeCapabilities - Not support
 ; Strobe mode - real setting value
-;;; 0:BASE, 1:OFF, 2:AUTO, 3:ON, 4:TORCH, 5:MAX
+;;; N/A
 ; Strobe mode - MSL value(convert array index)
 ;;; 0:OFF, 1:ON, 2:AUTO, 3:REDEYE_REDUCTION, 4:SLOW_SYNC, 5:FRONT_CURTAIN, 6:REAR_CURTAIN, 7:PERMANENT
-StrobeMode = 1,-255,-255,-255,-255,-255,-255,-255 || 1
+StrobeMode = 0,-255,-255,-255,-255,-255,-255,-255 || 0
 ;StrobeStatus - Not support
 ;StrobeEV - Not support
 
@@ -63,20 +68,19 @@ Saturation = 1,20 || 10
 Sharpness = 1,20 || 10
 
 ; White balance - real setting value
-;;; 0:AUTO, 1:INCANDESCENT, 2:FLUORESCENT_HIGH, 3:FLUORESCENT_LOW, 4:DAYLIGHT, 5:CLOUDY, 6:SHADE, 7:HORIZON, 8:CUSTOM , 9:LED_LIGHT
+;;; N/A
 ; White balance - MSL value(convert array index)
-;;; 0:NONE, 1:AUTO, 2:DAYLIGHT, 3:CLOUDY, 4:FLUOROSCENT, 5:INCANDESCENT, 6:SHADE, 7:HORIZON, 8:FLASH, 9:CUSTOM
-;WhiteBalance = -255,1,4,5,3,2,6,7,-255,-255 || 1
-;WhiteBalance = -255,0,4,5,2,1,6,7,9,8 || 0
+;;; 0:NONE, 1:AUTO, 2:DAYLIGHT, 3:CLOUDY, 4:FLUORESCENT, 5:INCANDESCENT, 6:SHADE, 7:HORIZON, 8:FLASH, 9:CUSTOM
+WhiteBalance = -255,0,-255,-255,-255,-255,-255,-255,-255,-255 || 0
 
 ; Color tone - real setting value
-;;; 0:NONE, 1:SEPIA, 2:ANTIQUE, 3:NEGATIVE, 4:EMBOSS, 5:GRAY, 6:OUTLINE, 7:SOLARIZATION
+;;; N/A
 ; Color tone - MSL value(convert array index)
-;;; 0:NONE, 1:MONO, 2:SEPIA, 3:NEGATIVE, 4:BLUE, 5:GREEN, 6:AQUA, 7:VIOLET, 8:ORANGE, 9:GRAY, 10:REC,
-;;; 11:ANTIQUE, 12:WARM, 13:PINK, 14:YELLOW, 15:PURPLE, 16:EMBOSS, 17:OUTLINE, 18:SOLARIZATION_1, 19:SOLARIZATION_2, 20:SOLARIZATION_3,
-;;; 21:SOLARIZATION_4, 22:SKETCH_1, 23:SKETCH_2, 24:SKETCH_3, 25:SKETCH_4
-;ColorTone = 1,-255,3,2,11,6,5,18,-255,-255,3,4,10,-255,-255,-255,-255,16,17,12,13,14,15,-255,-255,-255,-255 || 0
-;ColorTone = 0,-255,1,3,-255,-255,-255,-255,-255,5,-255,2,-255,-255,-255,-255,4,6,7,-255,-255,-255,-255,-255,-255,-255 || 0
+;;; 0:NONE, 1:MONO, 2:SEPIA, 3:NEGATIVE, 4:BLUE, 5:GREEN, 6:AQUA, 7:VIOLET, 8:ORANGE, 9:GRAY, 10:RED,
+;;; 11:ANTIQUE, 12:WARM, 13:PINK, 14:YELLOW, 15:PURPLE, 16:EMBOSS, 17:OUTLINE, 18:SOLARIZATION, 19:SKETCH, 20:WASHED,
+;;; 21:VINTAGE_WARM, 22:VINTAGE_COLD, 23:POSTERIZATION, 24:CARTOON, 25:SELECTIVE_RED, 26:SELECTIVE_GREEN, 27:SELECTIVE_BLUE, 28:SELECTIVE_YELLOW, 29:SELECTIVE_RED_YELLOW
+ColorTone = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
+
 ; Flip - real setting value
 ;;; 0:NONE, 1:VERTICAL, 2:HORIZONTAL
 ; Flip - MSL value(convert array index)
@@ -84,10 +88,10 @@ Sharpness = 1,20 || 10
 ;Flip = 2,1,0 || 0
 
 ; Wide Dynamic Range - real setting value
-;;; 1:OFF, 2:ON, 3:AUTO
+;;; N/A
 ; Wide Dynamic Range - MSL value(convert array index)
 ;;; 0:OFF, 1:ON, 2:AUTO
-;WDR = 1,2,3 || 3
+WDR = 0,-255,-255 || 0
 
 ; Part color mode - real setting value
 ;;; 0:OFF, 1:SWAP, 2:ACCENT
@@ -105,52 +109,62 @@ Sharpness = 1,20 || 10
 
 
 [Photograph]
-;LensInit = 0,1 || 0
-DigitalZoom = 100,800 || 100
-;OpticalZoom - Not support
+;LensInit  - Not support
+DigitalZoom = 0,0 || 0
+OpticalZoom = 0,0 || 0
 
 ; Focus mode - real setting value
-;;; Not Support, no need to convert
+;;; N/A
 ; Focus mode - MSL value(convert array index)
 ;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
-;FocusMode = 0,2,0,1,3,4 || 3
+FocusMode = -255,0,-255,-255,-255,-255 || 0
 
 ; Auto focus type - real setting value
-;;; 0:NORMAL, 1:MACRO, 2:FULL
+;;; N/A
 ; Auto focus - MSL value(convert array index)
 ;;; 0:NONE, 1:NORMAL, 2:MACRO, 3:FULL
-;AFType = -255,0,1,-255 || 0
+AFType = 0,-255,-255,-255 || 0
 
 ; Auto exposure type - real setting value
-;;; 1,ALL 2,CENTER 3,SPOT
+;;; N/A
 ; Auto exposure mode - MSL value(convert array index)
-;;; 0,OFF 1,ALL 2,CENTER1  3,CENTER2 4,CENTER3 5,SPOT1 6,SPOT2 7,CUSTOM1 8,CUSTOM2
-;AEType = -255,1,2,-255,-255,3,-255,-255,-255 || 1
+;;; 0:OFF, 1:ALL, 2:CENTER1, 3:CENTER2, 4:CENTER3, 5:SPOT1, 6:SPOT2, 7:CUSTOM1, 8:CUSTOM2
+AEType = -255,0,-255,-255,-255,-255,-255,-255,-255 || 0
 
-;ExposureValue = 1,9 || 5
+;ExposureValue - Not support
 ;FNumber - Not support
 ;ShutterSpeed - Not support
 
 ; ISO - real setting value
-;;; 0:AUTO, 1:50, 2:100, 3:200, 4:400, 5:800, 6:1600(Not Supported), 7:3200(Not Supported)
+;;; N/A
 ; ISO - MSL value(convert array index)
 ;;; 0:AUTO, 1:50, 2:100, 3:200, 4:400, 5:800, 6:1600, 7:3200
-;ISO = 0,1,2,3,4,5,-255,-255 || 0
+ISO = 0,-255,-255,-255,-255,-255,-255,-255 || 0
 
 ; Program mode - real setting value
-;;; 0:NONE, 1:FALL_COLOR, 2:DUSK_N_DAWN, 3:CANDLE_LIGHT, 4:BEACH_SNOW, 5:BACKLIGHT, 6:LANDSCAPE, 7:NIGHT_SCENE, 8:PORTRAIT, 9:SPORTS, 10:INDOOR,
-;;; 11:FIREWORK, 12:TEXT, 13:SHOW_WINDOW
+;;; N/A
 ; Program mode - MSL value(convert array index)
 ;;; 0:NORMAL, 1:PORTRAIT, 2:LANDSCAPE, 3:SPORTS, 4:PARTY_N_INDOOR, 5:BEACH_N_INDOOR, 6:SUNSET, 7:DUSK_N_DAWN, 8:FALL_COLOR, 9:NIGHT_SCENE,
 ;;; 10:FIREWORK, 11:TEXT, 12:SHOW_WINDOW, 13:CANDLE_LIGHT, 14:BACKLIGHT
-;ProgramMode = 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 || 1
-;ProgramMode = 0,8,6,9,10,4,-255,2,1,7,11,12,13,3,5 || 0
+ProgramMode = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
 
 ; Anti-handshake - real setting value
-;;; 0:OFF, 1:Capture, 2:Movie
+;;; N/A
 ; Anti-handshake - MSL value(convert array index)
 ;;; 0:OFF, 1:ON, 2:AUTO, 3:MOVIE_ON
-;AntiHandshake = 0,1,-255,2 || 0
+AntiHandshake = 0,-255,-255,-255 || 0
+
+; Video-stabilization - real setting value
+;;; 0:OFF, 1:ON
+; Video-stabilization - MSL value(convert array index)
+;;; 0:OFF, 1:ON
+VideoStabilization = 0 || 0
+
+; Face zoom mode
+;;; 0:OFF, 1:ON
+FaceZoomMode = 0 || 0
+; Face zoom level
+FaceZoomLevel = 0,0 || 0
 
 
 [Capture]
@@ -161,6 +175,9 @@ OutputMode = 0,4,7,8,13 || 0
 JpegQuality = 0,100 || 95
 MultishotNumber = 1,255 || 1
 SensorEncodedCapture = 0
+; Support HDR
+;;; 0: OFF, 1: ON, 2: ON and Original
+SupportHDR = 0,-255,-255 || 0
 
 
 [Detect]
diff --git a/packaging/mmfw-sysconf-mfld-blackbay.changes b/packaging/mmfw-sysconf-mfld-blackbay.changes
index 428ee0b..3014958 100644 (file)
--- a/packaging/mmfw-sysconf-mfld-blackbay.changes
+++ b/packaging/mmfw-sysconf-mfld-blackbay.changes
@@ -1,3 +1,6 @@
+* Thu Mar 07 2013 Telle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com> submit/trunk/20130226.112752@8e55915
+- Update configs against upstream changes.
+
 * Fri Mar 01 2013 Jussi Saavalainen <jussi.saavalainen@ixonos.com> accepted/tizen_2.0/20130228.212607@cceb0fe
 - Enable camera pipeline buffer-sharing TZSP-4953
 
Domain: System / Uncategorized;