projects / platform / core / multimedia / mmfw-sysconf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 48b9398)
[cleansdk-e4x12/camera] Disable Front camera
authorJeongmo Yang <jm80.yang@samsung.com>
Mon, 15 Apr 2013 04:38:49 +0000 (13:38 +0900)
committerJeongmo Yang <jm80.yang@samsung.com>
Mon, 15 Apr 2013 04:38:49 +0000 (13:38 +0900)
mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_camcorder.ini patch | blob | history
mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_camcorder_dev_video_sec.ini [deleted file] patch | blob | history
packaging/mmfw-sysconf-cleansdk-e4x12.spec patch | blob | history
packaging/mmfw-sysconf-cleansdk-target.spec patch | blob | history
packaging/mmfw-sysconf-simulator.spec patch | blob | history

diff --git a/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_camcorder.ini b/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_camcorder.ini
index 033cb29..e62993e 100644 (file)
--- a/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_camcorder.ini
@@ -28,12 +28,11 @@ ModelName = GT-TIZEN
 [VideoInput]
 UseConfCtrl = 1
 ConfCtrlFile0 = mmfw_camcorder_dev_video_pri.ini
-ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini
 VideosrcElement = camerasrc | 2,0 | do-timestamp,1 | num-alloc-buf,7
 UseVideoscale = 0
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
 UseZeroCopyFormat = 1
-DeviceCount = 2
+DeviceCount = 1
 
 [AudioInput]
 AudiosrcElement = avsysaudiosrc | 3,0 | do-timestamp,1 | slave-method,3 | latency,0
