[ALL/camera] Update ini file

5 files changed, 29 insertions, 27 deletions

diff --git a/debian/changelog b/debian/changelog
index 7395657..35a046f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-mmfw-sysconf (0.1.20-0) unstable; urgency=low
+mmfw-sysconf (0.1.21-0) unstable; urgency=low
 
   * Initial release
   * Git: pkgs/m/mmfw-sysconf
-  * Tag: mmfw-sysconf_0.1.20-0
+  * Tag: mmfw-sysconf_0.1.21-0
 
  -- Seongho Jeong <sh33.jeong@samsung.com>  Fri, 03 Feb 2012 15:17:36 +0900
diff --git a/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_camcorder.ini b/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_camcorder.ini
index b58555e..8e66c41 100644
--- a/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_camcorder.ini
@@ -34,6 +34,7 @@ ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini
 VideosrcElement = camerasrc | 2,0 | do-timestamp,1 | num-alloc-buf,7
 UseVideoscale = 0
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
+UseZeroCopyFormat = 0
 
 [AudioInput]
 AudiosrcElement = avsysaudiosrc | 3,0 | do-timestamp,1 | slave-method,3 | latency,0
@@ -53,15 +54,15 @@ UseVideoscale = 0
 VideoscaleElement = fimcconvert | 1,0 | rotang,90
 
 [VideoEncoder]
-H263 = omx_h263enc | 0,0
-H264 = omx_h264enc | 0,0
-MPEG4 = omx_mpeg4enc | 0,0
+H263 = ffenc_h263 | 0,0
+MPEG4 = ffenc_mpeg4 | 0,0
+THEORA = theoraenc | 1,0 | num-bufs,4
 
 [AudioEncoder]
 AMR = amrnbenc | 0,0
-;MP3 = lame | 0,0
-;AAC = savsenc_aac | 0,0
+AAC = faac | 0,0
 WAVE = wavenc | 0,0
+VORBIS = vorbisenc | 0,0
 
 [ImageEncoder]
 JPEG = secjpeg_enc | 0,0
diff --git a/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_camcorder_dev_video_pri.ini
index 5b61dbc..aad4711 100644
--- a/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_camcorder_dev_video_pri.ini
+++ b/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_camcorder_dev_video_pri.ini
@@ -23,22 +23,22 @@
 ;;; -1:NONE, 0:CAMERA0, 1:CAMERA1
 InputIndex = 0,-255 || 0
 DeviceName = m5mols_c210
-PreviewResolution = 128,96 | 160,120 | 176,144 | 176,176 | 240,320 | 320,240 | 240,400 | 400,240 | 352,288 | 480,360 | 640,360 | 640,480 | 720,480 | 800,480 | 800,600 | 1280,720 | 1600,1200 | 1920,1080 || 640,480
-CaptureResolution = 320,240 | 400,240 | 480,360 | 640,360 | 640,480 | 800,480 | 1280,720 | 1280,960 | 1600,1200 | 1920,1080 | 2048,1536 | 2560,1440 | 2560,1536 | 2560,1920 | 3264,1836 | 3264,1960 | 3264,2448 || 2560,1920
+PreviewResolution = 128,96 | 160,120 | 176,144 | 176,176 | 240,320 | 320,240 | 240,400 | 400,240 | 352,288 | 480,360 | 640,360 | 640,480 | 720,480 | 800,480 | 800,600 | 1280,720 | 1920,1080 || 640,480
+CaptureResolution = 640,480 | 800,480 | 1280,720 | 1600,1200 | 1920,1080 | 2048,1536 | 2560,1536 | 2560,1920 | 3264,1836 | 3264,2448 || 2560,1920
 FPS = 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
-PictureFormat = 0,4,7 || 7
+PictureFormat = 4,7 || 7
 Overlay = 0,1 || 1
 ; Recommend display rotation
 ;;; 0:NONE, 1:90, 2:180, 3:270
 RecommendDisplayRotation = 3
 ; Recommand 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 = 4
+RecommendPreviewFormatCapture = 7
 ; Recommand preview format for record
 ;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED, 14:INTERLEAVED_JPEG_UYVY
-RecommendPreviewFormatRecord = 0
+RecommendPreviewFormatRecord = 7
 
 
 [Strobe]
@@ -92,7 +92,7 @@ DigitalZoom = 0,30 || 0
 ;OpticalZoom - Not support
 
 ; Focus mode - real setting value
-;;; Not Support, no need to convert
+;;; 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,2,0,1,3,4 || 3
@@ -109,7 +109,7 @@ AFType = -255,0,1,-255 || 0
 ;;; 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 = 1,9 || 5
+;ExposureValue = 1,9 || 5
 ;FNumber - Not support
 ;ShutterSpeed - Not support
 
@@ -131,14 +131,14 @@ ProgramMode = 1,2,5,6,7,-255,9,10,11,3,12,13,-255,14,4 || 1
 ;;; 0:OFF, 1:Capture, 2:Movie
 ; Anti-handshake - MSL value(convert array index)
 ;;; 0:OFF, 1:ON, 2:AUTO, 3:MOVIE_ON
