Adding needed ini files to allow camera-app to work. These files have been slightly...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 777ba66..29a8213 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,4 +43,6 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
 # install manifest file & icon
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.camera-app.xml DESTINATION /usr/share/packages/)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.camera-app.png DESTINATION /usr/share/icons/default/small/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/ini/mmfw_camcorder.ini DESTINATION /usr/etc)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/ini/mmfw_camcorder_dev_video_pri.ini DESTINATION /usr/etc)
 

diff --git a/ini/mmfw_camcorder.ini b/ini/mmfw_camcorder.ini
new file mode 100644 (file)
index 0000000..59079fe
--- /dev/null
+++ b/ini/mmfw_camcorder.ini
@@ -0,0 +1,103 @@
+; < Camera/Camcorder Configure Main INI file >
+;
+; - Header List -
+; 1.  General
+; 2.  VideoInput
+; 3.  AudioInput
+; 4.  VideoOutput
+; 5.  Capture
+; 6.  Record
+; 7.  VideoEncoder
+; 8.  AudioEncoder
+; 9.  ImageEncoder
+; 10. Mux
+;
+; - Note -
+; If you want to add a new header,
+; add a new enum value to "enum ConfigureCategoryMain"
+; and new default table for it in mm_camcorder_configure.c/.h
+;
+
+[General]
+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
+;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
+VideosrcElement = v4l2src | 2,0 | do-timestamp,1 | num-alloc-buf,7
+UseVideoscale = 0
+VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
+UseZeroCopyFormat = 0
+DeviceCount = 1
+
+[AudioInput]
+AudiosrcElement = avsysaudiosrc | 3,0 | do-timestamp,1 | slave-method,3 | latency,0
+AudiomodemsrcElement = voicedatasrcbin | 0,0
+
+[VideoOutput]
+; 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,1,2 || 0
+; Videosink
+;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface
+Videosink = 0,1,3 || 0
+VideosinkElementX = xvimagesink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-buffer,0 | qos,0 | sync,0 | show-preroll-frame,0
+VideosinkElementEvas = evasimagesink | 4,0 | enable-last-buffer,0 | qos,0 | sync,0 | show-preroll-frame,0
+VideosinkElementNull = fakesink | 2,0 | qos,0 | sync,0
+UseVideoscale = 0
+VideoscaleElement = fimcconvert | 1,0 | rotang,90
+
+[VideoEncoder]
+H263 = ffenc_h263p | 0,0
+MPEG4 = ffenc_mpeg4 | 0,0
+
+[AudioEncoder]
+AMR = amrnbenc | 0,0
+AAC = ffenc_aac | 0,0
+WAVE = wavenc | 0,0
+
+[ImageEncoder]
+JPEG = secjpeg_enc | 0,0
+;PNG = pngenc | 0,0
+
+[Capture]
+UseEncodebin = 0
+UseCaptureMode = 0
+VideoscaleElement = videoscale | 1,0 | method,1
+
+[Record]
+UseAudioEncoderQueue = 1
+UseVideoEncoderQueue = 1
+VideoProfile = 0
+VideoAutoAudioConvert = 1
+VideoAutoAudioResample = 0
+VideoAutoColorSpace = 1
+AudioProfile = 1
+AudioAutoAudioConvert = 1
+AudioAutoAudioResample = 0
+AudioAutoColorSpace = 0
+ImageProfile = 2
+ImageAutoAudioConvert = 0
+ImageAutoAudioResample = 0
+ImageAutoColorSpace = 1
+RecordsinkElement = filesink | 1,0 | async,0
+UseNoiseSuppressor = 0
+DropVideoFrame = 0
+PassFirstVideoFrame = 0
+
+[Mux]
+3GP = ffmux_3gp | 0,0
+AMR = ffmux_amr | 0,0
+MP4 = ffmux_mp4 | 0,0
+AVI = avimux | 0,0
+MATROSKA = matroskamux | 0,0
+WAV = wavenc | 0,0
+AAC = ffmux_adts | 0,0
+

diff --git a/ini/mmfw_camcorder_dev_video_pri.ini b/ini/mmfw_camcorder_dev_video_pri.ini
new file mode 100644 (file)
index 0000000..77e5ba1
--- /dev/null
+++ b/ini/mmfw_camcorder_dev_video_pri.ini
@@ -0,0 +1,225 @@
+; < 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 = virtual driver
+DeviceName = IVI_CAM
+
+;PreviewResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 || 640,480
+;CaptureResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 || 640,480
+
+PreviewResolution = 176,144 | 320,240 | 640,480 | 960,720 | 1280,720 | 1920,1080 || 320,240
+CaptureResolution = 640,480 | 1280,720 | 2048,1152 | 2048,1536 | 3264,1836 | 3264,2176 | 3264,2448 || 640,480
+;FPS = 30 || 30
+FPS = 15,30 || 30
+;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, 14:INTERLEAVED_JPEG_UYVY
+
+;PictureFormat = 4,7,8 || 4
+PictureFormat = 0,4,5,7,14 || 4 
+
+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
+RecommendPreviewFormatCapture = 4
+;14
+; 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 = 4
+;14
+; Recommend preview resolution
+;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9)
+
+;RecommendPreviewResolution = 320,240 || 320,240
+RecommendPreviewResolution = 320,240 | 640,480 | 960,720 | 1280,720 || 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 || 0
+;StrobeStatus - Not support
+;StrobeEV - Not support
+
+
+[Effect]
+;Brightness = 1,20 || 10
+;Contrast = 1,20 || 10
+;Saturation = 1,20 || 10
+;Sharpness = 1,20 || 10
+
+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,1,-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: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,1,-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,1 || 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 = 0,4,7,13 || 13
+JpegQuality = 0,100 || 50
+MultishotNumber = 1,255 || 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,1 || 0
+
+;DetectNumber - Not support
+;DetectFocusSelect - Not support
+;DetectSelectNumber - Not support
+;DetectStatus - Not support
+

diff --git a/packaging/org.tizen.camera-app.spec b/packaging/org.tizen.camera-app.spec
index 1f40ab6..02c9518 100644 (file)
--- a/packaging/org.tizen.camera-app.spec
+++ b/packaging/org.tizen.camera-app.spec
@@ -42,3 +42,5 @@ execstack -c %{buildroot}%{_appdir}/org.tizen.camera-app/bin/camera
 %{_usrdir}/share/icons/default/small/org.tizen.camera-app.png
 %{_usrdir}/share/packages/org.tizen.camera-app.xml
 %{_appdir}/org.tizen.camera-app/bin/camera
+/usr/etc/mmfw_camcorder_dev_video_pri.ini
+/usr/etc/mmfw_camcorder.ini