diff --git a/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_camcorder_dev_video_sec.ini
deleted file mode 100644 (file)
index d39f9b7..0000000
--- a/mmfw-sysconf-cleansdk-e4x12/usr/etc/mmfw_camcorder_dev_video_sec.ini
+++ /dev/null
@@ -1,188 +0,0 @@
-; < Camera/Camcorder Configure Control INI file >
-;
-; - Header List -
-; 1.  Camera
-; 2.  Strobe
-; 3.  Effect
-; 4.  Photograph
-; 5.  Capture
-; 6.  Detect
-;
-; - Note -
-; If you want to add a new header,
-; add a new enum value to "enum ConfigureCategoryControl"
-; and new default table for it in mm_camcorder_configure.c/.h
-;
-
-[Camera]
-; Input index - real setting value
-;;; 0:PRIMARY_CAMERA, 1:SECONDARY_CAMERA
-; Input index - MSL value(convert array index)
-;;; -1:NONE, 0:CAMERA0, 1:CAMERA1
-InputIndex = -255,1 || 1
-DeviceName = S5K6A3
-PreviewResolution = 176,144 | 320,240 | 640,480 | 960,720 | 1280,720 | 1280,960 | 1392,1392 || 640,480
-CaptureResolution = 320,240 | 640,480 | 1280,960 | 1392,1392 || 640,480
-FPS = 0,8,15,25,30 || 15
-; 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, 14:INTERLEAVED_JPEG_UYVY
-PictureFormat = 0,4,7 || 0
-Overlay = 0,1 || 1
-; Recommend display rotation
-;;; 0:NONE, 1:90, 2:180, 3:270
-RecommendDisplayRotation = 3
-; 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
-; 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 = 960,720 | 1280,720 || 960,720
-; Camera facing direction
-;;; 0:REAR, 1:FRONT
-FacingDirection = 1
-
-
-[Strobe]
-;StrobeControl - Not support
-;StrobeCapabilities - Not support
-; Strobe mode - real setting value
-;;; 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 = 0,-255,-255,-255,-255,-255,-255,-255 || 0
-;StrobeStatus - Not support
-;StrobeEV - Not support
-
-
-[Effect]
-Brightness = -4,4 || 0
-Contrast = 0,0 || 0
-Saturation = 0,4 || 2
-Sharpness = 0,4 || 2
-
-; White balance - real setting value
-;;; 0:BASE, 1:AUTO, 2:SUNNY, 3:CLOUDY, 4:TUNGSTEN, 5:FLUORESCENT
-; White balance - MSL value(convert array index)
-;;; 0:NONE, 1:AUTO, 2:DAYLIGHT, 3:CLOUDY, 4:FLUORESCENT, 5:INCANDESCENT, 6:SHADE, 7:HORIZON, 8:FLASH, 9:CUSTOM
-WhiteBalance = -255,1,2,3,5,4,-255,-255,-255,-255 || 1
-
-; Color tone - real setting value
-;;; 1:NONE, 2:BNW, 3:SEPIA, 4:AQUA, 6:NEGATIVE
-; 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: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 = 1,2,3,6,-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)
-;;; 0:HORIZONTAL, 1:VERTICAL, 2:NONE
-;Flip = 2,1,0 || 0
-
-; Wide Dynamic Range - real setting value
-;;; N/A
-; Wide Dynamic Range - MSL value(convert array index)
-;;; 0:OFF, 1:ON, 2:AUTO
-WDR = 0,-255,-255 || 0
-
-; Part color mode - real setting value
-;;; 0:OFF, 1:SWAP, 2:ACCENT
-; Part color mode - MSL value(convert array index)
-;;; 0:OFF, 1:SWAP, 2:ACCENT
-;PartColorMode = 0,1,2 || 0
-
-; Part color - real setting value
-;;; 0:VIOLET, 1:PURPLE, 2:MAGENTA_1, 3:MAGENTA_2, 4:RED_1, 5:RED_2, 6:BROWN, 7:YELLOW, 8:GREEN_1, 9:GREEN_2, 10:GREEN_3,
-;;; 11:GREEN_4, 12:COBALT, 13:CYAN, 14:BLUE_1, 15:BLUE_2, 16:GRAY
-; Part color - MSL value(convert array index)
-;;; 0:VIOLET, 1:PURPLE, 2:MAGENTA_1, 3:MAGENTA_2, 4:RED_1, 5:RED_2, 6:BROWN, 7:YELLOW, 8:GREEN_1, 9:GREEN_2, 10:GREEN_3,
-;;; 11:GREEN_4, 12:COBALT_BLUE, 13:CYAN, 14:BLUE_1, 15:BLUE_2, 16:GRAY
-;PartColor = 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 || 0
-
-
-[Photograph]
-;LensInit = 0,1 || 0
-DigitalZoom = 0,0 || 0
-OpticalZoom = 0,0 || 0
-
-; Focus mode - real setting value
-;;; Not Support, no need to convert
-; Focus mode - MSL value(convert array index)
-;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
-FocusMode = -255,0,-255,-255,-255,-255 || 0
-
-; Auto focus type - real setting value
-;;; 0:NORMAL, 1:MACRO, 2:FULL
-; Auto focus - MSL value(convert array index)
-;;; 0:NONE, 1:NORMAL, 2:MACRO, 3:FULL
-AFType = 0,-255,-255,-255 || 0
-
-; Auto exposure type - real setting value
-;;; 1:MATRIX, 2:CENTER, 3:SPOT
-; 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 || 0
-
-;ExposureValue - Not support
-;FNumber - Not support
-;ShutterSpeed - Not support
-
-; ISO - real setting value
-;;; 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,-255,2,3,4,5,6,-255 || 0
-
-; Program mode - real setting value
-;;; 1:NONE, 2:PORTRAIT, 3:NIGHTSHOT, 4:BACK_LIGHT, 5:LANDSCAPE, 6:SPORTS, 7:PARTY_INDOOR, 8:BEACH_SNOW, 9:SUNSET, 10:DUSK_DAWN,
-;;; 11:FALL_COLOR, 12:FIREWORKS, 13:TEXT, 14:CANDLE_LIGHT
-; 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 = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
-
-; Anti-handshake - real setting value
-;;; N/A
-; Anti-handshake - MSL value(convert array index)
-;;; 0:OFF, 1:ON, 2:AUTO, 3:MOVIE_ON
-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]
-; 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, 14:INTERLEAVED_JPEG_UYVY
-OutputMode = 0,4,7,13 || 13
-JpegQuality = 0,100 || 50
-MultishotNumber = 1,255 || 1
-SensorEncodedCapture = 0
-; Support HDR
-;;; 0: OFF, 1: ON, 2: ON and Original
-SupportHDR = 0,-255,-255 || 0
-
-
-[Detect]
-; Detect mode
-;;; 0:OFF, 1:ON
-DetectMode = 0,1 || 0
-;DetectNumber - Not support
-;DetectFocusSelect - Not support
-;DetectSelectNumber - Not support
-;DetectStatus - Not support
-
diff --git a/packaging/mmfw-sysconf-cleansdk-e4x12.spec b/packaging/mmfw-sysconf-cleansdk-e4x12.spec
index 90b72ea..b36f0de 100644 (file)
--- a/packaging/mmfw-sysconf-cleansdk-e4x12.spec
+++ b/packaging/mmfw-sysconf-cleansdk-e4x12.spec
@@ -1,6 +1,6 @@
 Name:       mmfw-sysconf-cleansdk-e4x12
 Summary:    Multimedia Framework system configuration package
-Version:    0.1.64
+Version:    0.1.65
 Release:    0
 Group:      TO_BE/FILLED_IN
 License:    Apache-2.0
diff --git a/packaging/mmfw-sysconf-cleansdk-target.spec b/packaging/mmfw-sysconf-cleansdk-target.spec
index a3ec8da..8847aad 100644 (file)
--- a/packaging/mmfw-sysconf-cleansdk-target.spec
+++ b/packaging/mmfw-sysconf-cleansdk-target.spec
@@ -1,6 +1,6 @@
 Name:       mmfw-sysconf-cleansdk-target
 Summary:    Multimedia Framework system configuration package
-Version:    0.1.64
+Version:    0.1.65
 Release:    0
 Group:      TO_BE/FILLED_IN
 License:    Apache-2.0
diff --git a/packaging/mmfw-sysconf-simulator.spec b/packaging/mmfw-sysconf-simulator.spec
index 746f566..0230ada 100644 (file)
--- a/packaging/mmfw-sysconf-simulator.spec
+++ b/packaging/mmfw-sysconf-simulator.spec
@@ -1,6 +1,6 @@
 Name:       mmfw-sysconf-simulator
 Summary:    Multimedia Framework system configuration package
-Version:    0.1.64
+Version:    0.1.65
 Release:    0
 Group:      TO_BE/FILLED_IN
 License:    Apache-2.0
Domain: Multimedia / Media Common;