diff options
19 files changed, 282 insertions, 261 deletions
diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index a49fab4..0000000 --- a/debian/changelog +++ /dev/null @@ -1,7 +0,0 @@ -mmfw-sysconf (0.1.22-0) unstable; urgency=low - - * Initial release - * Git: pkgs/m/mmfw-sysconf - * Tag: mmfw-sysconf_0.1.22-0 - - -- Seongho Jeong <sh33.jeong@samsung.com> Fri, 03 Feb 2012 15:17:36 +0900 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff8..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/control b/debian/control deleted file mode 100644 index 960e954..0000000 --- a/debian/control +++ /dev/null @@ -1,17 +0,0 @@ -Source: mmfw-sysconf -Section: misc -Priority: extra -Maintainer: Jonghyuk Choi <jhchoi.choi@samsung.com>, Younghwan An <younghwan_.an@samsung.com>, Kwanghui Cho <kwanghui.cho@samsung.com>, Seungbae Shin <seungbae.shin@samsung.com>, Younghun Kim <yh8004.kim@samsung.com>, Jeongmo Yang <jm80.yang@samsung.com>, Yejin Cho <cho.yejin@samsung.com>, Sangchul Lee <sc11.lee@samsung.com> -Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 - -Package: mmfw-sysconf-cleansdk-target -Architecture: armel -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Multimedia Framework system configuration package for clean SDK target binary - -Package: mmfw-sysconf-simulator -Architecture: i386 -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Multimedia Framework system configuration package for simulator - diff --git a/debian/copyright b/debian/copyright deleted file mode 100755 index 0842a72..0000000 --- a/debian/copyright +++ /dev/null @@ -1,13 +0,0 @@ -Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License.
\ No newline at end of file diff --git a/debian/mmfw-sysconf-cleansdk-target.dirs b/debian/mmfw-sysconf-cleansdk-target.dirs deleted file mode 100644 index 8b13789..0000000 --- a/debian/mmfw-sysconf-cleansdk-target.dirs +++ /dev/null @@ -1 +0,0 @@ - diff --git a/debian/mmfw-sysconf-simulator.dirs b/debian/mmfw-sysconf-simulator.dirs deleted file mode 100644 index 8b13789..0000000 --- a/debian/mmfw-sysconf-simulator.dirs +++ /dev/null @@ -1 +0,0 @@ - diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 1be4b46..0000000 --- a/debian/rules +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - -configure: configure-stamp -configure-stamp: - dh_testdir - touch configure-stamp - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - mkdir -p $(CURDIR)/debian/tmp$(PREFIX) - - # architecture - ifneq (, $(findstring arm, $(DEB_HOST_ARCH))) - # ARM - cp -af $(CURDIR)/mmfw-sysconf-cleansdk-target/* $(CURDIR)/debian/mmfw-sysconf-cleansdk-target - else - # OTHER - cp -af $(CURDIR)/mmfw-sysconf-simulator/* $(CURDIR)/debian/mmfw-sysconf-simulator - endif - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs -# dh_installexamples - dh_install --sourcedir=debian/tmp -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo -# dh_installman -# dh_link -# dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol -s - dh_md5sums - dh_builddeb -s - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/mmfw-sysconf-cleansdk-target/usr/etc/gst-openmax.conf b/mmfw-sysconf-cleansdk-target/usr/etc/gst-openmax.conf new file mode 100755 index 0000000..9c0203c --- /dev/null +++ b/mmfw-sysconf-cleansdk-target/usr/etc/gst-openmax.conf @@ -0,0 +1,55 @@ +omx_mpeg4dec, + type=GstOmxMpeg4Dec, + library-name=libSEC_OMX_Core.so.0, + component-name=OMX.SEC.MPEG4.Decoder, + sink="video/mpeg, mpegversion=(int)4, systemstream=false, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max]; video/x-divx, divxversion=(int)[4,5], width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max]; video/x-xvid, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max]; video/x-3ivx, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + src="video/x-raw-yuv, format=(fourcc){ST12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + rank=0; + +omx_h264dec, + type=GstOmxH264Dec, + library-name=libSEC_OMX_Core.so.0, + component-name=OMX.SEC.AVC.Decoder, + sink="video/x-h264, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + src="video/x-raw-yuv, format=(fourcc){ST12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + rank=0; + +omx_h263dec, + type=GstOmxH263Dec, + library-name=libSEC_OMX_Core.so.0, + component-name=OMX.SEC.H263.Decoder, + sink="video/x-h263, variant=(string)itu, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + src="video/x-raw-yuv, format=(fourcc){ST12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + rank=0; + +omx_wmvdec, + type=GstOmxWmvDec, + library-name=libSEC_OMX_Core.so.0, + component-name=OMX.SEC.WMV.Decoder, + sink="video/x-wmv, wmvversion=(int)3, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + src="video/x-raw-yuv, format=(fourcc){ST12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + rank=0; + +omx_mpeg4enc, + type=GstOmxMpeg4Enc, + library-name=libSEC_OMX_Core.so.0, + component-name=OMX.SEC.MPEG4.Encoder, + sink="video/x-raw-yuv, format=(fourcc){ST12, SN12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + src="video/mpeg, mpegversion=(int)4, systemstream=false, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + rank=0; + +omx_h264enc, + type=GstOmxH264Enc, + library-name=libSEC_OMX_Core.so.0, + component-name=OMX.SEC.AVC.Encoder, + sink="video/x-raw-yuv, format=(fourcc){ST12, SN12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + src="video/x-h264, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + rank=0; + +omx_h263enc, + type=GstOmxH263Enc, + library-name=libSEC_OMX_Core.so.0, + component-name=OMX.SEC.H263.Encoder, + sink="video/x-raw-yuv, format=(fourcc){ST12, SN12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + src="video/x-h263, variant=(string)itu, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + rank=0 diff --git a/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder.ini b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder.ini index 123d48b..cb445cb 100644 --- a/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder.ini +++ b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder.ini @@ -54,14 +54,13 @@ UseVideoscale = 0 VideoscaleElement = fimcconvert | 1,0 | rotang,90 [VideoEncoder] -H263 = ffenc_h263 | 0,0 +H263 = ffenc_h263p | 0,0 MPEG4 = ffenc_mpeg4 | 0,0 -THEORA = theoraenc | 1,0 | num-bufs,4 [AudioEncoder] AMR = amrnbenc | 0,0 +AAC = ffenc_aac | 0,0 WAVE = wavenc | 0,0 -VORBIS = vorbisenc | 0,0 [ImageEncoder] JPEG = secjpeg_enc | 0,0 @@ -78,7 +77,7 @@ UseVideoEncoderQueue = 1 VideoProfile = 0 VideoAutoAudioConvert = 1 VideoAutoAudioResample = 0 -VideoAutoColorSpace = 0 +VideoAutoColorSpace = 1 AudioProfile = 1 AudioAutoAudioConvert = 1 AudioAutoAudioResample = 0 @@ -93,13 +92,11 @@ DropVideoFrame = 0 PassFirstVideoFrame = 0 [Mux] -;3GP = ffmux_3gp_ext | 0,0 3GP = ffmux_3gp | 0,0 -;AMR = ffmux_amr_ext | 0,0 AMR = ffmux_amr | 0,0 -;MP4 = ffmux_mp4_ext | 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/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_pri.ini index aad4711..325ea5b 100644 --- a/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_pri.ini +++ b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_pri.ini @@ -23,22 +23,25 @@ ;;; -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 | 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 +PreviewResolution = 176,144 | 320,240 | 640,480 | 720,480 | 800,480 | 1280,720 | 1920,1080 || 640,480 +CaptureResolution = 640,480 | 1280,720 | 1920,1080 | 2048,1536 | 3264,1960 | 3264,2448 || 3264,2448 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 = 4,7 || 7 +PictureFormat = 0,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 +; 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 = 7 -; Recommand preview format for record +RecommendPreviewFormatCapture = 4 +; 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 = 7 +RecommendPreviewFormatRecord = 0 +; Recommend preview resolution +;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9) +RecommendPreviewResolution = 640,480 | 800,480 || 640,480 [Strobe] @@ -80,10 +83,10 @@ ColorTone = 0,-255,1,3,-255,-255,-255,-255,-255,5,-255,2,-255,-255,-255,-255,4,6 ;Flip = 2,1,0 || 0 ; Wide Dynamic Range - real setting value -;;; 1:OFF, 2:ON, 3:AUTO +;;; 0:OFF, 1:ON ; Wide Dynamic Range - MSL value(convert array index) ;;; 0:OFF, 1:ON, 2:AUTO -WDR = 1,2,3 || 3 +WDR = 0,1,-255 || 0 [Photograph] @@ -95,7 +98,7 @@ DigitalZoom = 0,30 || 0 ;;; 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 +FocusMode = -255,-255,0,-255,3,4 || 3 ; Auto focus type - real setting value ;;; 0:NORMAL, 1:MACRO, 2:FULL @@ -109,7 +112,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 - Not support ;FNumber - Not support ;ShutterSpeed - Not support @@ -128,27 +131,30 @@ ISO = 0,1,2,3,4,5,-255,-255 || 0 ProgramMode = 1,2,5,6,7,-255,9,10,11,3,12,13,-255,14,4 || 1 ; Anti-handshake - real setting value -;;; 0:OFF, 1:Capture, 2:Movie +;;; N/A ; Anti-handshake - MSL value(convert array index) ;;; 0:OFF, 1:ON, 2:AUTO, 3:MOVIE_ON -;AntiHandshake = 0,1,-255,2 || 0 +AntiHandshake = 0,-255,-255,-255 || 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 = 4,7,13 || 13 +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 ;;; No need to convert ;;; 0:OFF, 1:ON -;DetectMode = 0,1 || 0 +DetectMode = 0,-255 || 0 ;DetectNumber - Not support ;DetectFocusSelect - Not support ;DetectSelectNumber - Not support diff --git a/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_sec.ini index 9b06129..51c266b 100644 --- a/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_sec.ini +++ b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_sec.ini @@ -23,22 +23,25 @@ ;;; -1:NONE, 0:CAMERA0, 1:CAMERA1 InputIndex = -255,1 || 1 DeviceName = m4mo_VGA_c210 -PreviewResolution = 176,144 | 320,240 | 400,240 | 352,288 | 640,480 || 640,480 -CaptureResolution = 176,144 | 320,240 | 400,240 | 352,288 | 640,480 || 640,480 +PreviewResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480 +CaptureResolution = 176,144 | 320,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 = 4,7 || 7 +PictureFormat = 0,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 +; 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 = 7 -; Recommand preview format for record +RecommendPreviewFormatCapture = 4 +; 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 = 7 +RecommendPreviewFormatRecord = 0 +; Recommend preview resolution +;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9) +RecommendPreviewResolution = 640,480 | 352,288 || 640,480 [Strobe] @@ -48,22 +51,22 @@ RecommendPreviewFormatRecord = 7 ;;; 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,-255,-255,-255,-255,-255,-255,-255 || 1 +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 -Saturation = 0,4 || 2 -Sharpness = 0,4 || 2 +Brightness = -4,4 || 0 +;Contrast - Not support +;Saturation - Not support +;Sharpness - Not support ; White balance - real setting value ;;; 0:BASE, 1:AUTO, 2:SUNNY, 3:CLOUDY, 4:TUNGSTEN, 5: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 +WhiteBalance = -255,0,-255,-255,-255,-255,-255,-255,-255,-255 || 0 ; Color tone - real setting value ;0:NONE, 1:SEPIA, 2:ANTIQUE, 3:NEGATIVE, 4:EMBOSS, 5:GRAY, 6:OUTLINE, 7:SOLARIZATION @@ -83,19 +86,19 @@ ColorTone = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,- ;;; 1:OFF, 2:ON, 3:AUTO ; Wide Dynamic Range - MSL value(convert array index) ;;; 0:OFF, 1:ON, 2:AUTO -WDR = 1,2,3 || 3 +WDR = 0,-255,-255 || 0 [Photograph] -;LensInit = 0,1 || 0 -DigitalZoom = 0,30 || 0 +;LensInit - Not support +;DigitalZoom - Not support ;OpticalZoom - Not support ; Focus mode - real setting value -;;; Not Support, no need to convert +;;; N/A ; 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 @@ -107,17 +110,17 @@ AFType = 0,-255,-255,-255 || 0 ;;; 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,5,-255,-255,-255 || 1 +AEType = -255,0,-255,-255,-255,-255,-255,-255,-255 || 0 -;ExposureValue = 1,9 || 5 +;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(Not Supported), 7:SPORTS(Not Supported), 8:NIGHT(Not Supported), 9:MOVIE(Not Supported) +;;; N/A ; ISO - MSL value(convert array index) ;;; 0:AUTO, 1:50, 2:100, 3:200, 4:400, 5:800, 6:1600, 7:3200 -ISO = 0,1,2,3,4,5,-255,-255 || 0 +ISO = 0,-255,-255,-255,-255,-255,-255,-255 || 0 ; Program mode - real setting value ;;; 0:BASE, 1:NONE, 2:PORTRAIT, 3:NIGHTSHOT, 4:BACK_LIGHT, 5:LANDSCAPE, 6:SPORTS, 7:PARTY_INDOOR, 8:BEACH_SNOW, 9:SUNSET, 10:DUSK_DAWN, @@ -125,30 +128,39 @@ ISO = 0,1,2,3,4,5,-255,-255 || 0 ; 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,-255,9,10,11,3,12,13,-255,14,4 || 1 +ProgramMode = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0 ; Anti-handshake - real setting value -;;; 1:OFF, 2:ON, 3:AUTO, 4:MOVIE_ON +;;; N/A ; Anti-handshake - MSL value(convert array index) ;;; 0:OFF, 1:ON, 2:AUTO, 3:MOVIE_ON -;AntiHandshake = 1,2,3,4 || 0 +AntiHandshake = 0,-255,-255,-255 || 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 -OutputMode = 4,7,13 || 13 +OutputMode = 0,4,7,13 || 13 JpegQuality = 0,100 || 50 MultishotNumber = 1,255 || 1 SensorEncodedCapture = 0 +; Support HDR +;;; 0: OFF, 1: ON, 2: ON and Original +SupportHDR = 0,-255,-255 || 0 [Detect] ; Detect mode ;;; No need to convert ;;; 0:OFF, 1:ON -;DetectMode = 0,1 || 0 +DetectMode = 0,-255 || 0 ;DetectNumber - Not support ;DetectFocusSelect - Not support ;DetectSelectNumber - Not support diff --git a/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_player.ini b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_player.ini index 68177a5..65764c2 100644 --- a/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_player.ini +++ b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_player.ini @@ -7,9 +7,10 @@ use sink handler = yes disable segtrap = yes ; same effect with --gst-disable-segtrap -; set default video sink but, it can be replaced with others selected by application -; 0:v4l2sink, 1:ximagesink, 2:xvimagesink, 3:fakesink 4:evasimagesink 5:glimagesink -videosink element = 2 +; set default videosink element according to video surface type(X, EVAS, NULL) +videosink element x = xvimagesink +videosink element evas = evasimagesink +videosink element fake = fakesink video converter element = ffmpegcolorspace @@ -22,7 +23,7 @@ skip rescan = yes delay before repeat = 50 ; msec ; comma separated list of tocken which elemnts has it in it's name will not be used -element exclude keyword = omx +element exclude keyword = async start = yes @@ -82,9 +83,12 @@ rtsp error concealment = yes use video hw accel = no -[features] +[sound effect] +; preset audio filter setting +audio filter preset = no -audio filter = no +; custom audio filter setting (EQ/extension) +audio filter custom = no [priority] @@ -99,4 +103,3 @@ audiosink = 97 ringbuffer = 98 - diff --git a/mmfw-sysconf-simulator/usr/etc/gst-openmax.conf b/mmfw-sysconf-simulator/usr/etc/gst-openmax.conf new file mode 100755 index 0000000..9c0203c --- /dev/null +++ b/mmfw-sysconf-simulator/usr/etc/gst-openmax.conf @@ -0,0 +1,55 @@ +omx_mpeg4dec, + type=GstOmxMpeg4Dec, + library-name=libSEC_OMX_Core.so.0, + component-name=OMX.SEC.MPEG4.Decoder, + sink="video/mpeg, mpegversion=(int)4, systemstream=false, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max]; video/x-divx, divxversion=(int)[4,5], width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max]; video/x-xvid, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max]; video/x-3ivx, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + src="video/x-raw-yuv, format=(fourcc){ST12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + rank=0; + +omx_h264dec, + type=GstOmxH264Dec, + library-name=libSEC_OMX_Core.so.0, + component-name=OMX.SEC.AVC.Decoder, + sink="video/x-h264, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + src="video/x-raw-yuv, format=(fourcc){ST12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + rank=0; + +omx_h263dec, + type=GstOmxH263Dec, + library-name=libSEC_OMX_Core.so.0, + component-name=OMX.SEC.H263.Decoder, + sink="video/x-h263, variant=(string)itu, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + src="video/x-raw-yuv, format=(fourcc){ST12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + rank=0; + +omx_wmvdec, + type=GstOmxWmvDec, + library-name=libSEC_OMX_Core.so.0, + component-name=OMX.SEC.WMV.Decoder, + sink="video/x-wmv, wmvversion=(int)3, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + src="video/x-raw-yuv, format=(fourcc){ST12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + rank=0; + +omx_mpeg4enc, + type=GstOmxMpeg4Enc, + library-name=libSEC_OMX_Core.so.0, + component-name=OMX.SEC.MPEG4.Encoder, + sink="video/x-raw-yuv, format=(fourcc){ST12, SN12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + src="video/mpeg, mpegversion=(int)4, systemstream=false, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + rank=0; + +omx_h264enc, + type=GstOmxH264Enc, + library-name=libSEC_OMX_Core.so.0, + component-name=OMX.SEC.AVC.Encoder, + sink="video/x-raw-yuv, format=(fourcc){ST12, SN12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + src="video/x-h264, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + rank=0; + +omx_h263enc, + type=GstOmxH263Enc, + library-name=libSEC_OMX_Core.so.0, + component-name=OMX.SEC.H263.Encoder, + sink="video/x-raw-yuv, format=(fourcc){ST12, SN12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + src="video/x-h263, variant=(string)itu, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];", + rank=0 diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini index bdb3883..5502fd9 100644 --- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini +++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini @@ -31,15 +31,13 @@ ModelName = TIZEN_SDK UseConfCtrl = 1 ConfCtrlFile0 = mmfw_camcorder_dev_video_pri.ini ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini -;VideosrcElement = avsysvideosrc | 3,0 | do-timestamp,1 | use-pad-alloc,1 | num-alloc-buf,5 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 +AudiosrcElement = avsysaudiosrc | 3,0 | do-timestamp,1 | slave-method,3 | latency,0 AudiomodemsrcElement = audiotestsrc | 2,0 | do-timestamp,1 | is-live,1 [VideoOutput] @@ -58,12 +56,13 @@ UseVideoscale = 0 VideoscaleElement = videoscale | 1,0 | method,1 [VideoEncoder] -H263 = emulenc_h263 | 0,0 +H263 = emulenc_h263p | 0,0 MPEG4 = emulenc_mpeg4 | 0,0 THEORA = theoraenc | 1,0 | num-bufs,4 [AudioEncoder] AMR = amrnbenc | 0,0 +AAC = ffenc_aac | 0,0 WAVE = wavenc | 0,0 VORBIS = vorbisenc | 0,0 @@ -75,6 +74,7 @@ PNG = pngenc | 0,0 UseEncodebin = 1 UseCaptureMode = 0 VideoscaleElement = videoscale | 1,0 | method,1 +PlayCaptureSound = 0 [Record] UseAudioEncoderQueue = 1 @@ -97,12 +97,10 @@ DropVideoFrame = 0 PassFirstVideoFrame = 0 [Mux] -;3GP = ffmux_3gp_ext | 0,0 3GP = ffmux_3gp | 0,0 -;AMR = ffmux_amr_ext | 0,0 AMR = ffmux_amr | 0,0 -;MP4 = ffmux_mp4_ext | 0,0 MP4 = ffmux_mp4 | 0,0 OGG = oggmux | 0,0 WAV = wavenc | 0,0 +AAC = ffmux_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 7f656ed..1437420 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 @@ -23,29 +23,32 @@ ;;; -1:NONE, 0:CAMERA0, 1:CAMERA1 InputIndex = 0,-255 || 0 DeviceName = virtual driver -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 | 352,288 | 640,480 || 640,480 +CaptureResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480 FPS = 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 PictureFormat = 4,7,8 || 4 Overlay = 0,1 || 1 -; Recommand preview format for capture +; 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 = 7 -; Recommand preview format for record +; 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 = 7 +; Recommend preview resolution +;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9) +RecommendPreviewResolution = 640,480 | 352,288 || 640,480 [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,-255,-255,-255,-255,-255,-255,-255 || 1 +StrobeMode = 0,-255,-255,-255,-255,-255,-255,-255 || 0 ;StrobeStatus - Not support ;StrobeEV - Not support @@ -57,20 +60,19 @@ Saturation = 1,20 || 10 Sharpness = 1,20 || 10 ; White balance - real setting value -;;; 0:AUTO, 1:INCANDESCENT, 2:FLUORESCENT_HIGH, 3:FLUORESCENT_LOW, 4:DAYLIGHT, 5:CLOUDY, 6:SHADE, 7:HORIZON, 8:CUSTOM , 9:LED_LIGHT +;;; N/A ; White balance - MSL value(convert array index) ;;; 0:NONE, 1:AUTO, 2:DAYLIGHT, 3:CLOUDY, 4:FLUOROSCENT, 5:INCANDESCENT, 6:SHADE, 7:HORIZON, 8:FLASH, 9:CUSTOM -;WhiteBalance = -255,1,4,5,3,2,6,7,-255,-255 || 1 -;WhiteBalance = -255,0,4,5,2,1,6,7,9,8 || 0 +WhiteBalance = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0 ; Color tone - real setting value -;;; 0:NONE, 1:SEPIA, 2:ANTIQUE, 3:NEGATIVE, 4:EMBOSS, 5:GRAY, 6:OUTLINE, 7:SOLARIZATION +;;; N/A ; 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:REC, ;;; 11:ANTIQUE, 12:WARM, 13:PINK, 14:YELLOW, 15:PURPLE, 16:EMBOSS, 17:OUTLINE, 18:SOLARIZATION_1, 19:SOLARIZATION_2, 20:SOLARIZATION_3, ;;; 21:SOLARIZATION_4, 22:SKETCH_1, 23:SKETCH_2, 24:SKETCH_3, 25:SKETCH_4 -;ColorTone = 1,-255,3,2,11,6,5,18,-255,-255,3,4,10,-255,-255,-255,-255,16,17,12,13,14,15,-255,-255,-255,-255 || 0 -;ColorTone = 0,-255,1,3,-255,-255,-255,-255,-255,5,-255,2,-255,-255,-255,-255,4,6,7,-255,-255,-255,-255,-255,-255,-255 || 0 +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) @@ -78,10 +80,10 @@ Sharpness = 1,20 || 10 ;Flip = 2,1,0 || 0 ; Wide Dynamic Range - real setting value -;;; 1:OFF, 2:ON, 3:AUTO +;;; N/A ; Wide Dynamic Range - MSL value(convert array index) ;;; 0:OFF, 1:ON, 2:AUTO -;WDR = 1,2,3 || 3 +WDR = 0,-255,-255 || 0 ; Part color mode - real setting value ;;; 0:OFF, 1:SWAP, 2:ACCENT @@ -104,47 +106,51 @@ Sharpness = 1,20 || 10 ;OpticalZoom - Not support ; Focus mode - real setting value -;;; Not Support, no need to convert +;;; N/A ; 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 +FocusMode = -255,0,-255,-255,-255,-255 || 0 ; Auto focus type - real setting value -;;; 0:NORMAL, 1:MACRO, 2:FULL +;;; N/A ; Auto focus - MSL value(convert array index) ;;; 0:NONE, 1:NORMAL, 2:MACRO, 3:FULL -;AFType = -255,0,1,-255 || 0 +AFType = 0,-255,-255,-255 || 0 ; Auto exposure type - real setting value -;;; 1,ALL 2,CENTER 3,SPOT +;;; N/A ; 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 +AEType = -255,0,-255,-255,-255,-255,-255,-255,-255 || 0 -;ExposureValue = 1,9 || 5 +;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(Not Supported), 7:3200(Not Supported) +;;; N/A ; ISO - MSL value(convert array index) ;;; 0:AUTO, 1:50, 2:100, 3:200, 4:400, 5:800, 6:1600, 7:3200 -;ISO = 0,1,2,3,4,5,-255,-255 || 0 +ISO = 0,-255,-255,-255,-255,-255,-255,-255 || 0 ; Program mode - real setting value -;;; 0:NONE, 1:FALL_COLOR, 2:DUSK_N_DAWN, 3:CANDLE_LIGHT, 4:BEACH_SNOW, 5:BACKLIGHT, 6:LANDSCAPE, 7:NIGHT_SCENE, 8:PORTRAIT, 9:SPORTS, 10:INDOOR, -;;; 11:FIREWORK, 12:TEXT, 13:SHOW_WINDOW +;;; N/A ; 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,3,4,5,6,7,8,9,10,11,12,13,14,15 || 1 -;ProgramMode = 0,8,6,9,10,4,-255,2,1,7,11,12,13,3,5 || 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:Capture, 2:Movie +;;; N/A ; Anti-handshake - MSL value(convert array index) ;;; 0:OFF, 1:ON, 2:AUTO, 3:MOVIE_ON -;AntiHandshake = 0,1,-255,2 || 0 +AntiHandshake = 0,-255,-255,-255 || 0 + +; Face zoom mode +;;; 0:OFF, 1:ON +FaceZoomMode = 0 || 0 +; Face zoom level +FaceZoomLevel = 0,0 || 0 [Capture] @@ -155,13 +161,15 @@ OutputMode = 4,7,8,13 || 13 JpegQuality = 0,100 || 50 MultishotNumber = 1,255 || 1 SensorEncodedCapture = 0 +; Support HDR +;;; 0: OFF, 1: ON, 2: ON and Original +SupportHDR = 0,-255,-255 || 0 [Detect] ; Detect mode -;;; No need to convert ;;; 0:OFF, 1:ON -;DetectMode = 0,1 || 0 +DetectMode = 0,-255 || 0 ;DetectNumber - Not support ;DetectFocusSelect - Not support ;DetectSelectNumber - 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 7875531..6434b0a 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 @@ -23,29 +23,32 @@ ;;; -1:NONE, 0:CAMERA0, 1:CAMERA1 InputIndex = -255,0 || 0 DeviceName = virtual driver -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 | 352,288 | 640,480 || 640,480 +CaptureResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480 FPS = 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 PictureFormat = 4,7,8 || 4 Overlay = 0,1 || 1 -; Recommand preview format for capture +; 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 = 7 -; Recommand preview format for record +; 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 = 7 +; Recommend preview resolution +;;; 0: NORMAL ratio(4:3), 1: WIDE ratio(16:9) +RecommendPreviewResolution = 640,480 | 352,288 || 640,480 [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,-255,-255,-255,-255,-255,-255,-255 || 1 +StrobeMode = 0,-255,-255,-255,-255,-255,-255,-255 || 0 ;StrobeStatus - Not support ;StrobeEV - Not support @@ -57,20 +60,19 @@ Saturation = 1,20 || 10 Sharpness = 1,20 || 10 ; White balance - real setting value -;;; 0:AUTO, 1:INCANDESCENT, 2:FLUORESCENT_HIGH, 3:FLUORESCENT_LOW, 4:DAYLIGHT, 5:CLOUDY, 6:SHADE, 7:HORIZON, 8:CUSTOM , 9:LED_LIGHT +;;; N/A ; White balance - MSL value(convert array index) ;;; 0:NONE, 1:AUTO, 2:DAYLIGHT, 3:CLOUDY, 4:FLUOROSCENT, 5:INCANDESCENT, 6:SHADE, 7:HORIZON, 8:FLASH, 9:CUSTOM -;WhiteBalance = -255,1,4,5,3,2,6,7,-255,-255 || 1 -;WhiteBalance = -255,0,4,5,2,1,6,7,9,8 || 0 +WhiteBalance = 0,-255,-255,-255,-255,-255,-255,-255,-255,-255 || 0 ; Color tone - real setting value -;;; 0:NONE, 1:SEPIA, 2:ANTIQUE, 3:NEGATIVE, 4:EMBOSS, 5:GRAY, 6:OUTLINE, 7:SOLARIZATION +;;; N/A ; 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:REC, ;;; 11:ANTIQUE, 12:WARM, 13:PINK, 14:YELLOW, 15:PURPLE, 16:EMBOSS, 17:OUTLINE, 18:SOLARIZATION_1, 19:SOLARIZATION_2, 20:SOLARIZATION_3, ;;; 21:SOLARIZATION_4, 22:SKETCH_1, 23:SKETCH_2, 24:SKETCH_3, 25:SKETCH_4 -;ColorTone = 1,-255,3,2,11,6,5,18,-255,-255,3,4,10,-255,-255,-255,-255,16,17,12,13,14,15,-255,-255,-255,-255 || 0 -;ColorTone = 0,-255,1,3,-255,-255,-255,-255,-255,5,-255,2,-255,-255,-255,-255,4,6,7,-255,-255,-255,-255,-255,-255,-255 || 0 +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) @@ -78,10 +80,10 @@ Sharpness = 1,20 || 10 ;Flip = 2,1,0 || 0 ; Wide Dynamic Range - real setting value -;;; 1:OFF, 2:ON, 3:AUTO +;;; N/A ; Wide Dynamic Range - MSL value(convert array index) ;;; 0:OFF, 1:ON, 2:AUTO -;WDR = 1,2,3 || 3 +WDR = 0,-255,-255 || 0 ; Part color mode - real setting value ;;; 0:OFF, 1:SWAP, 2:ACCENT @@ -104,47 +106,51 @@ Sharpness = 1,20 || 10 ;OpticalZoom - Not support ; Focus mode - real setting value -;;; Not Support, no need to convert +;;; N/A ; 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 +FocusMode = -255,0,-255,-255,-255,-255 || 0 ; Auto focus type - real setting value -;;; 0:NORMAL, 1:MACRO, 2:FULL +;;; N/A ; Auto focus - MSL value(convert array index) ;;; 0:NONE, 1:NORMAL, 2:MACRO, 3:FULL -;AFType = -255,0,1,-255 || 0 +AFType = 0,-255,-255,-255 || 0 ; Auto exposure type - real setting value -;;; 1,ALL 2,CENTER 3,SPOT +;;; N/A ; 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 +AEType = -255,0,-255,-255,-255,-255,-255,-255,-255 || 0 -;ExposureValue = 1,9 || 5 +;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(Not Supported), 7:3200(Not Supported) +;;; N/A ; ISO - MSL value(convert array index) ;;; 0:AUTO, 1:50, 2:100, 3:200, 4:400, 5:800, 6:1600, 7:3200 -;ISO = 0,1,2,3,4,5,-255,-255 || 0 +ISO = 0,-255,-255,-255,-255,-255,-255,-255 || 0 ; Program mode - real setting value -;;; 0:NONE, 1:FALL_COLOR, 2:DUSK_N_DAWN, 3:CANDLE_LIGHT, 4:BEACH_SNOW, 5:BACKLIGHT, 6:LANDSCAPE, 7:NIGHT_SCENE, 8:PORTRAIT, 9:SPORTS, 10:INDOOR, -;;; 11:FIREWORK, 12:TEXT, 13:SHOW_WINDOW +;;; N/A ; 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,3,4,5,6,7,8,9,10,11,12,13,14,15 || 1 -;ProgramMode = 0,8,6,9,10,4,-255,2,1,7,11,12,13,3,5 || 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:Capture, 2:Movie +;;; N/A ; Anti-handshake - MSL value(convert array index) ;;; 0:OFF, 1:ON, 2:AUTO, 3:MOVIE_ON -;AntiHandshake = 0,1,-255,2 || 0 +AntiHandshake = 0,-255,-255,-255 || 0 + +; Face zoom mode +;;; 0:OFF, 1:ON +FaceZoomMode = 0 || 0 +; Face zoom level +FaceZoomLevel = 0,0 || 0 [Capture] @@ -155,13 +161,16 @@ OutputMode = 4,7,8,13 || 13 JpegQuality = 0,100 || 50 MultishotNumber = 1,255 || 1 SensorEncodedCapture = 0 +; Support HDR +;;; 0: OFF, 1: ON, 2: ON and Original +SupportHDR = 0,-255,-255 || 0 [Detect] ; Detect mode ;;; No need to convert ;;; 0:OFF, 1:ON -;DetectMode = 0,1 || 0 +DetectMode = 0,-255 || 0 ;DetectNumber - Not support ;DetectFocusSelect - Not support ;DetectSelectNumber - Not support diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini index cbbb981..ced2ae9 100644 --- a/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini +++ b/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini @@ -7,9 +7,10 @@ use sink handler = yes disable segtrap = yes ; same effect with --gst-disable-segtrap -; set default video sink but, it can be replaced with others selected by application -; 0:v4l2sink, 1:ximagesink, 2:xvimagesink, 3:fakesink 4:evasimagesink 5:glimagesink -videosink element = 2 +; set default videosink element according to video surface type(X, EVAS, NULL) +videosink element x = xvimagesink +videosink element evas = evasimagesink +videosink element fake = fakesink video converter element = ffmpegcolorspace @@ -22,7 +23,7 @@ skip rescan = yes delay before repeat = 50 ; msec ; comma separated list of tocken which elemnts has it in it's name will not be used -element exclude keyword = ffdec_, omx +element exclude keyword = ffdec_, omx_ async start = yes @@ -82,9 +83,12 @@ rtsp error concealment = yes use video hw accel = no -[features] +[sound effect] +; preset audio filter setting +audio filter preset = no -audio filter = no +; custom audio filter setting (EQ/extension) +audio filter custom = no [priority] @@ -98,5 +102,3 @@ videosink = 96 audiosink = 97 ringbuffer = 98 - - diff --git a/packaging/mmfw-sysconf.manifest b/packaging/mmfw-sysconf.manifest deleted file mode 100644 index 017d22d..0000000 --- a/packaging/mmfw-sysconf.manifest +++ /dev/null @@ -1,5 +0,0 @@ -<manifest> - <request> - <domain name="_"/> - </request> -</manifest> diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec index 412a778..1d4db8c 100644 --- a/packaging/mmfw-sysconf.spec +++ b/packaging/mmfw-sysconf.spec @@ -1,11 +1,10 @@ Name: mmfw-sysconf Summary: Multimedia Framework system configuration package -Version: 0.1.22 -Release: 3 +Version: 0.1.39 +Release: 0 Group: TO_BE/FILLED_IN License: Apache-2.0 Source0: %{name}-%{version}.tar.gz -Source1001: packaging/mmfw-sysconf.manifest %description Multimedia Framework system configuration package @@ -34,7 +33,6 @@ Multimedia Framework system configuration package for simulator %setup -q %build -cp %{SOURCE1001} . %install rm -rf %{buildroot} @@ -53,23 +51,23 @@ rm -rf %{buildroot} %ifarch %{arm} %files -n mmfw-sysconf-cleansdk-target -%manifest mmfw-sysconf.manifest %defattr(-,root,root,-) /etc/asound.conf /etc/pulse/* /usr/etc/*.ini +/usr/etc/gst-openmax.conf /usr/share/pulseaudio/alsa-mixer/paths/*.conf /usr/share/pulseaudio/alsa-mixer/paths/*.common /usr/share/pulseaudio/alsa-mixer/profile-sets/*.conf %else - %files -n mmfw-sysconf-simulator -%manifest mmfw-sysconf.manifest %defattr(-,root,root,-) /etc/asound.conf /etc/pulse/* /usr/etc/*.ini +/usr/etc/gst-openmax.conf /usr/share/pulseaudio/alsa-mixer/paths/*.conf /usr/share/pulseaudio/alsa-mixer/paths/*.common /usr/share/pulseaudio/alsa-mixer/profile-sets/*.conf %endif + |