projects / platform / core / multimedia / mmfw-sysconf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ca2fed3)
Release version 0.2.31 56/53456/2 accepted/tizen/mobile/20151207.123651 accepted/tizen/tv/20151207.123711 accepted/tizen/wearable/20151207.123731 submit/tizen/20151207.060900
authorJeongmo Yang <jm80.yang@samsung.com>
Mon, 7 Dec 2015 05:48:39 +0000 (14:48 +0900)
committerJeongmo Yang <jm80.yang@samsung.com>
Mon, 7 Dec 2015 05:57:50 +0000 (14:57 +0900)
1. [tm1/camera] Update ini files

Change-Id: Ibda745f69c7919bb7166b6f82d4b88d0fcf6efa2
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.wayland patch | blob | history
mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.x patch | blob | history
mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder_dev_video_pri.ini patch | blob | history
mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder_dev_video_sec.ini patch | blob | history
packaging/mmfw-sysconf.spec patch | blob | history

diff --git a/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.wayland b/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.wayland
index cd32e870e7627401901d43a9d89483ef8073db5c..6b62c9e6d3a571520d4d6b3c7a9e9fd5dfbd6aba 100644 (file)
--- a/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.wayland
+++ b/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.wayland
@@ -22,18 +22,19 @@
 SyncStateChange = 1
 ;GSTInitOption = --gst-enable-tiny-registry --gst-disable-segtrap || NOT-USE-DEFAULT_VALUE
 ;GSTInitOption = --gst-enable-tiny-registry --gst-disable-segtrap --gst-debug=3 || NOT-USE-DEFAULT_VALUE
-ModelName = GT-TIZEN
+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 = videotestsrc | 2,0 | do-timestamp,1 | is-live,1
-UseVideoscale = 1
+VideosrcElement = camerasrc | 2,0 | do-timestamp,1 | num-alloc-buf,7
+UseVideoscale = 0
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
-UseZeroCopyFormat = 0
+UseZeroCopyFormat = 1
 DeviceCount = 2
+SupportMediaPacketPreviewCb = 1
 
 [AudioInput]
 AudioDevice = 0,1 || 0
@@ -50,16 +51,18 @@ DisplayMode = 0,1,2 || 0
 ; Videosink
 ;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 5: Remote
 Videosink = 0,1,3,5 || 1
-VideosinkElementX = waylandsink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-sample,0 | qos,0 | sync,0 | show-preroll-frame,0
+VideosinkElementX = fakesink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-sample,0 | qos,0 | sync,0 | show-preroll-frame,0
+;VideosinkElementX = waylandsink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-sample,0 | qos,0 | sync,0 | show-preroll-frame,0
 VideosinkElementEvas = evasimagesink | 4,0 | enable-last-sample,0 | qos,0 | sync,0 | show-preroll-frame,0
 VideosinkElementRemote = shmsink | 5,0 | wait-for-connection,0 | perms,511 | enable-last-sample,0 | qos,0 | sync,0
 VideosinkElementNull = fakesink | 4,0 | qos,0 | sync,0 | enable-last-sample,0 | show-preroll-frame,0
-UseVideoscale = 1
-VideoscaleElement = fimcconvert | 1,0 | rotang,0
-;VideoscaleElement = videoscale
+UseVideoscale = 0
+VideoscaleElement = videoscale | 1,0 | rotang,90
 
 [VideoEncoder]
-MPEG4 = avenc_mpeg4 | 0,0
+H263 = sprdenc_h263 | 0,0
+H264 = sprdenc_h264 | 0,0
+MPEG4 = sprdenc_mpeg4 | 0,0
 
 [AudioEncoder]
 AMR = amrnbenc | 0,0
@@ -71,17 +74,17 @@ JPEG = jpegenc | 0,0
 ;PNG = pngenc | 0,0
 
 [Capture]
-UseEncodebin = 1
+UseEncodebin = 0
 UseCaptureMode = 0
 VideoscaleElement = videoscale | 1,0 | method,1
 
 [Record]
 UseAudioEncoderQueue = 1
-UseVideoEncoderQueue = 0
+UseVideoEncoderQueue = 1
 VideoProfile = 0
 VideoAutoAudioConvert = 1
 VideoAutoAudioResample = 0
-VideoAutoColorSpace = 1
+VideoAutoColorSpace = 0
 AudioProfile = 1
 AudioAutoAudioConvert = 1
 AudioAutoAudioResample = 0
@@ -91,6 +94,7 @@ ImageAutoAudioConvert = 0
 ImageAutoAudioResample = 0
 ImageAutoColorSpace = 1
 RecordsinkElement = filesink | 1,0 | async,0
