From: Jeongmo Yang <jm80.yang@samsung.com>
Date: Wed, 9 Dec 2015 00:13:11 +0000 (+0900)
Subject: [simulator/camera] Update ini files
X-Git-Tag: submit/tizen/20151209.020349^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21ecfeaf3c3c585659e4b92650cf47e295d1dd00;p=platform%2Fcore%2Fmultimedia%2Fmmfw-sysconf.git

[simulator/camera] Update ini files

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

diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland
index d220192..bd23998 100644
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland
@@ -36,6 +36,7 @@ UseVideoscale = 0
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
 UseZeroCopyFormat = 0
 DeviceCount = 2
+SupportMediaPacketPreviewCb = 0
 
 [AudioInput]
 AudioDevice = 0,1 || 0
@@ -46,6 +47,9 @@ AudiomodemsrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640
 ; DisplayDevice
 ;;; 0: MAIN LCD, 1: SUB LCD, 2:TV OUT, 3: MAIN LCD and SUB LCD, 4: MAIN LCD and TV OUT
 DisplayDevice = 0 || 0
+; DisplayMode
+;;; 0: Default, 1: Pri Video ON and Sec Video Full-Screen, 2: Pri Video OFF and Sec Video Full-Screen
+DisplayMode = 0 || 0
 ; Videosink
 ;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 5: Remote
 Videosink = 0,1,3,5 || 0
@@ -57,13 +61,12 @@ UseVideoscale = 0
 VideoscaleElement = videoscale | 1,0 | method,1
 
 [VideoEncoder]
-H263 = emulenc_h263p | 0,0
-MPEG4 = emulenc_mpeg4 | 0,0
-THEORA = theoraenc | 1,0 | num-bufs,4
+H263 = avenc_h263p | 1,0 | compliance, -2
+MPEG4 = avenc_mpeg4 | 1,0 | compliance, -2
 
 [AudioEncoder]
 AMR = amrnbenc | 0,0
-AAC = ffenc_aac | 0,0
+AAC = avenc_aac | 1,0 | compliance, -2
 WAVE = wavenc | 0,0
 VORBIS = vorbisenc | 0,0
 
@@ -75,7 +78,7 @@ PNG = pngenc | 0,0
 UseEncodebin = 1
 UseCaptureMode = 0
 VideoscaleElement = videoscale | 1,0 | method,1
-PlayCaptureSound = 0
+PlayCaptureSound = 1
 
 [Record]
 UseAudioEncoderQueue = 1
@@ -83,7 +86,7 @@ UseVideoEncoderQueue = 1
 VideoProfile = 0
 VideoAutoAudioConvert = 1
 VideoAutoAudioResample = 0
-VideoAutoColorSpace = 0
+VideoAutoColorSpace = 1
 AudioProfile = 1
 AudioAutoAudioConvert = 1
 AudioAutoAudioResample = 0
@@ -98,10 +101,10 @@ DropVideoFrame = 0
 PassFirstVideoFrame = 0
 
 [Mux]
-3GP = ffmux_3gp | 0,0
-AMR = ffmux_amr | 0,0
-MP4 = ffmux_mp4 | 0,0
+3GP = avmux_3gp | 0,0
+AMR = avmux_amr | 0,0
+MP4 = avmux_mp4 | 0,0
 OGG = oggmux | 0,0
 WAV = wavenc | 0,0
-AAC = ffmux_adts | 0,0
+AAC = avmux_adts | 0,0
 
diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x
index d0a2e7e..bc69a64 100644
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x
@@ -36,6 +36,7 @@ UseVideoscale = 0
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
 UseZeroCopyFormat = 0
 DeviceCount = 2
+SupportMediaPacketPreviewCb = 0
 
 [AudioInput]
 AudioDevice = 0,1 || 0
@@ -46,6 +47,9 @@ AudiomodemsrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640
 ; DisplayDevice
 ;;; 0: MAIN LCD, 1: SUB LCD, 2:TV OUT, 3: MAIN LCD and SUB LCD, 4: MAIN LCD and TV OUT
 DisplayDevice = 0 || 0
+; DisplayMode
+;;; 0: Default, 1: Pri Video ON and Sec Video Full-Screen, 2: Pri Video OFF and Sec Video Full-Screen
+DisplayMode = 0 || 0
 ; Videosink
 ;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 5: Remote
 Videosink = 0,1,3,5 || 0
@@ -57,13 +61,12 @@ UseVideoscale = 0
 VideoscaleElement = videoscale | 1,0 | method,1
 
 [VideoEncoder]
