[camcorder] Remove unused fields and rename device related files

[Version] 0.2.124
[Profile] Common
[Issue Type] Update
[Dependency module] N/A
[Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-4.0-unified_20171207.4]

Change-Id: I3537a1ccf0f236feb594fc55f257a7500b7f502a
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini
index 837e097321b19cb1435239d52e9ad2b31c13756f..949390f624848121bbe4f1deaa6e699ff47509a9 100644 (file)
--- a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini
+++ b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini
@@ -28,9 +28,6 @@ ModelName = TIZEN_SDK
 ;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 = v4l2src | 1,1 | do-timestamp,1 | device,/dev/video0
 UseVideoscale = 0
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1

diff --git a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_camera0.ini b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_camera0.ini
new file mode 100644 (file)
index 0000000..e0fa03c
--- /dev/null
+++ b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_camera0.ini
@@ -0,0 +1,194 @@
+; < Camera/Camcorder Configure Control INI file >
+;
+; - SDK Camera. Mega Camera.
+;
+; - 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 = 0,-255 || 0
+DeviceName = virtual driver
+PreviewResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
+CaptureResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
+VideoResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
+FPS0 = 30 || 30
+FPS1 = 30 || 30
+FPS2 = 30 || 30
+FPS3 = 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 || 4
+Overlay = 0,1 || 1
+; 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 = 7
+; 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 = 7
+; Recommend preview resolution
+;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9)
+RecommendPreviewResolution = 640,480 | 352,288 || 640,480
+; Camera facing direction
+;;; 0:REAR, 1:FRONT
+FacingDirection = 0
+
+
+[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 = 1,20 || 10
+Contrast = 1,20 || 10
+Saturation = 1,20 || 10
+Sharpness = 1,20 || 10
+
+; White balance - real setting value
+;;; 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 = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
+
+; Color tone - real setting value
+;;; 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 = 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 || 0
+
+; Flip - MSL value(convert array index)
+;;; 0:NONE, 1:HORIZONTAL, 2:VERTICAL, 3:BOTH
+Flip = 0,-255,-255,-255 || 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
+
+
+[Photograph]
+;LensInit = 0,1 || 0
+;DigitalZoom = 10,30 || 10
+;OpticalZoom - Not support
+
+; Focus mode - real setting value
+;;; N/A
+; Focus mode - MSL value(convert array index)
+;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
+FocusMode = 0,-255,-255,-255,-255,-255 || 0
+
+; Auto focus type - real setting value
+;;; N/A
+; 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
+;;; 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,0,-255,-255,-255,-255,-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,-255,-255,-255,-255,-255,-255 || 0
+
+; Program mode - real setting value
+;;; 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 = 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
+
+; PTZ(Pan Tilt Zoom) type
+;;; 0:Mechanical, 1:Electronic
+;PtzType = 0,1 || 1
+
+; Pan range for mechanical movement
+;PanMecha = -10,10
+
+; Pan range for electronic movement
+;PanElec = -10,10
+
+; Tilt range for mechanical movement
+;TiltMecha = -10,10
+
+; Tilt range for electronic movement
+;TiltElec = -10,10
+
+
+[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
+OutputMode = 4,7,8,13 || 13
+JpegQuality = 0,100 || 50
+MultishotNumber = 1,1 || 1
+SensorEncodedCapture = 0
+; Support HDR
+;;; 0: OFF, 1: ON, 2: ON and Original
+SupportHDR = 0,-255,-255 || 0
+
+
+[Detect]
+; Detect mode
+;;; No need to convert
+;;; 0:OFF, 1:ON
+DetectMode = 0,-255 || 0
+;DetectNumber - Not support
+;DetectFocusSelect - Not support
+;DetectSelectNumber - Not support
+;DetectStatus - Not support
+

diff --git a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_camera1.ini b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_camera1.ini
new file mode 100644 (file)
index 0000000..dd7626d
--- /dev/null
+++ b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_camera1.ini
@@ -0,0 +1,194 @@
+; < Camera/Camcorder Configure Control INI file >
+;
+; - SDK Camera - VGA Camera
+;
+; - 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,0 || 0
+DeviceName = virtual driver
+PreviewResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
+CaptureResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
+VideoResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
+FPS0 = 30 || 30
+FPS1 = 30 || 30
+FPS2 = 30 || 30
+FPS3 = 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 || 4
+Overlay = 0,1 || 1
+; 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 = 7
+; 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 = 7
+; Recommend preview resolution
+;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9)
+RecommendPreviewResolution = 640,480 | 352,288 || 640,480
+; 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 = 1,20 || 10
+Contrast = 1,20 || 10
+Saturation = 1,20 || 10
+Sharpness = 1,20 || 10
+
+; White balance - real setting value
+;;; 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 = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
+
+; Color tone - real setting value
+;;; 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 = 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 || 0
+
+; Flip - MSL value(convert array index)
+;;; 0:NONE, 1:HORIZONTAL, 2:VERTICAL, 3:BOTH
+Flip = 0,-255,-255,-255 || 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
+
+
+[Photograph]
+;LensInit = 0,1 || 0
+;DigitalZoom = 10,30 || 10
+;OpticalZoom - Not support
+
+; Focus mode - real setting value
+;;; N/A
+; Focus mode - MSL value(convert array index)
+;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
+FocusMode = 0,-255,-255,-255,-255,-255 || 0
+
+; Auto focus type - real setting value
+;;; N/A
+; 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
+;;; 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,0,-255,-255,-255,-255,-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,-255,-255,-255,-255,-255,-255 || 0
+
+; Program mode - real setting value
+;;; 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 = 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
+
+; PTZ(Pan Tilt Zoom) type
+;;; 0:Mechanical, 1:Electronic
+;PtzType = 0,1 || 1
+
+; Pan range for mechanical movement
+;PanMecha = -10,10
+
+; Pan range for electronic movement
+;PanElec = -10,10
+
+; Tilt range for mechanical movement
+;TiltMecha = -10,10
+
+; Tilt range for electronic movement
+;TiltElec = -10,10
+
+
+[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
+OutputMode = 4,7,8,13 || 13
+JpegQuality = 0,100 || 50
+MultishotNumber = 1,1 || 1
+SensorEncodedCapture = 0
+; Support HDR
+;;; 0: OFF, 1: ON, 2: ON and Original
+SupportHDR = 0,-255,-255 || 0
+
+
+[Detect]
+; Detect mode
+;;; No need to convert
+;;; 0:OFF, 1:ON
+DetectMode = 0,-255 || 0
+;DetectNumber - Not support
+;DetectFocusSelect - Not support
+;DetectSelectNumber - Not support
+;DetectStatus - Not support
+

diff --git a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_dev_video_pri.ini
deleted file mode 100644 (file)
index e0fa03c..0000000
--- a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_dev_video_pri.ini
+++ /dev/null
@@ -1,194 +0,0 @@
-; < Camera/Camcorder Configure Control INI file >
-;
-; - SDK Camera. Mega Camera.
-;
-; - 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 = 0,-255 || 0
-DeviceName = virtual driver
-PreviewResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
-CaptureResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
-VideoResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
-FPS0 = 30 || 30
-FPS1 = 30 || 30
-FPS2 = 30 || 30
-FPS3 = 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 || 4
-Overlay = 0,1 || 1
-; 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 = 7
-; 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 = 7
-; Recommend preview resolution
-;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9)
-RecommendPreviewResolution = 640,480 | 352,288 || 640,480
-; Camera facing direction
-;;; 0:REAR, 1:FRONT
-FacingDirection = 0
-
-
-[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 = 1,20 || 10
-Contrast = 1,20 || 10
-Saturation = 1,20 || 10
-Sharpness = 1,20 || 10
-
-; White balance - real setting value
-;;; 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 = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
-
-; Color tone - real setting value
-;;; 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 = 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 || 0
-
-; Flip - MSL value(convert array index)
-;;; 0:NONE, 1:HORIZONTAL, 2:VERTICAL, 3:BOTH
-Flip = 0,-255,-255,-255 || 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
-
-
-[Photograph]
-;LensInit = 0,1 || 0
-;DigitalZoom = 10,30 || 10
-;OpticalZoom - Not support
-
-; Focus mode - real setting value
-;;; N/A
-; Focus mode - MSL value(convert array index)
-;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
-FocusMode = 0,-255,-255,-255,-255,-255 || 0
-
-; Auto focus type - real setting value
-;;; N/A
-; 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
-;;; 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,0,-255,-255,-255,-255,-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,-255,-255,-255,-255,-255,-255 || 0
-
-; Program mode - real setting value
-;;; 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 = 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
-
-; PTZ(Pan Tilt Zoom) type
-;;; 0:Mechanical, 1:Electronic
-;PtzType = 0,1 || 1
-
-; Pan range for mechanical movement
-;PanMecha = -10,10
-
-; Pan range for electronic movement
-;PanElec = -10,10
-
-; Tilt range for mechanical movement
-;TiltMecha = -10,10
-
-; Tilt range for electronic movement
-;TiltElec = -10,10
-
-
-[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
-OutputMode = 4,7,8,13 || 13
-JpegQuality = 0,100 || 50
-MultishotNumber = 1,1 || 1
-SensorEncodedCapture = 0
-; Support HDR
-;;; 0: OFF, 1: ON, 2: ON and Original
-SupportHDR = 0,-255,-255 || 0
-
-
-[Detect]
-; Detect mode
-;;; No need to convert
-;;; 0:OFF, 1:ON
-DetectMode = 0,-255 || 0
-;DetectNumber - Not support
-;DetectFocusSelect - Not support
-;DetectSelectNumber - Not support
-;DetectStatus - Not support
-

diff --git a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_dev_video_sec.ini
deleted file mode 100644 (file)
index dd7626d..0000000
--- a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder_dev_video_sec.ini
+++ /dev/null
@@ -1,194 +0,0 @@
-; < Camera/Camcorder Configure Control INI file >
-;
-; - SDK Camera - VGA Camera
-;
-; - 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,0 || 0
-DeviceName = virtual driver
-PreviewResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
-CaptureResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
-VideoResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
-FPS0 = 30 || 30
-FPS1 = 30 || 30
-FPS2 = 30 || 30
-FPS3 = 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 || 4
-Overlay = 0,1 || 1
-; 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 = 7
-; 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 = 7
-; Recommend preview resolution
-;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9)
-RecommendPreviewResolution = 640,480 | 352,288 || 640,480
-; 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 = 1,20 || 10
-Contrast = 1,20 || 10
-Saturation = 1,20 || 10
-Sharpness = 1,20 || 10
-
-; White balance - real setting value
-;;; 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 = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
-
-; Color tone - real setting value
-;;; 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 = 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 || 0
-
-; Flip - MSL value(convert array index)
-;;; 0:NONE, 1:HORIZONTAL, 2:VERTICAL, 3:BOTH
-Flip = 0,-255,-255,-255 || 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
-
-
-[Photograph]
-;LensInit = 0,1 || 0
-;DigitalZoom = 10,30 || 10
-;OpticalZoom - Not support
-
-; Focus mode - real setting value
-;;; N/A
-; Focus mode - MSL value(convert array index)
-;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
-FocusMode = 0,-255,-255,-255,-255,-255 || 0
-
-; Auto focus type - real setting value
-;;; N/A
-; 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
-;;; 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,0,-255,-255,-255,-255,-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,-255,-255,-255,-255,-255,-255 || 0
-
-; Program mode - real setting value
-;;; 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 = 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
-
-; PTZ(Pan Tilt Zoom) type
-;;; 0:Mechanical, 1:Electronic
-;PtzType = 0,1 || 1
-
-; Pan range for mechanical movement
-;PanMecha = -10,10
-
-; Pan range for electronic movement
-;PanElec = -10,10
-
-; Tilt range for mechanical movement
-;TiltMecha = -10,10
-
-; Tilt range for electronic movement
-;TiltElec = -10,10
-
-
-[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
-OutputMode = 4,7,8,13 || 13
-JpegQuality = 0,100 || 50
-MultishotNumber = 1,1 || 1
-SensorEncodedCapture = 0
-; Support HDR
-;;; 0: OFF, 1: ON, 2: ON and Original
-SupportHDR = 0,-255,-255 || 0
-
-
-[Detect]
-; Detect mode
-;;; No need to convert
-;;; 0:OFF, 1:ON
-DetectMode = 0,-255 || 0
-;DetectNumber - Not support
-;DetectFocusSelect - Not support
-;DetectSelectNumber - Not support
-;DetectStatus - Not support
-

diff --git a/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder.ini
index a1a4e7617f576ece56c93550d94a815da0174ecc..f7d5842a99637ed112d5cb99b75547e3f0f47205 100644 (file)
--- a/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder.ini
+++ b/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder.ini
@@ -25,9 +25,6 @@ SyncStateChange = 1
 ModelName = ARTIK
 
 [VideoInput]
-UseConfCtrl = 1
-ConfCtrlFile0 = mmfw_camcorder_dev_video_pri.ini
-ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini
 VideosrcElement = v4l2src | 1,1 | do-timestamp,1 | device,/dev/video101
 UseVideoscale = 0
 UseZeroCopyFormat = 0

diff --git a/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder_camera0.ini b/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder_camera0.ini
new file mode 100644 (file)
index 0000000..607ab82
--- /dev/null
+++ b/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder_camera0.ini
@@ -0,0 +1,207 @@
+; < 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 = 0,-255 || 0
+DeviceName = S5K5EA
+PreviewResolution = 640,480 | 1280,720 | 1280,960 || 1280,720
+CaptureResolution = 640,480 | 1280,720 | 1280,960 | 2560,1440 || 1280,720
+VideoResolution = 640,480 | 1280,720 | 1280,960 || 640,480
+FPS0 = 15,30 || 15
+FPS1 = 15,30 || 15
+FPS2 = 15 || 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, 15:ENCODED_H264
+PictureFormat = 7 || 7
+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, 15:ENCODED_H264
+RecommendPreviewFormatCapture = 7
+; 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, 15:ENCODED_H264
+RecommendPreviewFormatRecord = 7
+; Recommend preview resolution
+;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9), 2: SQUARE ratio(1:1)
+RecommendPreviewResolution = 1280,960 | 1280,720 | 1280,960 || 1280,720
+; Camera facing direction
+;;; 0:REAR, 1:FRONT
+FacingDirection = 0
+
+
+[Strobe]
+;StrobeControl - Not support
+;StrobeCapabilities - Not support
+; Strobe mode - real setting value
+;;; 0:BASE, 1:OFF, 2:AUTO, 3:ON, 4:TORCH, 5:MAX
+; 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
+;StrobeStatus - Not support
+;StrobeEV - Not support
+
+
+[Effect]
+;Brightness = 0,8 || 4
+;Contrast = 1,7 || 4
+;Saturation = 0,4 || 2
+;Sharpness = 0,4 || 2
+
+; White balance - real setting value
+;;; 0:AUTO, 1:DAYLIGHT, 2:CLOUDY, 3:TUNGSTEN, 4: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,0,-255,-255,-255,-255,-255,-255,-255,-255 || 0
+
+; Color tone - real setting value
+;;; 1:NONE, 2:MONO, 3:SEPIA, 4:AQUA, 5:ANTIQUE, 6:NEGATIVE, 7:SHARPEN, 8:SKETCH, 9:WASHED, 10:VINTAGE_WARM
+;;; 11:VINTAGE_COLD, 12:SOLARIZE, 13:POSTERIZE, 14:POINT_BLUE, 15:POINT_RED_YELLOW, 16:POINT_COLOR_3, 17:POINT_GREEN, 18:POINT_RED, 19:POINT_YELLOW, 20:CARTOONIZE
+; 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,-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 || 1
+; 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
+;;; 0:OFF, 1:ON
+; 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,10 || 0
+;OpticalZoom = 0,0 || 0
+
+; Focus mode - real setting value
+;;; 0:AUTO, 1:MANUAL, 2:PAN, 3:TOUCH_AUTO, 4:CONTINUOUS
+; Focus mode - MSL value(convert array index)
+;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
+FocusMode = 0,-255,-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
+;;; 0:BASE, 1:MATRIX, 2:CENTER, 3:SPOT, 4:MAX
+; 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,0,-255,-255,-255,-255,-255,-255,-255 || 0
+
+;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
+; 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,-255,-255,-255,-255,-255,-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
+;;; 0:OFF, 1:ON
+; 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
+
+; PTZ(Pan Tilt Zoom) type
+;;; 0:Mechanical, 1:Electronic
+;PtzType = 0,1 || 1
+
+; Pan range for mechanical movement
+;PanMecha = -10,10
+
+; Pan range for electronic movement
+;PanElec = -10,10
+
+; Tilt range for mechanical movement
+;TiltMecha = -10,10
+
+; Tilt range for electronic movement
+;TiltElec = -10,10
+
+
+[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 = 7,13 || 13
+JpegQuality = 1,100 || 95
+MultishotNumber = 1,1 || 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,-255 || 0
+;DetectNumber - Not support
+;DetectFocusSelect - Not support
+;DetectSelectNumber - Not support
+;DetectStatus - Not support
+

diff --git a/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder_dev_video_pri.ini
deleted file mode 100644 (file)
index 607ab82..0000000
--- a/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_camcorder_dev_video_pri.ini
+++ /dev/null
@@ -1,207 +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 = 0,-255 || 0
-DeviceName = S5K5EA
-PreviewResolution = 640,480 | 1280,720 | 1280,960 || 1280,720
-CaptureResolution = 640,480 | 1280,720 | 1280,960 | 2560,1440 || 1280,720
-VideoResolution = 640,480 | 1280,720 | 1280,960 || 640,480
-FPS0 = 15,30 || 15
-FPS1 = 15,30 || 15
-FPS2 = 15 || 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, 15:ENCODED_H264
-PictureFormat = 7 || 7
-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, 15:ENCODED_H264
-RecommendPreviewFormatCapture = 7
-; 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, 15:ENCODED_H264
-RecommendPreviewFormatRecord = 7
-; Recommend preview resolution
-;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9), 2: SQUARE ratio(1:1)
-RecommendPreviewResolution = 1280,960 | 1280,720 | 1280,960 || 1280,720
-; Camera facing direction
-;;; 0:REAR, 1:FRONT
-FacingDirection = 0
-
-
-[Strobe]
-;StrobeControl - Not support
-;StrobeCapabilities - Not support
-; Strobe mode - real setting value
-;;; 0:BASE, 1:OFF, 2:AUTO, 3:ON, 4:TORCH, 5:MAX
-; 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
-;StrobeStatus - Not support
-;StrobeEV - Not support
-
-
-[Effect]
-;Brightness = 0,8 || 4
-;Contrast = 1,7 || 4
-;Saturation = 0,4 || 2
-;Sharpness = 0,4 || 2
-
-; White balance - real setting value
-;;; 0:AUTO, 1:DAYLIGHT, 2:CLOUDY, 3:TUNGSTEN, 4: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,0,-255,-255,-255,-255,-255,-255,-255,-255 || 0
-
-; Color tone - real setting value
-;;; 1:NONE, 2:MONO, 3:SEPIA, 4:AQUA, 5:ANTIQUE, 6:NEGATIVE, 7:SHARPEN, 8:SKETCH, 9:WASHED, 10:VINTAGE_WARM
-;;; 11:VINTAGE_COLD, 12:SOLARIZE, 13:POSTERIZE, 14:POINT_BLUE, 15:POINT_RED_YELLOW, 16:POINT_COLOR_3, 17:POINT_GREEN, 18:POINT_RED, 19:POINT_YELLOW, 20:CARTOONIZE
-; 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,-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 || 1
-; 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
-;;; 0:OFF, 1:ON
-; 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,10 || 0
-;OpticalZoom = 0,0 || 0
-
-; Focus mode - real setting value
-;;; 0:AUTO, 1:MANUAL, 2:PAN, 3:TOUCH_AUTO, 4:CONTINUOUS
-; Focus mode - MSL value(convert array index)
-;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
-FocusMode = 0,-255,-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
-;;; 0:BASE, 1:MATRIX, 2:CENTER, 3:SPOT, 4:MAX
-; 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,0,-255,-255,-255,-255,-255,-255,-255 || 0
-
-;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
-; 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,-255,-255,-255,-255,-255,-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
-;;; 0:OFF, 1:ON
-; 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
-
-; PTZ(Pan Tilt Zoom) type
-;;; 0:Mechanical, 1:Electronic
-;PtzType = 0,1 || 1
-
-; Pan range for mechanical movement
-;PanMecha = -10,10
-
-; Pan range for electronic movement
-;PanElec = -10,10
-
-; Tilt range for mechanical movement
-;TiltMecha = -10,10
-
-; Tilt range for electronic movement
-;TiltElec = -10,10
-
-
-[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 = 7,13 || 13
-JpegQuality = 1,100 || 95
-MultishotNumber = 1,1 || 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,-255 || 0
-;DetectNumber - Not support
-;DetectFocusSelect - Not support
-;DetectSelectNumber - Not support
-;DetectStatus - Not support
-

diff --git a/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder.ini
index 264d7511029737e9f3d7412612d758130c1d28bb..8c3516557af2a5b0d5b3cefda71e280ba840a07a 100644 (file)
--- a/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder.ini
+++ b/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder.ini
@@ -26,9 +26,6 @@ ModelName = GT-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 = tvcamerasrc | 1,1 | do-timestamp,1 | device,/dev/video241
 UseVideoscale = 1
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1

diff --git a/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder_camera0.ini b/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder_camera0.ini
new file mode 100644 (file)
index 0000000..5b770de
--- /dev/null
+++ b/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder_camera0.ini
@@ -0,0 +1,213 @@
+; < 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 = 0,-255 || 0
+DeviceName = TV_USB_Camera
+PreviewResolution = 160,90 | 160,120 | 320,180 | 320,240 | 640,360 | 640,480 | 1280,720 | 1440,1080 | 1920,1080 || 1920,1080
+CaptureResolution = 1920,1080 || 1920,1080
+VideoResolution = 160,90 | 160,120 | 320,180 | 320,240 | 640,360 | 640,480 | 1280,720 | 1440,1080 | 1920,1080 || 1920,1080
+FPS0 = 0,8,15,24,25,30,60,120 || 30
+FPS1 = 0,8,15,24,25,30,60,120 || 30
+FPS2 = 0,8,15,24,25,30,60,120 || 30
+FPS3 = 0,8,15,24,25,30,60,120 || 30
+FPS4 = 0,8,15,24,25,30,60,120 || 30
+FPS5 = 0,8,15,24,25,30,60,120 || 30
+FPS6 = 0,8,15,24,25,30,60,120 || 30
+FPS7 = 0,8,15,24,25,30,60,120 || 30
+FPS8 = 0,8,15,24,25,30,60,120 || 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, 14:INTERLEAVED_JPEG_UYVY, 15:ENCODED_H264
+PictureFormat = 15 || 15
+Overlay = 0,1 || 1
+; 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, 15:ENCODED_H264
+RecommendPreviewFormatCapture = 15
+; 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, 15:ENCODED_H264
+RecommendPreviewFormatRecord = 15
+; Recommend preview resolution
+;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9), 2: SQUARE ratio(1:1)
+RecommendPreviewResolution = 1440,1080 | 1920,1080 | 1440,1080 || 1920,1080
+; Camera facing direction
+;;; 0:REAR, 1:FRONT
+FacingDirection = 0
+
+
+[Strobe]
+;StrobeControl - Not support
+;StrobeCapabilities - Not support
+; Strobe mode - real setting value
+;;; 0:BASE, 1:OFF, 2:AUTO, 3:ON, 4:TORCH, 5:MAX
+; 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
+;StrobeStatus - Not support
+;StrobeEV - Not support
+
+
+[Effect]
+Brightness = 0,8 || 4
+Contrast = 1,7 || 4
+Saturation = 0,4 || 2
+Sharpness = 0,4 || 2
+
+; White balance - real setting value
+;;; 0:AUTO, 1:DAYLIGHT, 2:CLOUDY, 3:TUNGSTEN, 4: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:MONO, 3:SEPIA, 4:AQUA, 5:ANTIQUE, 6:NEGATIVE, 7:SHARPEN, 8:SKETCH, 9:WASHED, 10:VINTAGE_WARM
+;;; 11:VINTAGE_COLD, 12:SOLARIZE, 13:POSTERIZE, 14:POINT_BLUE, 15:POINT_RED_YELLOW, 16:POINT_COLOR_3, 17:POINT_GREEN, 18:POINT_RED, 19:POINT_YELLOW, 20:CARTOONIZE
+; 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,4,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,12,8,9,10,11,13,20,-255,17,14,-255,15 || 1
+; 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
+;;; 0:OFF, 1:ON
+; 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,10 || 0
+OpticalZoom = 0,0 || 0
+
+; Focus mode - real setting value
+;;; 0:AUTO, 1:MANUAL, 2:PAN, 3:TOUCH_AUTO, 4:CONTINUOUS
+; Focus mode - MSL value(convert array index)
+;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
+FocusMode = 0,-255,-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
+;;; 0:BASE, 1:MATRIX, 2:CENTER, 3:SPOT, 4:MAX
+; 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
+
+;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
+; 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 = 1,2,5,6,7,8,9,10,11,3,12,13,-255,14,4 || 1
+
+; Anti-handshake - real setting value
+;;; 0:OFF, 1:ON
+; 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
+
+; PTZ(Pan Tilt Zoom) type
+;;; 0:Mechanical, 1:Electronic
+PtzType = 0,1 || 1
+
+; Pan range for mechanical movement
+PanMecha = -10,10
+
+; Pan range for electronic movement
+PanElec = -10,10
+
+; Tilt range for mechanical movement
+TiltMecha = -10,10
+
+; Tilt range for electronic movement
+TiltElec = -10,10
+
+
+[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 = 13 || 13
+JpegQuality = 0,100 || 90
+MultishotNumber = 1,1 || 1
+SensorEncodedCapture = 1
+; Support HDR
+;;; 0: OFF, 1: ON, 2: ON and Original
+SupportHDR = 0,-255,-255 || 0
+
+
+[Detect]
+; Detect mode
+;;; 0:OFF, 1:ON
+DetectMode = 0 || 0
+;DetectNumber - Not support
+;DetectFocusSelect - Not support
+;DetectSelectNumber - Not support
+;DetectStatus - Not support
+

diff --git a/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder_dev_video_pri.ini
deleted file mode 100644 (file)
index 5b770de..0000000
--- a/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder_dev_video_pri.ini
+++ /dev/null
@@ -1,213 +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 = 0,-255 || 0
-DeviceName = TV_USB_Camera
-PreviewResolution = 160,90 | 160,120 | 320,180 | 320,240 | 640,360 | 640,480 | 1280,720 | 1440,1080 | 1920,1080 || 1920,1080
-CaptureResolution = 1920,1080 || 1920,1080
-VideoResolution = 160,90 | 160,120 | 320,180 | 320,240 | 640,360 | 640,480 | 1280,720 | 1440,1080 | 1920,1080 || 1920,1080
-FPS0 = 0,8,15,24,25,30,60,120 || 30
-FPS1 = 0,8,15,24,25,30,60,120 || 30
-FPS2 = 0,8,15,24,25,30,60,120 || 30
-FPS3 = 0,8,15,24,25,30,60,120 || 30
-FPS4 = 0,8,15,24,25,30,60,120 || 30
-FPS5 = 0,8,15,24,25,30,60,120 || 30
-FPS6 = 0,8,15,24,25,30,60,120 || 30
-FPS7 = 0,8,15,24,25,30,60,120 || 30
-FPS8 = 0,8,15,24,25,30,60,120 || 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, 14:INTERLEAVED_JPEG_UYVY, 15:ENCODED_H264
-PictureFormat = 15 || 15
-Overlay = 0,1 || 1
-; 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, 15:ENCODED_H264
-RecommendPreviewFormatCapture = 15
-; 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, 15:ENCODED_H264
-RecommendPreviewFormatRecord = 15
-; Recommend preview resolution
-;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9), 2: SQUARE ratio(1:1)
-RecommendPreviewResolution = 1440,1080 | 1920,1080 | 1440,1080 || 1920,1080
-; Camera facing direction
-;;; 0:REAR, 1:FRONT
-FacingDirection = 0
-
-
-[Strobe]
-;StrobeControl - Not support
-;StrobeCapabilities - Not support
-; Strobe mode - real setting value
-;;; 0:BASE, 1:OFF, 2:AUTO, 3:ON, 4:TORCH, 5:MAX
-; 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
-;StrobeStatus - Not support
-;StrobeEV - Not support
-
-
-[Effect]
-Brightness = 0,8 || 4
-Contrast = 1,7 || 4
-Saturation = 0,4 || 2
-Sharpness = 0,4 || 2
-
-; White balance - real setting value
-;;; 0:AUTO, 1:DAYLIGHT, 2:CLOUDY, 3:TUNGSTEN, 4: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:MONO, 3:SEPIA, 4:AQUA, 5:ANTIQUE, 6:NEGATIVE, 7:SHARPEN, 8:SKETCH, 9:WASHED, 10:VINTAGE_WARM
-;;; 11:VINTAGE_COLD, 12:SOLARIZE, 13:POSTERIZE, 14:POINT_BLUE, 15:POINT_RED_YELLOW, 16:POINT_COLOR_3, 17:POINT_GREEN, 18:POINT_RED, 19:POINT_YELLOW, 20:CARTOONIZE
-; 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,4,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,12,8,9,10,11,13,20,-255,17,14,-255,15 || 1
-; 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
-;;; 0:OFF, 1:ON
-; 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,10 || 0
-OpticalZoom = 0,0 || 0
-
-; Focus mode - real setting value
-;;; 0:AUTO, 1:MANUAL, 2:PAN, 3:TOUCH_AUTO, 4:CONTINUOUS
-; Focus mode - MSL value(convert array index)
-;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
-FocusMode = 0,-255,-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
-;;; 0:BASE, 1:MATRIX, 2:CENTER, 3:SPOT, 4:MAX
-; 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
-
-;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
-; 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 = 1,2,5,6,7,8,9,10,11,3,12,13,-255,14,4 || 1
-
-; Anti-handshake - real setting value
-;;; 0:OFF, 1:ON
-; 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
-
-; PTZ(Pan Tilt Zoom) type
-;;; 0:Mechanical, 1:Electronic
-PtzType = 0,1 || 1
-
-; Pan range for mechanical movement
-PanMecha = -10,10
-
-; Pan range for electronic movement
-PanElec = -10,10
-
-; Tilt range for mechanical movement
-TiltMecha = -10,10
-
-; Tilt range for electronic movement
-TiltElec = -10,10
-
-
-[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 = 13 || 13
-JpegQuality = 0,100 || 90
-MultishotNumber = 1,1 || 1
-SensorEncodedCapture = 1
-; Support HDR
-;;; 0: OFF, 1: ON, 2: ON and Original
-SupportHDR = 0,-255,-255 || 0
-
-
-[Detect]
-; Detect mode
-;;; 0:OFF, 1:ON
-DetectMode = 0 || 0
-;DetectNumber - Not support
-;DetectFocusSelect - Not support
-;DetectSelectNumber - Not support
-;DetectStatus - Not support
-

diff --git a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder.ini
index 4c940ac91e2a70467b873a3ea7271eebe35d0a4f..4d73fad0f81b14f2b8e2f443be166cc890dc1aad 100644 (file)
--- a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder.ini
+++ b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder.ini
@@ -26,9 +26,6 @@ ModelName = GT-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 = videotestsrc | 2,0 | do-timestamp,1 | is-live,1
 UseVideoscale = 1
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1

diff --git a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_camera0.ini b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_camera0.ini
new file mode 100644 (file)
index 0000000..fd96f16
--- /dev/null
+++ b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_camera0.ini
@@ -0,0 +1,206 @@
+; < 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 = 0,-255 || 0
+DeviceName = TEST_CAMERA_0
+PreviewResolution = 320,240 | 640,480 || 320,240
+CaptureResolution = 320,240 | 640,480 || 640,480
+VideoResolution = 320,240 | 640,480 || 640,480
+FPS0 = 0,15,30 || 15
+FPS1 = 0,15,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, 15:ENCODED_H264
+PictureFormat = 7 || 7
+Overlay = 0,1 || 1
+; 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, 15:ENCODED_H264
+RecommendPreviewFormatCapture = 7
+; 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, 15:ENCODED_H264
+RecommendPreviewFormatRecord = 7
+; Recommend preview resolution
+;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9), 2: SQUARE ratio(1:1)
+RecommendPreviewResolution = 320,240 | 320,240 | 320,240 || 320,240
+; Camera facing direction
+;;; 0:REAR, 1:FRONT
+FacingDirection = 0
+
+
+[Strobe]
+;StrobeControl - Not support
+;StrobeCapabilities - Not support
+; Strobe mode - real setting value
+;;; 0:BASE, 1:OFF, 2:AUTO, 3:ON, 4:TORCH, 5:MAX
+; 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,3,2,-255,-255,-255,-255,4 || 2
+;StrobeStatus - Not support
+;StrobeEV - Not support
+
+
+[Effect]
+Brightness = 0,8 || 4
+;Contrast = 1,7 || 4
+;Saturation = 0,4 || 2
+;Sharpness = 0,4 || 2
+
+; White balance - real setting value
+;;; 0:AUTO, 1:DAYLIGHT, 2:CLOUDY, 3:TUNGSTEN, 4: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,0,-255,-255,-255,-255,-255,-255,-255,-255 || 0
+
+; Color tone - real setting value
+;;; 1:NONE, 2:MONO, 3:SEPIA, 4:AQUA, 5:ANTIQUE, 6:NEGATIVE, 7:SHARPEN, 8:SKETCH, 9:WASHED, 10:VINTAGE_WARM
+;;; 11:VINTAGE_COLD, 12:SOLARIZE, 13:POSTERIZE, 14:POINT_BLUE, 15:POINT_RED_YELLOW, 16:POINT_COLOR_3, 17:POINT_GREEN, 18:POINT_RED, 19:POINT_YELLOW, 20:CARTOONIZE
+; 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,-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 || 1
+; 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
+;;; 0:OFF, 1:ON
+; 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,10 || 0
+;OpticalZoom = 0,0 || 0
+
+; Focus mode - real setting value
+;;; 0:AUTO, 1:MANUAL, 2:PAN, 3:TOUCH_AUTO, 4:CONTINUOUS
+; Focus mode - MSL value(convert array index)
+;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
+FocusMode = 0,-255,-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
+;;; 0:BASE, 1:MATRIX, 2:CENTER, 3:SPOT, 4:MAX
+; 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,0,-255,-255,-255,-255,-255,-255,-255 || 0
+
+;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
+; 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,-255,-255,-255,-255,-255,-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
+;;; 0:OFF, 1:ON
+; 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
+
+; PTZ(Pan Tilt Zoom) type
+;;; 0:Mechanical, 1:Electronic
+;PtzType = 0,1 || 1
+
+; Pan range for mechanical movement
+;PanMecha = -10,10
+
+; Pan range for electronic movement
+;PanElec = -10,10
+
+; Tilt range for mechanical movement
+;TiltMecha = -10,10
+
+; Tilt range for electronic movement
+;TiltElec = -10,10
+
+
+[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 = 7,13 || 13
+JpegQuality = 0,100 || 90
+MultishotNumber = 1,1 || 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,-255 || 0
+;DetectNumber - Not support
+;DetectFocusSelect - Not support
+;DetectSelectNumber - Not support
+;DetectStatus - Not support
+

diff --git a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_camera1.ini b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_camera1.ini
new file mode 100644 (file)
index 0000000..a8d1a35
--- /dev/null
+++ b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_camera1.ini
@@ -0,0 +1,206 @@
+; < 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 = 0,-255 || 0
+DeviceName = TEST_CAMERA_1
+PreviewResolution = 320,240 | 640,480 || 320,240
+CaptureResolution = 320,240 | 640,480 || 640,480
+VideoResolution = 320,240 | 640,480 || 640,480
+FPS0 = 0,15,30 || 15
+FPS1 = 0,15,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, 15:ENCODED_H264
+PictureFormat = 7 || 7
+Overlay = 0,1 || 1
+; 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, 15:ENCODED_H264
+RecommendPreviewFormatCapture = 7
+; 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, 15:ENCODED_H264
+RecommendPreviewFormatRecord = 7
+; Recommend preview resolution
+;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9), 2: SQUARE ratio(1:1)
+RecommendPreviewResolution = 320,240 | 320,240 | 320,240 || 320,240
+; Camera facing direction
+;;; 0:REAR, 1:FRONT
+FacingDirection = 0
+
+
+[Strobe]
+;StrobeControl - Not support
+;StrobeCapabilities - Not support
+; Strobe mode - real setting value
+;;; 0:BASE, 1:OFF, 2:AUTO, 3:ON, 4:TORCH, 5:MAX
+; 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,3,2,-255,-255,-255,-255,4 || 2
+;StrobeStatus - Not support
+;StrobeEV - Not support
+
+
+[Effect]
+Brightness = 0,8 || 4
+;Contrast = 1,7 || 4
+;Saturation = 0,4 || 2
+;Sharpness = 0,4 || 2
+
+; White balance - real setting value
+;;; 0:AUTO, 1:DAYLIGHT, 2:CLOUDY, 3:TUNGSTEN, 4: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,0,-255,-255,-255,-255,-255,-255,-255,-255 || 0
+
+; Color tone - real setting value
+;;; 1:NONE, 2:MONO, 3:SEPIA, 4:AQUA, 5:ANTIQUE, 6:NEGATIVE, 7:SHARPEN, 8:SKETCH, 9:WASHED, 10:VINTAGE_WARM
+;;; 11:VINTAGE_COLD, 12:SOLARIZE, 13:POSTERIZE, 14:POINT_BLUE, 15:POINT_RED_YELLOW, 16:POINT_COLOR_3, 17:POINT_GREEN, 18:POINT_RED, 19:POINT_YELLOW, 20:CARTOONIZE
+; 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,-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 || 1
+; 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
+;;; 0:OFF, 1:ON
+; 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,10 || 0
+;OpticalZoom = 0,0 || 0
+
+; Focus mode - real setting value
+;;; 0:AUTO, 1:MANUAL, 2:PAN, 3:TOUCH_AUTO, 4:CONTINUOUS
+; Focus mode - MSL value(convert array index)
+;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
+FocusMode = 0,-255,-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
+;;; 0:BASE, 1:MATRIX, 2:CENTER, 3:SPOT, 4:MAX
+; 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,0,-255,-255,-255,-255,-255,-255,-255 || 0
+
+;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
+; 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,-255,-255,-255,-255,-255,-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
+;;; 0:OFF, 1:ON
+; 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
+
+; PTZ(Pan Tilt Zoom) type
+;;; 0:Mechanical, 1:Electronic
+;PtzType = 0,1 || 1
+
+; Pan range for mechanical movement
+;PanMecha = -10,10
+
+; Pan range for electronic movement
+;PanElec = -10,10
+
+; Tilt range for mechanical movement
+;TiltMecha = -10,10
+
+; Tilt range for electronic movement
+;TiltElec = -10,10
+
+
+[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 = 7,13 || 13
+JpegQuality = 0,100 || 90
+MultishotNumber = 1,1 || 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,-255 || 0
+;DetectNumber - Not support
+;DetectFocusSelect - Not support
+;DetectSelectNumber - Not support
+;DetectStatus - Not support
+

diff --git a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_dev_video_pri.ini
deleted file mode 100644 (file)
index fd96f16..0000000
--- a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_dev_video_pri.ini
+++ /dev/null
@@ -1,206 +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 = 0,-255 || 0
-DeviceName = TEST_CAMERA_0
-PreviewResolution = 320,240 | 640,480 || 320,240
-CaptureResolution = 320,240 | 640,480 || 640,480
-VideoResolution = 320,240 | 640,480 || 640,480
-FPS0 = 0,15,30 || 15
-FPS1 = 0,15,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, 15:ENCODED_H264
-PictureFormat = 7 || 7
-Overlay = 0,1 || 1
-; 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, 15:ENCODED_H264
-RecommendPreviewFormatCapture = 7
-; 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, 15:ENCODED_H264
-RecommendPreviewFormatRecord = 7
-; Recommend preview resolution
-;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9), 2: SQUARE ratio(1:1)
-RecommendPreviewResolution = 320,240 | 320,240 | 320,240 || 320,240
-; Camera facing direction
-;;; 0:REAR, 1:FRONT
-FacingDirection = 0
-
-
-[Strobe]
-;StrobeControl - Not support
-;StrobeCapabilities - Not support
-; Strobe mode - real setting value
-;;; 0:BASE, 1:OFF, 2:AUTO, 3:ON, 4:TORCH, 5:MAX
-; 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,3,2,-255,-255,-255,-255,4 || 2
-;StrobeStatus - Not support
-;StrobeEV - Not support
-
-
-[Effect]
-Brightness = 0,8 || 4
-;Contrast = 1,7 || 4
-;Saturation = 0,4 || 2
-;Sharpness = 0,4 || 2
-
-; White balance - real setting value
-;;; 0:AUTO, 1:DAYLIGHT, 2:CLOUDY, 3:TUNGSTEN, 4: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,0,-255,-255,-255,-255,-255,-255,-255,-255 || 0
-
-; Color tone - real setting value
-;;; 1:NONE, 2:MONO, 3:SEPIA, 4:AQUA, 5:ANTIQUE, 6:NEGATIVE, 7:SHARPEN, 8:SKETCH, 9:WASHED, 10:VINTAGE_WARM
-;;; 11:VINTAGE_COLD, 12:SOLARIZE, 13:POSTERIZE, 14:POINT_BLUE, 15:POINT_RED_YELLOW, 16:POINT_COLOR_3, 17:POINT_GREEN, 18:POINT_RED, 19:POINT_YELLOW, 20:CARTOONIZE
-; 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,-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 || 1
-; 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
-;;; 0:OFF, 1:ON
-; 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,10 || 0
-;OpticalZoom = 0,0 || 0
-
-; Focus mode - real setting value
-;;; 0:AUTO, 1:MANUAL, 2:PAN, 3:TOUCH_AUTO, 4:CONTINUOUS
-; Focus mode - MSL value(convert array index)
-;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
-FocusMode = 0,-255,-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
-;;; 0:BASE, 1:MATRIX, 2:CENTER, 3:SPOT, 4:MAX
-; 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,0,-255,-255,-255,-255,-255,-255,-255 || 0
-
-;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
-; 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,-255,-255,-255,-255,-255,-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
-;;; 0:OFF, 1:ON
-; 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
-
-; PTZ(Pan Tilt Zoom) type
-;;; 0:Mechanical, 1:Electronic
-;PtzType = 0,1 || 1
-
-; Pan range for mechanical movement
-;PanMecha = -10,10
-
-; Pan range for electronic movement
-;PanElec = -10,10
-
-; Tilt range for mechanical movement
-;TiltMecha = -10,10
-
-; Tilt range for electronic movement
-;TiltElec = -10,10
-
-
-[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 = 7,13 || 13
-JpegQuality = 0,100 || 90
-MultishotNumber = 1,1 || 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,-255 || 0
-;DetectNumber - Not support
-;DetectFocusSelect - Not support
-;DetectSelectNumber - Not support
-;DetectStatus - Not support
-

diff --git a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_dev_video_sec.ini
deleted file mode 100644 (file)
index a8d1a35..0000000
--- a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder_dev_video_sec.ini
+++ /dev/null
@@ -1,206 +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 = 0,-255 || 0
-DeviceName = TEST_CAMERA_1
-PreviewResolution = 320,240 | 640,480 || 320,240
-CaptureResolution = 320,240 | 640,480 || 640,480
-VideoResolution = 320,240 | 640,480 || 640,480
-FPS0 = 0,15,30 || 15
-FPS1 = 0,15,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, 15:ENCODED_H264
-PictureFormat = 7 || 7
-Overlay = 0,1 || 1
-; 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, 15:ENCODED_H264
-RecommendPreviewFormatCapture = 7
-; 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, 15:ENCODED_H264
-RecommendPreviewFormatRecord = 7
-; Recommend preview resolution
-;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9), 2: SQUARE ratio(1:1)
-RecommendPreviewResolution = 320,240 | 320,240 | 320,240 || 320,240
-; Camera facing direction
-;;; 0:REAR, 1:FRONT
-FacingDirection = 0
-
-
-[Strobe]
-;StrobeControl - Not support
-;StrobeCapabilities - Not support
-; Strobe mode - real setting value
-;;; 0:BASE, 1:OFF, 2:AUTO, 3:ON, 4:TORCH, 5:MAX
-; 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,3,2,-255,-255,-255,-255,4 || 2
-;StrobeStatus - Not support
-;StrobeEV - Not support
-
-
-[Effect]
-Brightness = 0,8 || 4
-;Contrast = 1,7 || 4
-;Saturation = 0,4 || 2
-;Sharpness = 0,4 || 2
-
-; White balance - real setting value
-;;; 0:AUTO, 1:DAYLIGHT, 2:CLOUDY, 3:TUNGSTEN, 4: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,0,-255,-255,-255,-255,-255,-255,-255,-255 || 0
-
-; Color tone - real setting value
-;;; 1:NONE, 2:MONO, 3:SEPIA, 4:AQUA, 5:ANTIQUE, 6:NEGATIVE, 7:SHARPEN, 8:SKETCH, 9:WASHED, 10:VINTAGE_WARM
-;;; 11:VINTAGE_COLD, 12:SOLARIZE, 13:POSTERIZE, 14:POINT_BLUE, 15:POINT_RED_YELLOW, 16:POINT_COLOR_3, 17:POINT_GREEN, 18:POINT_RED, 19:POINT_YELLOW, 20:CARTOONIZE
-; 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,-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 || 1
-; 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
-;;; 0:OFF, 1:ON
-; 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,10 || 0
-;OpticalZoom = 0,0 || 0
-
-; Focus mode - real setting value
-;;; 0:AUTO, 1:MANUAL, 2:PAN, 3:TOUCH_AUTO, 4:CONTINUOUS
-; Focus mode - MSL value(convert array index)
-;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
-FocusMode = 0,-255,-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
-;;; 0:BASE, 1:MATRIX, 2:CENTER, 3:SPOT, 4:MAX
-; 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,0,-255,-255,-255,-255,-255,-255,-255 || 0
-
-;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
-; 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,-255,-255,-255,-255,-255,-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
-;;; 0:OFF, 1:ON
-; 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
-
-; PTZ(Pan Tilt Zoom) type
-;;; 0:Mechanical, 1:Electronic
-;PtzType = 0,1 || 1
-
-; Pan range for mechanical movement
-;PanMecha = -10,10
-
-; Pan range for electronic movement
-;PanElec = -10,10
-
-; Tilt range for mechanical movement
-;TiltMecha = -10,10
-
-; Tilt range for electronic movement
-;TiltElec = -10,10
-
-
-[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 = 7,13 || 13
-JpegQuality = 0,100 || 90
-MultishotNumber = 1,1 || 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,-255 || 0
-;DetectNumber - Not support
-;DetectFocusSelect - Not support
-;DetectSelectNumber - Not support
-;DetectStatus - Not support
-

diff --git a/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder.ini
index 095820f4eec79a6654a81a42caf53451b88c3ae9..80c8e830f97d2305b7fe3441076b7f340b039275 100644 (file)
--- a/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder.ini
+++ b/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder.ini
@@ -26,9 +26,6 @@ ModelName = GT-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 = v4l2src | 1,0 | do-timestamp,1
 UseVideoscale = 1
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1

diff --git a/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder_camera0.ini b/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder_camera0.ini
new file mode 100644 (file)
index 0000000..dc61517
--- /dev/null
+++ b/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder_camera0.ini
@@ -0,0 +1,206 @@
+; < 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 = 0,-255 || 0
+DeviceName = USB_CAMERA
+PreviewResolution = 320,240 | 640,480 || 320,240
+CaptureResolution = 320,240 | 640,480 || 640,480
+VideoResolution = 320,240 | 640,480 || 640,480
+FPS0 = 0,15,30 || 15
+FPS1 = 0,15,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, 15:ENCODED_H264
+PictureFormat = 7 || 7
+Overlay = 0,1 || 1
+; 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, 15:ENCODED_H264
+RecommendPreviewFormatCapture = 7
+; 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, 15:ENCODED_H264
+RecommendPreviewFormatRecord = 7
+; Recommend preview resolution
+;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9), 2: SQUARE ratio(1:1)
+RecommendPreviewResolution = 320,240 | 320,240 | 320,240 || 320,240
+; Camera facing direction
+;;; 0:REAR, 1:FRONT
+FacingDirection = 0
+
+
+[Strobe]
+;StrobeControl - Not support
+;StrobeCapabilities - Not support
+; Strobe mode - real setting value
+;;; 0:BASE, 1:OFF, 2:AUTO, 3:ON, 4:TORCH, 5:MAX
+; 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,3,2,-255,-255,-255,-255,4 || 2
+;StrobeStatus - Not support
+;StrobeEV - Not support
+
+
+[Effect]
+Brightness = 0,8 || 4
+;Contrast = 1,7 || 4
+;Saturation = 0,4 || 2
+;Sharpness = 0,4 || 2
+
+; White balance - real setting value
+;;; 0:AUTO, 1:DAYLIGHT, 2:CLOUDY, 3:TUNGSTEN, 4: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,0,-255,-255,-255,-255,-255,-255,-255,-255 || 0
+
+; Color tone - real setting value
+;;; 1:NONE, 2:MONO, 3:SEPIA, 4:AQUA, 5:ANTIQUE, 6:NEGATIVE, 7:SHARPEN, 8:SKETCH, 9:WASHED, 10:VINTAGE_WARM
+;;; 11:VINTAGE_COLD, 12:SOLARIZE, 13:POSTERIZE, 14:POINT_BLUE, 15:POINT_RED_YELLOW, 16:POINT_COLOR_3, 17:POINT_GREEN, 18:POINT_RED, 19:POINT_YELLOW, 20:CARTOONIZE
+; 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,-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 || 1
+; 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
+;;; 0:OFF, 1:ON
+; 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,10 || 0
+;OpticalZoom = 0,0 || 0
+
+; Focus mode - real setting value
+;;; 0:AUTO, 1:MANUAL, 2:PAN, 3:TOUCH_AUTO, 4:CONTINUOUS
+; Focus mode - MSL value(convert array index)
+;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
+FocusMode = 0,-255,-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
+;;; 0:BASE, 1:MATRIX, 2:CENTER, 3:SPOT, 4:MAX
+; 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,0,-255,-255,-255,-255,-255,-255,-255 || 0
+
+;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
+; 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,-255,-255,-255,-255,-255,-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
+;;; 0:OFF, 1:ON
+; 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
+
+; PTZ(Pan Tilt Zoom) type
+;;; 0:Mechanical, 1:Electronic
+;PtzType = 0,1 || 1
+
+; Pan range for mechanical movement
+;PanMecha = -10,10
+
+; Pan range for electronic movement
+;PanElec = -10,10
+
+; Tilt range for mechanical movement
+;TiltMecha = -10,10
+
+; Tilt range for electronic movement
+;TiltElec = -10,10
+
+
+[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 = 7,13 || 13
+JpegQuality = 0,100 || 90
+MultishotNumber = 1,1 || 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,-255 || 0
+;DetectNumber - Not support
+;DetectFocusSelect - Not support
+;DetectSelectNumber - Not support
+;DetectStatus - Not support
+

diff --git a/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder_dev_video_pri.ini
deleted file mode 100644 (file)
index dc61517..0000000
--- a/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_camcorder_dev_video_pri.ini
+++ /dev/null
@@ -1,206 +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 = 0,-255 || 0
-DeviceName = USB_CAMERA
-PreviewResolution = 320,240 | 640,480 || 320,240
-CaptureResolution = 320,240 | 640,480 || 640,480
-VideoResolution = 320,240 | 640,480 || 640,480
-FPS0 = 0,15,30 || 15
-FPS1 = 0,15,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, 15:ENCODED_H264
-PictureFormat = 7 || 7
-Overlay = 0,1 || 1
-; 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, 15:ENCODED_H264
-RecommendPreviewFormatCapture = 7
-; 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, 15:ENCODED_H264
-RecommendPreviewFormatRecord = 7
-; Recommend preview resolution
-;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9), 2: SQUARE ratio(1:1)
-RecommendPreviewResolution = 320,240 | 320,240 | 320,240 || 320,240
-; Camera facing direction
-;;; 0:REAR, 1:FRONT
-FacingDirection = 0
-
-
-[Strobe]
-;StrobeControl - Not support
-;StrobeCapabilities - Not support
-; Strobe mode - real setting value
-;;; 0:BASE, 1:OFF, 2:AUTO, 3:ON, 4:TORCH, 5:MAX
-; 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,3,2,-255,-255,-255,-255,4 || 2
-;StrobeStatus - Not support
-;StrobeEV - Not support
-
-
-[Effect]
-Brightness = 0,8 || 4
-;Contrast = 1,7 || 4
-;Saturation = 0,4 || 2
-;Sharpness = 0,4 || 2
-
-; White balance - real setting value
-;;; 0:AUTO, 1:DAYLIGHT, 2:CLOUDY, 3:TUNGSTEN, 4: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,0,-255,-255,-255,-255,-255,-255,-255,-255 || 0
-
-; Color tone - real setting value
-;;; 1:NONE, 2:MONO, 3:SEPIA, 4:AQUA, 5:ANTIQUE, 6:NEGATIVE, 7:SHARPEN, 8:SKETCH, 9:WASHED, 10:VINTAGE_WARM
-;;; 11:VINTAGE_COLD, 12:SOLARIZE, 13:POSTERIZE, 14:POINT_BLUE, 15:POINT_RED_YELLOW, 16:POINT_COLOR_3, 17:POINT_GREEN, 18:POINT_RED, 19:POINT_YELLOW, 20:CARTOONIZE
-; 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,-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 || 1
-; 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
-;;; 0:OFF, 1:ON
-; 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,10 || 0
-;OpticalZoom = 0,0 || 0
-
-; Focus mode - real setting value
-;;; 0:AUTO, 1:MANUAL, 2:PAN, 3:TOUCH_AUTO, 4:CONTINUOUS
-; Focus mode - MSL value(convert array index)
-;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
-FocusMode = 0,-255,-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
-;;; 0:BASE, 1:MATRIX, 2:CENTER, 3:SPOT, 4:MAX
-; 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,0,-255,-255,-255,-255,-255,-255,-255 || 0
-
-;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
-; 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,-255,-255,-255,-255,-255,-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
-;;; 0:OFF, 1:ON
-; 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
-
-; PTZ(Pan Tilt Zoom) type
-;;; 0:Mechanical, 1:Electronic
-;PtzType = 0,1 || 1
-
-; Pan range for mechanical movement
-;PanMecha = -10,10
-
-; Pan range for electronic movement
-;PanElec = -10,10
-
-; Tilt range for mechanical movement
-;TiltMecha = -10,10
-
-; Tilt range for electronic movement
-;TiltElec = -10,10
-
-
-[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 = 7,13 || 13
-JpegQuality = 0,100 || 90
-MultishotNumber = 1,1 || 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,-255 || 0
-;DetectNumber - Not support
-;DetectFocusSelect - Not support
-;DetectSelectNumber - Not support
-;DetectStatus - Not support
-

diff --git a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder.ini
index 63f809a7b11dfebf56d4ba785dd8e78b29f8e1c7..062c79e70b581afed7b07a0ee73eecdd4dff4c36 100644 (file)
--- a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder.ini
+++ b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder.ini
@@ -26,9 +26,6 @@ ModelName = TM1
 ;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 = camerasrc | 2,0 | do-timestamp,1 | num-alloc-buf,7
 UseVideoscale = 0
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1

diff --git a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_camera0.ini b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_camera0.ini
new file mode 100644 (file)
index 0000000..62cd39f
--- /dev/null
+++ b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_camera0.ini
@@ -0,0 +1,210 @@
+; < 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 = 0,-255 || 0
+DeviceName = S5K4H5YB
+PreviewResolution = 176,144 | 320,240 | 480,360 | 480,480 | 640,480 | 720,720 | 960,720 | 1280,720 || 960,720
+CaptureResolution = 640,480 | 800,480 | 1280,720 | 1536,1536 | 1600,960 | 1600,1200 | 2048,1152 | 2048,1232 | 2048,1536 | 2448,2448 | 3264,1836| 3264,2448 || 3264,2448
+VideoResolution = 176,144 | 320,240 | 640,480 | 1280,720 || 640,480
+FPS0 = 0,30 || 30
+FPS1 = 0,30 || 30
+FPS2 = 0,30 || 30
+FPS3 = 0,30 || 30
+FPS4 = 0,30 || 30
+FPS5 = 0,30 || 30
+FPS6 = 0,30 || 30
+FPS7 = 0,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, 14:INTERLEAVED_JPEG_UYVY, 15:ENCODED_H264
+PictureFormat = 0 || 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, 15:ENCODED_H264
+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, 15:ENCODED_H264
+RecommendPreviewFormatRecord = 0
+; Recommend preview resolution
+;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9), 2: SQUARE ratio(1:1)
+RecommendPreviewResolution = 960,720 | 1280,720 | 720,720 || 960,720
+; Camera facing direction
+;;; 0:REAR, 1:FRONT
+FacingDirection = 0
+
+
+[Strobe]
+;StrobeControl - Not support
+;StrobeCapabilities - Not support
+; Strobe mode - real setting value
+;;; 0:OFF, 1:ON, 2:TORCH, 3:AUTO, 4:MAX
+; 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,1,3,-255,-255,-255,-255,2 || 0
+;StrobeStatus - Not support
+;StrobeEV - Not support
+
+
+[Effect]
+Brightness = 0,8 || 4
+;Contrast = -2,2 || 0
+;Saturation = 0,4 || 2
+;Sharpness = 0,4 || 2
+
+; White balance - real setting value
+;;; 0:AUTO, 1:INCANDESCENT, 4:FLUORESCENT, 5:DAYLIGHT, 6:CLOUDY_DAYLIGHT
+; 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,0,5,6,4,1,-255,-255,-255,-255 || 0
+
+; Color tone - real setting value
+;;; 0:NONE, 1:MONO, 6:NEGATIVE, 7:SEPIA, 4:COLD
+; 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, 30:GRAPHICS
+ColorTone = 0,1,7,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,-255 || 0
+
+; Flip - MSL value(convert array index)
+;;; 0:NONE, 1:HORIZONTAL, 2:VERTICAL, 3:BOTH
+Flip = 0,-255,-255,-255 || 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,30 || 0
+OpticalZoom = 0,0 || 0
+
+; Focus mode - real setting value
+;;; 0:AUTO, 1:MANUAL, 2:PAN, 3:TOUCH_AUTO, 4:CONTINUOUS
+; Focus mode - MSL value(convert array index)
+;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
+FocusMode = -255,-255,0,-255,3,4 || 3
+
+; 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 = -255,0,1,-255 || 0
+
+; Auto exposure type - real setting value
+;;; 0:MATRIX, 1:CENTER, 2:SPOT, 3.MAX
+; 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,0,1,-255,-255,2,-255,-255,-255 || 0
+
+;ExposureValue - Not support
+;FNumber - Not support
+;ShutterSpeed - Not support
+
+; ISO - real setting value
+;;; 0:AUTO, 1:100, 2:200, 3:400, 4:800
+; 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,1,2,3,4,-255,-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
+
+; PTZ(Pan Tilt Zoom) type
+;;; 0:Mechanical, 1:Electronic
+;PtzType = 0,1 || 1
+
+; Pan range for mechanical movement
+;PanMecha = -10,10
+
+; Pan range for electronic movement
+;PanElec = -10,10
+
+; Tilt range for mechanical movement
+;TiltMecha = -10,10
+
+; Tilt range for electronic movement
+;TiltElec = -10,10
+
+
+[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,13 || 13
+JpegQuality = 0,100 || 95
+MultishotNumber = 1,1024 || 1
+SensorEncodedCapture = 1
+; Support HDR
+;;; 0: OFF, 1: ON, 2: ON and Original
+SupportHDR = 0,-255,-255 || 0
+SupportZSL = 1
+
+[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/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_camera1.ini b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_camera1.ini
new file mode 100644 (file)
index 0000000..e443d1c
--- /dev/null
+++ b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_camera1.ini
@@ -0,0 +1,212 @@
+; < 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 = S5K5E3YX
+PreviewResolution = 176,144 | 320,240 | 480,360 | 640,480 | 720,720 | 880,720 | 960,720 | 1280,720 || 960,720
+CaptureResolution = 480,480 | 640,480 | 1440, 1080 | 1920,1080 | 1920,1920 | 2048,1152 | 2048,1536 | 2560,1440 | 2576,1932 || 640,480
+VideoResolution = 176,144 | 320,240 | 640,480 | 1280,720 || 640,480
+FPS0 = 0,30 || 30
+FPS1 = 0,30 || 30
+FPS2 = 0,30 || 30
+FPS3 = 0,30 || 30
+FPS4 = 0,30 || 30
+FPS5 = 0,30 || 30
+FPS6 = 0,30 || 30
+FPS7 = 0,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, 14:INTERLEAVED_JPEG_UYVY, 15:ENCODED_H264
+PictureFormat = 0 || 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, 15:ENCODED_H264
+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, 15:ENCODED_H264
+RecommendPreviewFormatRecord = 0
+; Recommend preview resolution
+;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9), 2: SQUARE ratio(1:1)
+RecommendPreviewResolution = 960,720 | 1280,720 | 720,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 = 0,8 || 4
+;Contrast = -2,2 || 0
+;Saturation = 0,4 || 2
+;Sharpness = 0,4 || 2
+
+; White balance - real setting value
+;;; 0:AUTO, 1:INCANDESCENT, 4:FLUORESCENT, 5:DAYLIGHT, 6:CLOUDY_DAYLIGHT
+; 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,0,5,6,4,1,-255,-255,-255,-255 || 0
+
+; Color tone - real setting value
+;;; 0:NONE, 1:MONO, 6:NEGATIVE, 7:SEPIA, 4:COLD
+; 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, 30:GRAPHICS
+ColorTone = 0,1,7,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,-255 || 0
+
+; Flip - MSL value(convert array index)
+;;; 0:NONE, 1:HORIZONTAL, 2:VERTICAL, 3:BOTH
+Flip = 0,1,2,3 || 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
+;;; 0:CENTER, 1:MATRIX, 2:SPOT, 3.MAX
+; 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,-255,0,-255,-255,-255,-255,-255,-255 || 0
+
+;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
+; 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,-255,-255,-255,-255,-255,-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
+
+; PTZ(Pan Tilt Zoom) type
+;;; 0:Mechanical, 1:Electronic
+;PtzType = 0,1 || 1
+
+; Pan range for mechanical movement
+;PanMecha = -10,10
+
+; Pan range for electronic movement
+;PanElec = -10,10
+
+; Tilt range for mechanical movement
+;TiltMecha = -10,10
+
+; Tilt range for electronic movement
+;TiltElec = -10,10
+
+
+[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,13 || 13
+JpegQuality = 0,100 || 95
+MultishotNumber = 1,1 || 1
+SensorEncodedCapture = 1
+; Support HDR
+;;; 0: OFF, 1: ON, 2: ON and Original
+SupportHDR = 0,-255,-255 || 0
+SupportZSL = 1
+
+[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/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_dev_video_pri.ini
deleted file mode 100644 (file)
index 62cd39f..0000000
--- a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_dev_video_pri.ini
+++ /dev/null
@@ -1,210 +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 = 0,-255 || 0
-DeviceName = S5K4H5YB
-PreviewResolution = 176,144 | 320,240 | 480,360 | 480,480 | 640,480 | 720,720 | 960,720 | 1280,720 || 960,720
-CaptureResolution = 640,480 | 800,480 | 1280,720 | 1536,1536 | 1600,960 | 1600,1200 | 2048,1152 | 2048,1232 | 2048,1536 | 2448,2448 | 3264,1836| 3264,2448 || 3264,2448
-VideoResolution = 176,144 | 320,240 | 640,480 | 1280,720 || 640,480
-FPS0 = 0,30 || 30
-FPS1 = 0,30 || 30
-FPS2 = 0,30 || 30
-FPS3 = 0,30 || 30
-FPS4 = 0,30 || 30
-FPS5 = 0,30 || 30
-FPS6 = 0,30 || 30
-FPS7 = 0,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, 14:INTERLEAVED_JPEG_UYVY, 15:ENCODED_H264
-PictureFormat = 0 || 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, 15:ENCODED_H264
-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, 15:ENCODED_H264
-RecommendPreviewFormatRecord = 0
-; Recommend preview resolution
-;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9), 2: SQUARE ratio(1:1)
-RecommendPreviewResolution = 960,720 | 1280,720 | 720,720 || 960,720
-; Camera facing direction
-;;; 0:REAR, 1:FRONT
-FacingDirection = 0
-
-
-[Strobe]
-;StrobeControl - Not support
-;StrobeCapabilities - Not support
-; Strobe mode - real setting value
-;;; 0:OFF, 1:ON, 2:TORCH, 3:AUTO, 4:MAX
-; 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,1,3,-255,-255,-255,-255,2 || 0
-;StrobeStatus - Not support
-;StrobeEV - Not support
-
-
-[Effect]
-Brightness = 0,8 || 4
-;Contrast = -2,2 || 0
-;Saturation = 0,4 || 2
-;Sharpness = 0,4 || 2
-
-; White balance - real setting value
-;;; 0:AUTO, 1:INCANDESCENT, 4:FLUORESCENT, 5:DAYLIGHT, 6:CLOUDY_DAYLIGHT
-; 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,0,5,6,4,1,-255,-255,-255,-255 || 0
-
-; Color tone - real setting value
-;;; 0:NONE, 1:MONO, 6:NEGATIVE, 7:SEPIA, 4:COLD
-; 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, 30:GRAPHICS
-ColorTone = 0,1,7,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,-255 || 0
-
-; Flip - MSL value(convert array index)
-;;; 0:NONE, 1:HORIZONTAL, 2:VERTICAL, 3:BOTH
-Flip = 0,-255,-255,-255 || 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,30 || 0
-OpticalZoom = 0,0 || 0
-
-; Focus mode - real setting value
-;;; 0:AUTO, 1:MANUAL, 2:PAN, 3:TOUCH_AUTO, 4:CONTINUOUS
-; Focus mode - MSL value(convert array index)
-;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
-FocusMode = -255,-255,0,-255,3,4 || 3
-
-; 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 = -255,0,1,-255 || 0
-
-; Auto exposure type - real setting value
-;;; 0:MATRIX, 1:CENTER, 2:SPOT, 3.MAX
-; 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,0,1,-255,-255,2,-255,-255,-255 || 0
-
-;ExposureValue - Not support
-;FNumber - Not support
-;ShutterSpeed - Not support
-
-; ISO - real setting value
-;;; 0:AUTO, 1:100, 2:200, 3:400, 4:800
-; 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,1,2,3,4,-255,-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
-
-; PTZ(Pan Tilt Zoom) type
-;;; 0:Mechanical, 1:Electronic
-;PtzType = 0,1 || 1
-
-; Pan range for mechanical movement
-;PanMecha = -10,10
-
-; Pan range for electronic movement
-;PanElec = -10,10
-
-; Tilt range for mechanical movement
-;TiltMecha = -10,10
-
-; Tilt range for electronic movement
-;TiltElec = -10,10
-
-
-[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,13 || 13
-JpegQuality = 0,100 || 95
-MultishotNumber = 1,1024 || 1
-SensorEncodedCapture = 1
-; Support HDR
-;;; 0: OFF, 1: ON, 2: ON and Original
-SupportHDR = 0,-255,-255 || 0
-SupportZSL = 1
-
-[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/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_dev_video_sec.ini
deleted file mode 100644 (file)
index e443d1c..0000000
--- a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder_dev_video_sec.ini
+++ /dev/null
@@ -1,212 +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 = S5K5E3YX
-PreviewResolution = 176,144 | 320,240 | 480,360 | 640,480 | 720,720 | 880,720 | 960,720 | 1280,720 || 960,720
-CaptureResolution = 480,480 | 640,480 | 1440, 1080 | 1920,1080 | 1920,1920 | 2048,1152 | 2048,1536 | 2560,1440 | 2576,1932 || 640,480
-VideoResolution = 176,144 | 320,240 | 640,480 | 1280,720 || 640,480
-FPS0 = 0,30 || 30
-FPS1 = 0,30 || 30
-FPS2 = 0,30 || 30
-FPS3 = 0,30 || 30
-FPS4 = 0,30 || 30
-FPS5 = 0,30 || 30
-FPS6 = 0,30 || 30
-FPS7 = 0,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, 14:INTERLEAVED_JPEG_UYVY, 15:ENCODED_H264
-PictureFormat = 0 || 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, 15:ENCODED_H264
-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, 15:ENCODED_H264
-RecommendPreviewFormatRecord = 0
-; Recommend preview resolution
-;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9), 2: SQUARE ratio(1:1)
-RecommendPreviewResolution = 960,720 | 1280,720 | 720,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 = 0,8 || 4
-;Contrast = -2,2 || 0
-;Saturation = 0,4 || 2
-;Sharpness = 0,4 || 2
-
-; White balance - real setting value
-;;; 0:AUTO, 1:INCANDESCENT, 4:FLUORESCENT, 5:DAYLIGHT, 6:CLOUDY_DAYLIGHT
-; 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,0,5,6,4,1,-255,-255,-255,-255 || 0
-
-; Color tone - real setting value
-;;; 0:NONE, 1:MONO, 6:NEGATIVE, 7:SEPIA, 4:COLD
-; 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, 30:GRAPHICS
-ColorTone = 0,1,7,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,-255 || 0
-
-; Flip - MSL value(convert array index)
-;;; 0:NONE, 1:HORIZONTAL, 2:VERTICAL, 3:BOTH
-Flip = 0,1,2,3 || 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
-;;; 0:CENTER, 1:MATRIX, 2:SPOT, 3.MAX
-; 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,-255,0,-255,-255,-255,-255,-255,-255 || 0
-
-;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
-; 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,-255,-255,-255,-255,-255,-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
-
-; PTZ(Pan Tilt Zoom) type
-;;; 0:Mechanical, 1:Electronic
-;PtzType = 0,1 || 1
-
-; Pan range for mechanical movement
-;PanMecha = -10,10
-
-; Pan range for electronic movement
-;PanElec = -10,10
-
-; Tilt range for mechanical movement
-;TiltMecha = -10,10
-
-; Tilt range for electronic movement
-;TiltElec = -10,10
-
-
-[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,13 || 13
-JpegQuality = 0,100 || 95
-MultishotNumber = 1,1 || 1
-SensorEncodedCapture = 1
-; Support HDR
-;;; 0: OFF, 1: ON, 2: ON and Original
-SupportHDR = 0,-255,-255 || 0
-SupportZSL = 1
-
-[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/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_camcorder.ini
index 42e3833769433f203bd98a49b9abcfb550effc24..7b9f424372f761b523019bfcc0e571e63a58c797 100644 (file)
--- a/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_camcorder.ini
+++ b/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_camcorder.ini
@@ -26,9 +26,6 @@ ModelName = TW1
 ;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 = v4l2src | 1,0 | do-timestamp,1
 UseVideoscale = 1
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1

diff --git a/mmfw-sysconf-target-tw2/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-target-tw2/etc/multimedia/mmfw_camcorder.ini
index 42e3833769433f203bd98a49b9abcfb550effc24..7b9f424372f761b523019bfcc0e571e63a58c797 100644 (file)
--- a/mmfw-sysconf-target-tw2/etc/multimedia/mmfw_camcorder.ini
+++ b/mmfw-sysconf-target-tw2/etc/multimedia/mmfw_camcorder.ini
@@ -26,9 +26,6 @@ ModelName = TW1
 ;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 = v4l2src | 1,0 | do-timestamp,1
 UseVideoscale = 1
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1

diff --git a/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder.ini b/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder.ini
index 095820f4eec79a6654a81a42caf53451b88c3ae9..80c8e830f97d2305b7fe3441076b7f340b039275 100644 (file)
--- a/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder.ini
+++ b/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder.ini
@@ -26,9 +26,6 @@ ModelName = GT-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 = v4l2src | 1,0 | do-timestamp,1
 UseVideoscale = 1
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1

diff --git a/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder_camera0.ini b/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder_camera0.ini
new file mode 100644 (file)
index 0000000..dc61517
--- /dev/null
+++ b/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder_camera0.ini
@@ -0,0 +1,206 @@
+; < 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 = 0,-255 || 0
+DeviceName = USB_CAMERA
+PreviewResolution = 320,240 | 640,480 || 320,240
+CaptureResolution = 320,240 | 640,480 || 640,480
+VideoResolution = 320,240 | 640,480 || 640,480
+FPS0 = 0,15,30 || 15
+FPS1 = 0,15,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, 15:ENCODED_H264
+PictureFormat = 7 || 7
+Overlay = 0,1 || 1
+; 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, 15:ENCODED_H264
+RecommendPreviewFormatCapture = 7
+; 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, 15:ENCODED_H264
+RecommendPreviewFormatRecord = 7
+; Recommend preview resolution
+;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9), 2: SQUARE ratio(1:1)
+RecommendPreviewResolution = 320,240 | 320,240 | 320,240 || 320,240
+; Camera facing direction
+;;; 0:REAR, 1:FRONT
+FacingDirection = 0
+
+
+[Strobe]
+;StrobeControl - Not support
+;StrobeCapabilities - Not support
+; Strobe mode - real setting value
+;;; 0:BASE, 1:OFF, 2:AUTO, 3:ON, 4:TORCH, 5:MAX
+; 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,3,2,-255,-255,-255,-255,4 || 2
+;StrobeStatus - Not support
+;StrobeEV - Not support
+
+
+[Effect]
+Brightness = 0,8 || 4
+;Contrast = 1,7 || 4
+;Saturation = 0,4 || 2
+;Sharpness = 0,4 || 2
+
+; White balance - real setting value
+;;; 0:AUTO, 1:DAYLIGHT, 2:CLOUDY, 3:TUNGSTEN, 4: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,0,-255,-255,-255,-255,-255,-255,-255,-255 || 0
+
+; Color tone - real setting value
+;;; 1:NONE, 2:MONO, 3:SEPIA, 4:AQUA, 5:ANTIQUE, 6:NEGATIVE, 7:SHARPEN, 8:SKETCH, 9:WASHED, 10:VINTAGE_WARM
+;;; 11:VINTAGE_COLD, 12:SOLARIZE, 13:POSTERIZE, 14:POINT_BLUE, 15:POINT_RED_YELLOW, 16:POINT_COLOR_3, 17:POINT_GREEN, 18:POINT_RED, 19:POINT_YELLOW, 20:CARTOONIZE
+; 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,-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 || 1
+; 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
+;;; 0:OFF, 1:ON
+; 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,10 || 0
+;OpticalZoom = 0,0 || 0
+
+; Focus mode - real setting value
+;;; 0:AUTO, 1:MANUAL, 2:PAN, 3:TOUCH_AUTO, 4:CONTINUOUS
+; Focus mode - MSL value(convert array index)
+;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
+FocusMode = 0,-255,-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
+;;; 0:BASE, 1:MATRIX, 2:CENTER, 3:SPOT, 4:MAX
+; 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,0,-255,-255,-255,-255,-255,-255,-255 || 0
+
+;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
+; 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,-255,-255,-255,-255,-255,-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
+;;; 0:OFF, 1:ON
+; 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
+
+; PTZ(Pan Tilt Zoom) type
+;;; 0:Mechanical, 1:Electronic
+;PtzType = 0,1 || 1
+
+; Pan range for mechanical movement
+;PanMecha = -10,10
+
+; Pan range for electronic movement
+;PanElec = -10,10
+
+; Tilt range for mechanical movement
+;TiltMecha = -10,10
+
+; Tilt range for electronic movement
+;TiltElec = -10,10
+
+
+[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 = 7,13 || 13
+JpegQuality = 0,100 || 90
+MultishotNumber = 1,1 || 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,-255 || 0
+;DetectNumber - Not support
+;DetectFocusSelect - Not support
+;DetectSelectNumber - Not support
+;DetectStatus - Not support
+

diff --git a/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder_dev_video_pri.ini
deleted file mode 100644 (file)
index dc61517..0000000
--- a/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder_dev_video_pri.ini
+++ /dev/null
@@ -1,206 +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 = 0,-255 || 0
-DeviceName = USB_CAMERA
-PreviewResolution = 320,240 | 640,480 || 320,240
-CaptureResolution = 320,240 | 640,480 || 640,480
-VideoResolution = 320,240 | 640,480 || 640,480
-FPS0 = 0,15,30 || 15
-FPS1 = 0,15,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, 15:ENCODED_H264
-PictureFormat = 7 || 7
-Overlay = 0,1 || 1
-; 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, 15:ENCODED_H264
-RecommendPreviewFormatCapture = 7
-; 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, 15:ENCODED_H264
-RecommendPreviewFormatRecord = 7
-; Recommend preview resolution
-;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9), 2: SQUARE ratio(1:1)
-RecommendPreviewResolution = 320,240 | 320,240 | 320,240 || 320,240
-; Camera facing direction
-;;; 0:REAR, 1:FRONT
-FacingDirection = 0
-
-
-[Strobe]
-;StrobeControl - Not support
-;StrobeCapabilities - Not support
-; Strobe mode - real setting value
-;;; 0:BASE, 1:OFF, 2:AUTO, 3:ON, 4:TORCH, 5:MAX
-; 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,3,2,-255,-255,-255,-255,4 || 2
-;StrobeStatus - Not support
-;StrobeEV - Not support
-
-
-[Effect]
-Brightness = 0,8 || 4
-;Contrast = 1,7 || 4
-;Saturation = 0,4 || 2
-;Sharpness = 0,4 || 2
-
-; White balance - real setting value
-;;; 0:AUTO, 1:DAYLIGHT, 2:CLOUDY, 3:TUNGSTEN, 4: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,0,-255,-255,-255,-255,-255,-255,-255,-255 || 0
-
-; Color tone - real setting value
-;;; 1:NONE, 2:MONO, 3:SEPIA, 4:AQUA, 5:ANTIQUE, 6:NEGATIVE, 7:SHARPEN, 8:SKETCH, 9:WASHED, 10:VINTAGE_WARM
-;;; 11:VINTAGE_COLD, 12:SOLARIZE, 13:POSTERIZE, 14:POINT_BLUE, 15:POINT_RED_YELLOW, 16:POINT_COLOR_3, 17:POINT_GREEN, 18:POINT_RED, 19:POINT_YELLOW, 20:CARTOONIZE
-; 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,-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 || 1
-; 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
-;;; 0:OFF, 1:ON
-; 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,10 || 0
-;OpticalZoom = 0,0 || 0
-
-; Focus mode - real setting value
-;;; 0:AUTO, 1:MANUAL, 2:PAN, 3:TOUCH_AUTO, 4:CONTINUOUS
-; Focus mode - MSL value(convert array index)
-;;; 0:NONE, 1:PAN, 2:AUTO, 3:MANUAL, 4:TOUCH_AUTO, 5:CONTINUOUS
-FocusMode = 0,-255,-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
-;;; 0:BASE, 1:MATRIX, 2:CENTER, 3:SPOT, 4:MAX
-; 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,0,-255,-255,-255,-255,-255,-255,-255 || 0
-
-;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
-; 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,-255,-255,-255,-255,-255,-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
-;;; 0:OFF, 1:ON
-; 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
-
-; PTZ(Pan Tilt Zoom) type
-;;; 0:Mechanical, 1:Electronic
-;PtzType = 0,1 || 1
-
-; Pan range for mechanical movement
-;PanMecha = -10,10
-
-; Pan range for electronic movement
-;PanElec = -10,10
-
-; Tilt range for mechanical movement
-;TiltMecha = -10,10
-
-; Tilt range for electronic movement
-;TiltElec = -10,10
-
-
-[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 = 7,13 || 13
-JpegQuality = 0,100 || 90
-MultishotNumber = 1,1 || 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,-255 || 0
-;DetectNumber - Not support
-;DetectFocusSelect - Not support
-;DetectSelectNumber - Not support
-;DetectStatus - Not support
-

diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index 9eaf31a3634c512007a0a0de3821be2fad8ccea8..fb2f218adf21a782d9fb181ff5a006ac974c8d4c 100644 (file)
--- a/packaging/mmfw-sysconf.spec
+++ b/packaging/mmfw-sysconf.spec
@@ -1,7 +1,7 @@
 Name:       mmfw-sysconf
 Summary:    Multimedia Framework system configuration package
-Version:    0.2.123
-Release:    1
+Version:    0.2.124
+Release:    0
 Group:      Multimedia/Configuration
 License:    LGPL-2.1 and Apache-2.0
 Source0:    mmfw-sysconf-%{version}.tar.gz