+SupportDualStream = 0
 UseNoiseSuppressor = 0
 DropVideoFrame = 0
 PassFirstVideoFrame = 0
@@ -98,10 +102,9 @@ PassFirstVideoFrame = 0
 [Mux]
 3GP = avmux_3gp | 0,0
 AMR = avmux_amr | 0,0
-MP4 = mp4mux | 0,0
+MP4 = avmux_mp4 | 0,0
 AVI = avimux | 0,0
 MATROSKA = matroskamux | 0,0
 WAV = wavenc | 0,0
 AAC = avmux_adts | 0,0
-M2TS = mpegtsmux | 0,0
 
diff --git a/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.x b/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.x
index fe698743ae906efe7197f60f25fecb7128fde608..ce7e6383e4cc5b178491f7344de387894a4ce6f4 100644 (file)
--- a/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.x
+++ b/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.x
@@ -22,18 +22,19 @@
 SyncStateChange = 1
 ;GSTInitOption = --gst-enable-tiny-registry --gst-disable-segtrap || NOT-USE-DEFAULT_VALUE
 ;GSTInitOption = --gst-enable-tiny-registry --gst-disable-segtrap --gst-debug=3 || NOT-USE-DEFAULT_VALUE
-ModelName = GT-TIZEN
+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 = videotestsrc | 2,0 | do-timestamp,1 | is-live,1
-UseVideoscale = 1
+VideosrcElement = camerasrc | 2,0 | do-timestamp,1 | num-alloc-buf,7
+UseVideoscale = 0
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
-UseZeroCopyFormat = 0
+UseZeroCopyFormat = 1
 DeviceCount = 2
+SupportMediaPacketPreviewCb = 1
 
 [AudioInput]
 AudioDevice = 0,1 || 0
@@ -54,12 +55,13 @@ VideosinkElementX = xvimagesink | 6,0 | draw-borders,0 | force-aspect-ratio,1 |
 VideosinkElementEvas = evasimagesink | 4,0 | enable-last-sample,0 | qos,0 | sync,0 | show-preroll-frame,0
 VideosinkElementRemote = shmsink | 5,0 | wait-for-connection,0 | perms,511 | enable-last-sample,0 | qos,0 | sync,0
 VideosinkElementNull = fakesink | 4,0 | qos,0 | sync,0 | enable-last-sample,0 | show-preroll-frame,0
-UseVideoscale = 1
-VideoscaleElement = fimcconvert | 1,0 | rotang,0
-;VideoscaleElement = videoscale
+UseVideoscale = 0
+VideoscaleElement = videoscale | 1,0 | rotang,90
 
 [VideoEncoder]
-MPEG4 = avenc_mpeg4 | 0,0
+H263 = sprdenc_h263 | 0,0
+H264 = sprdenc_h264 | 0,0
+MPEG4 = sprdenc_mpeg4 | 0,0
 
 [AudioEncoder]
 AMR = amrnbenc | 0,0
@@ -71,17 +73,17 @@ JPEG = jpegenc | 0,0
 ;PNG = pngenc | 0,0
 
 [Capture]
-UseEncodebin = 1
+UseEncodebin = 0
 UseCaptureMode = 0
 VideoscaleElement = videoscale | 1,0 | method,1
 
 [Record]
 UseAudioEncoderQueue = 1
-UseVideoEncoderQueue = 0
+UseVideoEncoderQueue = 1
 VideoProfile = 0
 VideoAutoAudioConvert = 1
 VideoAutoAudioResample = 0
-VideoAutoColorSpace = 1
+VideoAutoColorSpace = 0
 AudioProfile = 1
 AudioAutoAudioConvert = 1
 AudioAutoAudioResample = 0
@@ -91,6 +93,7 @@ ImageAutoAudioConvert = 0
 ImageAutoAudioResample = 0
 ImageAutoColorSpace = 1
 RecordsinkElement = filesink | 1,0 | async,0
+SupportDualStream = 0
 UseNoiseSuppressor = 0
 DropVideoFrame = 0
 PassFirstVideoFrame = 0
@@ -98,10 +101,9 @@ PassFirstVideoFrame = 0
 [Mux]
 3GP = avmux_3gp | 0,0
 AMR = avmux_amr | 0,0
-MP4 = mp4mux | 0,0
+MP4 = avmux_mp4 | 0,0
 AVI = avimux | 0,0
 MATROSKA = matroskamux | 0,0
 WAV = wavenc | 0,0
 AAC = avmux_adts | 0,0
-M2TS = mpegtsmux | 0,0
 
diff --git a/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder_dev_video_pri.ini
index dbd5fe2b8a85154b46c74954cb2c313cc8da82c4..1c21d0531f471818befd08245324dda27ffd178e 100644 (file)
--- a/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder_dev_video_pri.ini
+++ b/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder_dev_video_pri.ini
@@ -20,28 +20,34 @@
 ; 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
