projects / platform / core / multimedia / mmfw-sysconf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: af99da3)
[n4/camera] Replace v4l2src by videotestsrc 46/47146/1 accepted/tizen/mobile/20150831.102321 accepted/tizen/tv/20150831.102332 accepted/tizen/wearable/20150831.102346 submit/tizen/20150831.085116
authorJeongmo Yang <jm80.yang@samsung.com>
Mon, 31 Aug 2015 08:14:50 +0000 (17:14 +0900)
committerJeongmo Yang <jm80.yang@samsung.com>
Mon, 31 Aug 2015 08:14:50 +0000 (17:14 +0900)
Change-Id: I7676cc005db5e933683a26dae5f82f9c0538edfd
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.wayland patch | blob | history
mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.x patch | blob | history
mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder_dev_video_pri.ini patch | blob | history
mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder_dev_video_sec.ini [new file with mode: 0644] patch | blob
packaging/mmfw-sysconf.spec patch | blob | history

diff --git a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.wayland b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.wayland
index 50ac63d..57bc724 100644 (file)
--- a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.wayland
+++ b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.wayland
@@ -29,11 +29,11 @@ ModelName = GT-TIZEN
 UseConfCtrl = 1
 ConfCtrlFile0 = mmfw_camcorder_dev_video_pri.ini
 ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini
-VideosrcElement = v4l2src | 1,0 | do-timestamp,1
+VideosrcElement = videotestsrc | 2,0 | do-timestamp,1 | is-live,1
 UseVideoscale = 1
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
 UseZeroCopyFormat = 0
-DeviceCount = 1
+DeviceCount = 2
 
 [AudioInput]
 AudioDevice = 0,1 || 0
diff --git a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.x b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.x
index 543c7fa..6c9c426 100644 (file)
--- a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.x
+++ b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.x
@@ -29,11 +29,11 @@ ModelName = GT-TIZEN
 UseConfCtrl = 1
 ConfCtrlFile0 = mmfw_camcorder_dev_video_pri.ini
 ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini
-VideosrcElement = v4l2src | 1,0 | do-timestamp,1
+VideosrcElement = videotestsrc | 2,0 | do-timestamp,1 | is-live,1
 UseVideoscale = 1
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
 UseZeroCopyFormat = 0
-DeviceCount = 1
+DeviceCount = 2
 
 [AudioInput]
 AudioDevice = 0,1 || 0
diff --git a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder_dev_video_pri.ini
index b0aea22..0180568 100644 (file)
--- a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder_dev_video_pri.ini
+++ b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder_dev_video_pri.ini
@@ -20,7 +20,7 @@
 ; Input index - MSL value(convert array index)
 ;;; -1:NONE, 0:CAMERA0, 1:CAMERA1
 InputIndex = 0,-255 || 0
-DeviceName = USB_CAMERA
+DeviceName = TEST_CAMERA
 PreviewResolution = 320,240 | 640,480 || 320,240
 CaptureResolution = 320,240 | 640,480 || 640,480
 VideoResolution = 320,240 | 640,480 || 640,480
@@ -32,7 +32,7 @@ PictureFormat = 7 || 7
 Overlay = 0,1 || 1
 ; Recommend display rotation
 ;;; 0:NONE, 1:90, 2:180, 3:270
-RecommendDisplayRotation = 3
+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
diff --git a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder_dev_video_sec.ini
new file mode 100644 (file)
index 0000000..0180568
--- /dev/null
+++ b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder_dev_video_sec.ini
@@ -0,0 +1,190 @@
+; < 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
+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
+
+
+[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 bfb1a57..68392a9 100644 (file)
--- a/packaging/mmfw-sysconf.spec
+++ b/packaging/mmfw-sysconf.spec
@@ -2,7 +2,7 @@
 
 Name:       mmfw-sysconf
 Summary:    Multimedia Framework system configuration package
-Version:    0.2.16
+Version:    0.2.17
 Release:    0
 Group:      Multimedia/Configuration
 License:    Apache-2.0
Domain: Multimedia / Media Common;