-AntiHandshake = 0,1,-255,2 || 0
+;AntiHandshake = 0,1,-255,2 || 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
-OutputMode = 0,4,7,13 || 13
+OutputMode = 4,7,13 || 13
 JpegQuality = 0,100 || 50
 MultishotNumber = 1,255 || 1
 SensorEncodedCapture = 1
@@ -148,7 +148,7 @@ SensorEncodedCapture = 1
 ; Detect mode
 ;;; No need to convert
 ;;; 0:OFF, 1:ON
-DetectMode = 0,1 || 0
+;DetectMode = 0,1 || 0
 ;DetectNumber - Not support
 ;DetectFocusSelect - Not support
 ;DetectSelectNumber - Not support
diff --git a/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_camcorder_dev_video_sec.ini
index 85e3779..26f4d68 100644
--- a/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_camcorder_dev_video_sec.ini
+++ b/mmfw-sysconf-cleansdk-target/opt/etc/mmfw_camcorder_dev_video_sec.ini
@@ -28,7 +28,7 @@ CaptureResolution = 176,144 | 320,240 | 400,240 | 352,288 | 640,480 || 640,480
 FPS = 0,8,15,25,30 || 15
 ; PictureForamt - MSL value
 ;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
-PictureFormat = 0,4,7 || 7
+PictureFormat = 4,7 || 7
 Overlay = 0,1 || 1
 ; Recommend display rotation
 ;;; 0:NONE, 1:90, 2:180, 3:270
@@ -38,7 +38,7 @@ RecommendDisplayRotation = 3
 RecommendPreviewFormatCapture = 4
 ; Recommand preview format for record
 ;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED, 14:INTERLEAVED_JPEG_UYVY
-RecommendPreviewFormatRecord = 0
+RecommendPreviewFormatRecord = 4
 
 
 [Strobe]
@@ -95,13 +95,13 @@ DigitalZoom = 0,30 || 0
 ;;; 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,0,-255,0,-255 || 0
+FocusMode = -255,-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 = -255,0,1,-255 || 0
+AFType = -255,-255,-255,-255 || 0
 
 ; Auto exposure type - real setting value
 ;;; 0:BASE, 1:MATRIX, 2:CENTER, 3:SPOT, 4:MAX
@@ -109,7 +109,7 @@ AFType = -255,0,1,-255 || 0
 ;;; 0:OFF, 1:ALL, 2:CENTER1, 3:CENTER2, 4:CENTER3, 5:SPOT1, 6:SPOT2, 7:CUSTOM1, 8:CUSTOM2
 AEType = -255,1,2,-255,-255,5,-255,-255,-255 || 1
 
-ExposureValue = 1,9 || 5
+;ExposureValue = 1,9 || 5
 ;FNumber - Not support
 ;ShutterSpeed - Not support
 
@@ -131,14 +131,14 @@ ProgramMode = 1,2,5,6,7,-255,9,10,11,3,12,13,-255,14,4 || 1
 ;;; 1:OFF, 2:ON, 3:AUTO, 4:MOVIE_ON
 ; Anti-handshake - MSL value(convert array index)
 ;;; 0:OFF, 1:ON, 2:AUTO, 3:MOVIE_ON
-AntiHandshake = 1,2,3,4 || 0
+;AntiHandshake = 1,2,3,4 || 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
-OutputMode = 0,4,7,13 || 13
+OutputMode = 4,7,13 || 13
 JpegQuality = 0,100 || 50
 MultishotNumber = 1,255 || 1
 SensorEncodedCapture = 0
@@ -148,7 +148,7 @@ SensorEncodedCapture = 0
 ; Detect mode
 ;;; No need to convert
 ;;; 0:OFF, 1:ON
-DetectMode = 0,1 || 0
+;DetectMode = 0,1 || 0
 ;DetectNumber - Not support
 ;DetectFocusSelect - Not support
 ;DetectSelectNumber - Not support
diff --git a/mmfw-sysconf-simulator/opt/etc/mmfw_camcorder.ini b/mmfw-sysconf-simulator/opt/etc/mmfw_camcorder.ini
index 9cf4627..95cffb6 100644
--- a/mmfw-sysconf-simulator/opt/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-simulator/opt/etc/mmfw_camcorder.ini
@@ -36,6 +36,7 @@ VideosrcElement = v4l2src | 1,1 | do-timestamp,1 | device,/dev/video0
 ;VideosrcElement = videotestsrc | 0,0
 UseVideoscale = 0
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
+UseZeroCopyFormat = 0
 
 [AudioInput]
 AudiosrcElement = avsysaudiosrc | 2,0 | do-timestamp,1 | slave-method,3
@@ -57,8 +58,8 @@ UseVideoscale = 0
 VideoscaleElement = videoscale | 1,0 | method,1
 
 [VideoEncoder]
-H263 = ffenc_h263 | 0,0
-MPEG4 = ffenc_mpeg4 | 0,0
+H263 = emulenc_h263 | 0,0
+MPEG4 = emulenc_mpeg4 | 0,0
 THEORA = theoraenc | 1,0 | num-bufs,4
 
 [AudioEncoder]