+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 = 7 || 7
+PictureFormat = 0 || 0
 Overlay = 0,1 || 1
 ; Recommend display rotation
 ;;; 0:NONE, 1:90, 2:180, 3:270
-RecommendDisplayRotation = 0
+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
+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 = 7
+RecommendPreviewFormatRecord = 0
 ; 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
+RecommendPreviewResolution = 960,720 | 1280,720 | 720,720 || 960,720
 ; Camera facing direction
 ;;; 0:REAR, 1:FRONT
 FacingDirection = 0
@@ -51,42 +57,40 @@ FacingDirection = 0
 ;StrobeControl - Not support
 ;StrobeCapabilities - Not support
 ; Strobe mode - real setting value
-;;; 0:BASE, 1:OFF, 2:AUTO, 3:ON, 4:TORCH, 5:MAX
+;;; 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 = 1,3,2,-255,-255,-255,-255,4 || 2
+StrobeMode = 0,1,3,-255,-255,-255,-255,2 || 0
 ;StrobeStatus - Not support
 ;StrobeEV - Not support
 
 
 [Effect]
 Brightness = 0,8 || 4
-;Contrast = 1,7 || 4
+;Contrast = -2,2 || 0
 ;Saturation = 0,4 || 2
 ;Sharpness = 0,4 || 2
 
 ; White balance - real setting value
-;;; 0:AUTO, 1:DAYLIGHT, 2:CLOUDY, 3:TUNGSTEN, 4:FLUORESCENT
+;;; 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,-255,-255,-255,-255,-255,-255,-255,-255 || 0
+WhiteBalance = -255,0,5,6,4,1,-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
+;;; 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
-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
+;;; 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:HORIZONTAL, 1:VERTICAL, 2:NONE
-;Flip = 2,1,0 || 0
+;;; 0:NONE, 1:HORIZONTAL, 2:VERTICAL, 3:BOTH
+Flip = 0,-255,-255,-255 || 0
 
 ; Wide Dynamic Range - real setting value
-;;; 0:OFF, 1:ON
+;;; N/A
 ; Wide Dynamic Range - MSL value(convert array index)
 ;;; 0:OFF, 1:ON, 2:AUTO
 WDR = 0,-255,-255 || 0
@@ -108,36 +112,36 @@ WDR = 0,-255,-255 || 0
 
 [Photograph]
 ;LensInit = 0,1 || 0
-;DigitalZoom = 0,10 || 0
-;OpticalZoom = 0,0 || 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 = 0,-255,-255,-255,-255,-255 || 0
+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 = 0,-255,-255,-255 || 0
+AFType = -255,0,1,-255 || 0
 
 ; Auto exposure type - real setting value
-;;; 0:BASE, 1:MATRIX, 2:CENTER, 3:SPOT, 4:MAX
+;;; 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,-255,-255,-255,-255,-255,-255,-255 || 0
+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:50, 2:100, 3:200, 4:400, 5:800, 6:1600
+;;; 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,-255,-255,-255,-255,-255,-255 || 0
+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,
@@ -148,7 +152,7 @@ ISO = 0,-255,-255,-255,-255,-255,-255,-255 || 0
 ProgramMode = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
 
 ; Anti-handshake - real setting value
-;;; 0:OFF, 1:ON
+;;; N/A
 ; Anti-handshake - MSL value(convert array index)
 ;;; 0:OFF, 1:ON, 2:AUTO, 3:MOVIE_ON
 AntiHandshake = 0,-255,-255,-255 || 0
@@ -170,19 +174,19 @@ FaceZoomLevel = 0,0 || 0
 ; 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
+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,-255 || 0
+;DetectMode - Not support
 ;DetectNumber - Not support
 ;DetectFocusSelect - Not support
 ;DetectSelectNumber - Not support
diff --git a/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder_dev_video_sec.ini
index b9d590c6c576a5ee580bda510914096c17720c70..70e77fa3424af680eca8c423165b95f132f5b2b4 100644 (file)
--- a/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder_dev_video_sec.ini
+++ b/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder_dev_video_sec.ini
@@ -19,74 +19,80 @@
 ;;; 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
+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 = 7 || 7
+PictureFormat = 0 || 0
 Overlay = 0,1 || 1
 ; Recommend display rotation
 ;;; 0:NONE, 1:90, 2:180, 3:270
-RecommendDisplayRotation = 0
+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
+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 = 7
+RecommendPreviewFormatRecord = 0
 ; 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