-H263 = emulenc_h263p | 0,0
-MPEG4 = emulenc_mpeg4 | 0,0
-THEORA = theoraenc | 1,0 | num-bufs,4
+H263 = avenc_h263p | 1,0 | compliance, -2
+MPEG4 = avenc_mpeg4 | 1,0 | compliance, -2
 
 [AudioEncoder]
 AMR = amrnbenc | 0,0
-AAC = ffenc_aac | 0,0
+AAC = avenc_aac | 1,0 | compliance, -2
 WAVE = wavenc | 0,0
 VORBIS = vorbisenc | 0,0
 
@@ -75,7 +78,7 @@ PNG = pngenc | 0,0
 UseEncodebin = 1
 UseCaptureMode = 0
 VideoscaleElement = videoscale | 1,0 | method,1
-PlayCaptureSound = 0
+PlayCaptureSound = 1
 
 [Record]
 UseAudioEncoderQueue = 1
@@ -83,7 +86,7 @@ UseVideoEncoderQueue = 1
 VideoProfile = 0
 VideoAutoAudioConvert = 1
 VideoAutoAudioResample = 0
-VideoAutoColorSpace = 0
+VideoAutoColorSpace = 1
 AudioProfile = 1
 AudioAutoAudioConvert = 1
 AudioAutoAudioResample = 0
@@ -98,10 +101,10 @@ DropVideoFrame = 0
 PassFirstVideoFrame = 0
 
 [Mux]
-3GP = ffmux_3gp | 0,0
-AMR = ffmux_amr | 0,0
-MP4 = ffmux_mp4 | 0,0
+3GP = avmux_3gp | 0,0
+AMR = avmux_amr | 0,0
+MP4 = avmux_mp4 | 0,0
 OGG = oggmux | 0,0
 WAV = wavenc | 0,0
-AAC = ffmux_adts | 0,0
+AAC = avmux_adts | 0,0
 
diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini
index 27fb97a..c7c9e86 100644
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini
@@ -25,6 +25,7 @@ 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
@@ -82,11 +83,9 @@ WhiteBalance = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
 ;;; 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 - 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
+;;; 0:NONE, 1:HORIZONTAL, 2:VERTICAL, 3:BOTH
+Flip = 0,-255,-255,-255 || 0
 
 ; Wide Dynamic Range - real setting value
 ;;; N/A
@@ -94,20 +93,6 @@ ColorTone = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-
 ;;; 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
@@ -118,7 +103,7 @@ WDR = 0,-255,-255 || 0
 ;;; N/A
 ; 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
+FocusMode = 0,-255,-255,-255,-255,-255 || 0
 
 ; Auto focus type - real setting value
 ;;; N/A
@@ -174,7 +159,7 @@ FaceZoomLevel = 0,0 || 0
 ;;; 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,255 || 1
+MultishotNumber = 1,1 || 1
 SensorEncodedCapture = 0
 ; Support HDR
 ;;; 0: OFF, 1: ON, 2: ON and Original
@@ -183,6 +168,7 @@ SupportHDR = 0,-255,-255 || 0
 
 [Detect]
 ; Detect mode
+;;; No need to convert
 ;;; 0:OFF, 1:ON
 DetectMode = 0,-255 || 0
 ;DetectNumber - Not support
diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini
index dbfc13c..a91db8b 100644
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini
@@ -25,6 +25,7 @@ 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
@@ -47,7 +48,7 @@ RecommendPreviewFormatRecord = 7
 RecommendPreviewResolution = 640,480 | 352,288 || 640,480
 ; Camera facing direction
 ;;; 0:REAR, 1:FRONT
-FacingDirection = 0
+FacingDirection = 1
 
 
 [Strobe]
@@ -82,11 +83,9 @@ WhiteBalance = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0
 ;;; 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 - 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
+;;; 0:NONE, 1:HORIZONTAL, 2:VERTICAL, 3:BOTH
+Flip = 0,-255,-255,-255 || 0
 
 ; Wide Dynamic Range - real setting value
 ;;; N/A
@@ -94,20 +93,6 @@ ColorTone = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-
 ;;; 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
@@ -118,7 +103,7 @@ WDR = 0,-255,-255 || 0
 ;;; N/A
 ; 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
+FocusMode = 0,-255,-255,-255,-255,-255 || 0
 
 ; Auto focus type - real setting value
 ;;; N/A
@@ -174,7 +159,7 @@ FaceZoomLevel = 0,0 || 0
 ;;; 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,255 || 1
+MultishotNumber = 1,1 || 1
 SensorEncodedCapture = 0
 ; Support HDR
 ;;; 0: OFF, 1: ON, 2: ON and Original
diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index ec6dc44..6687a36 100644
--- 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.31
+Version:    0.2.32
 Release:    0
 Group:      Multimedia/Configuration
 License:    Apache-2.0