+RecommendPreviewResolution = 960,720 | 1280,720 | 720,720 || 960,720
 ; Camera facing direction
 ;;; 0:REAR, 1:FRONT
-FacingDirection = 0
+FacingDirection = 1
 
 
 [Strobe]
 ;StrobeControl - Not support
 ;StrobeCapabilities - Not support
 ; Strobe mode - real setting value
-;;; 0:BASE, 1:OFF, 2:AUTO, 3:ON, 4:TORCH, 5:MAX
+;;; N/A
 ; Strobe mode - MSL value(convert array index)
 ;;; 0:OFF, 1:ON, 2:AUTO, 3:REDEYE_REDUCTION, 4:SLOW_SYNC, 5:FRONT_CURTAIN, 6:REAR_CURTAIN, 7:PERMANENT
-StrobeMode = 1,3,2,-255,-255,-255,-255,4 || 2
+StrobeMode = 0,-255,-255,-255,-255,-255,-255,-255 || 0
 ;StrobeStatus - Not support
 ;StrobeEV - Not support
 
 
 [Effect]
 Brightness = 0,8 || 4
-;Contrast = 1,7 || 4
+;Contrast = -2,2 || 0
 ;Saturation = 0,4 || 2
 ;Sharpness = 0,4 || 2
 
 ; White balance - real setting value
-;;; 0:AUTO, 1:DAYLIGHT, 2:CLOUDY, 3:TUNGSTEN, 4:FLUORESCENT
+;;; 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,-255,-255,-255,-255,-255,-255,-255,-255 || 0
+WhiteBalance = -255,0,5,6,4,1,-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
+;;; 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
-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
+;;; 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:HORIZONTAL, 1:VERTICAL, 2:NONE
-;Flip = 2,1,0 || 0
+;;; 0:NONE, 1:HORIZONTAL, 2:VERTICAL, 3:BOTH
+Flip = 0,1,2,3 || 0
+
+
 
 ; Wide Dynamic Range - real setting value
-;;; 0:OFF, 1:ON
+;;; N/A
 ; Wide Dynamic Range - MSL value(convert array index)
 ;;; 0:OFF, 1:ON, 2:AUTO
 WDR = 0,-255,-255 || 0
@@ -108,14 +114,14 @@ WDR = 0,-255,-255 || 0
 
 [Photograph]
 ;LensInit = 0,1 || 0
-;DigitalZoom = 0,10 || 0
-;OpticalZoom = 0,0 || 0
+DigitalZoom = 0,0 || 0
+OpticalZoom = 0,0 || 0
 
 ; Focus mode - real setting value
-;;; 0:AUTO, 1:MANUAL, 2:PAN, 3:TOUCH_AUTO, 4:CONTINUOUS
+;;; 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 = 0,-255,-255,-255,-255,-255 || 0
+FocusMode = -255,0,-255,-255,-255,-255 || 0
 
 ; Auto focus type - real setting value
 ;;; 0:NORMAL, 1:MACRO, 2:FULL
@@ -124,10 +130,10 @@ FocusMode = 0,-255,-255,-255,-255,-255 || 0
 AFType = 0,-255,-255,-255 || 0
 
 ; Auto exposure type - real setting value
-;;; 0:BASE, 1:MATRIX, 2:CENTER, 3:SPOT, 4:MAX
+;;; 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,0,-255,-255,-255,-255,-255,-255,-255 || 0
+AEType = -255,-255,0,-255,-255,-255,-255,-255,-255 || 0
 
 ;ExposureValue - Not support
 ;FNumber - Not support
@@ -148,7 +154,7 @@ ISO = 0,-255,-255,-255,-255,-255,-255,-255 || 0
 ProgramMode = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
 
 ; Anti-handshake - real setting value
-;;; 0:OFF, 1:ON
+;;; N/A
 ; Anti-handshake - MSL value(convert array index)
 ;;; 0:OFF, 1:ON, 2:AUTO, 3:MOVIE_ON
 AntiHandshake = 0,-255,-255,-255 || 0
@@ -170,19 +176,19 @@ FaceZoomLevel = 0,0 || 0
 ; 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
+OutputMode = 0,13 || 13
+JpegQuality = 0,100 || 95
 MultishotNumber = 1,1 || 1
-SensorEncodedCapture = 0
+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,-255 || 0
+;DetectMode - Not support
 ;DetectNumber - Not support
 ;DetectFocusSelect - Not support
 ;DetectSelectNumber - Not support
diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index d6f46c6ff44932e2ea8caead3563aa85ae5deb2c..ec6dc443acb0f2b0fe43948dde98c203726cdf5d 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.30
+Version:    0.2.31
 Release:    0
 Group:      Multimedia/Configuration
 License:    Apache-2.0
Domain: Multimedia / Media Common;