From a0d3f65d648e3d3b10f9e245eb821efc29dd6431 Mon Sep 17 00:00:00 2001 From: Hyunil Date: Mon, 13 Jun 2016 13:07:55 +0900 Subject: [PATCH] remove X dependency file Change-Id: Iafc764d979059b7919b440398d20f03a093c210e Signed-off-by: Hyunil --- ...mcorder.ini.wayland => mmfw_camcorder.ini} | 0 .../etc/multimedia/mmfw_camcorder.ini.x | 110 ------------------ ...mfw_player.ini.wayland => mmfw_player.ini} | 0 .../etc/multimedia/mmfw_player.ini.x | 98 ---------------- ...mcorder.ini.wayland => mmfw_camcorder.ini} | 0 .../etc/multimedia/mmfw_camcorder.ini.x | 105 ----------------- ...mfw_player.ini.wayland => mmfw_player.ini} | 0 .../etc/multimedia/mmfw_player.ini.x | 79 ------------- ...mcorder.ini.wayland => mmfw_camcorder.ini} | 0 .../etc/multimedia/mmfw_camcorder.ini.x | 106 ----------------- ...mfw_player.ini.wayland => mmfw_player.ini} | 0 .../etc/multimedia/mmfw_player.ini.x | 79 ------------- ...mcorder.ini.wayland => mmfw_camcorder.ini} | 0 .../etc/multimedia/mmfw_camcorder.ini.x | 109 ----------------- ...mfw_player.ini.wayland => mmfw_player.ini} | 0 .../etc/multimedia/mmfw_player.ini.x | 79 ------------- ...mcorder.ini.wayland => mmfw_camcorder.ini} | 0 .../etc/multimedia/mmfw_camcorder.ini.x | 106 ----------------- ...mfw_player.ini.wayland => mmfw_player.ini} | 0 .../etc/multimedia/mmfw_player.ini.x | 79 ------------- ...mcorder.ini.wayland => mmfw_camcorder.ini} | 0 .../etc/multimedia/mmfw_camcorder.ini.x | 106 ----------------- ...mfw_player.ini.wayland => mmfw_player.ini} | 0 .../etc/multimedia/mmfw_player.ini.x | 79 ------------- packaging/mmfw-sysconf.spec | 48 ++------ 25 files changed, 7 insertions(+), 1176 deletions(-) rename mmfw-sysconf-simulator/etc/multimedia/{mmfw_camcorder.ini.wayland => mmfw_camcorder.ini} (100%) delete mode 100644 mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini.x rename mmfw-sysconf-simulator/etc/multimedia/{mmfw_player.ini.wayland => mmfw_player.ini} (100%) delete mode 100644 mmfw-sysconf-simulator/etc/multimedia/mmfw_player.ini.x rename mmfw-sysconf-target-hawkp/etc/multimedia/{mmfw_camcorder.ini.wayland => mmfw_camcorder.ini} (100%) delete mode 100644 mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder.ini.x rename mmfw-sysconf-target-hawkp/etc/multimedia/{mmfw_player.ini.wayland => mmfw_player.ini} (100%) delete mode 100644 mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_player.ini.x rename mmfw-sysconf-target-n4/etc/multimedia/{mmfw_camcorder.ini.wayland => mmfw_camcorder.ini} (100%) delete mode 100644 mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder.ini.x rename mmfw-sysconf-target-n4/etc/multimedia/{mmfw_player.ini.wayland => mmfw_player.ini} (100%) delete mode 100644 mmfw-sysconf-target-n4/etc/multimedia/mmfw_player.ini.x rename mmfw-sysconf-target-tm1/etc/multimedia/{mmfw_camcorder.ini.wayland => mmfw_camcorder.ini} (100%) delete mode 100644 mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder.ini.x rename mmfw-sysconf-target-tm1/etc/multimedia/{mmfw_player.ini.wayland => mmfw_player.ini} (100%) delete mode 100644 mmfw-sysconf-target-tm1/etc/multimedia/mmfw_player.ini.x rename mmfw-sysconf-target-tw1/etc/multimedia/{mmfw_camcorder.ini.wayland => mmfw_camcorder.ini} (100%) delete mode 100644 mmfw-sysconf-target-tw1/etc/multimedia/mmfw_camcorder.ini.x rename mmfw-sysconf-target-tw1/etc/multimedia/{mmfw_player.ini.wayland => mmfw_player.ini} (100%) delete mode 100644 mmfw-sysconf-target-tw1/etc/multimedia/mmfw_player.ini.x rename mmfw-sysconf-target-u3/etc/multimedia/{mmfw_camcorder.ini.wayland => mmfw_camcorder.ini} (100%) delete mode 100644 mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder.ini.x rename mmfw-sysconf-target-u3/etc/multimedia/{mmfw_player.ini.wayland => mmfw_player.ini} (100%) delete mode 100644 mmfw-sysconf-target-u3/etc/multimedia/mmfw_player.ini.x diff --git a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini.wayland b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini similarity index 100% rename from mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini.wayland rename to mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini diff --git a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini.x b/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini.x deleted file mode 100644 index 30a0210..0000000 --- a/mmfw-sysconf-simulator/etc/multimedia/mmfw_camcorder.ini.x +++ /dev/null @@ -1,110 +0,0 @@ -; < Camera/Camcorder Configure Main INI file > -; -; - SDK Camera -; -; - 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-debug=3,avsysvideosrc:4 || NOT-USE-DEFAULT_VALUE -ModelName = TIZEN_SDK -;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 = v4l2src | 1,1 | do-timestamp,1 | device,/dev/video0 -UseVideoscale = 0 -VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1 -UseZeroCopyFormat = 0 -DeviceCount = 2 -SupportMediaPacketPreviewCb = 0 - -[AudioInput] -AudioDevice = 0,1 || 0 -AudiosrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640 -AudiomodemsrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640 - -[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 || 0 -; Videosink -;;; 0: Overlay surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 4: Remote -Videosink = 0,3,4 || 3 -VideosinkElementOverlay = xvimagesink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | 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 | 3,0 | qos,0 | sync,0 | enable-last-sample,0 -UseVideoscale = 0 -VideoscaleElement = videoscale | 1,0 | method,1 - -[VideoEncoder] -H263 = avenc_h263p | 1,0 | compliance, -2 -MPEG4 = avenc_mpeg4 | 1,0 | compliance, -2 - -[AudioEncoder] -AMR = amrnbenc | 0,0 -AAC = avenc_aac | 1,0 | compliance, -2 -WAVE = wavenc | 0,0 -VORBIS = vorbisenc | 0,0 - -[ImageEncoder] -JPEG = jpegenc | 0,0 -PNG = pngenc | 0,0 - -[Capture] -UseEncodebin = 1 -UseCaptureMode = 0 -VideoscaleElement = videoscale | 1,0 | method,1 -PlayCaptureSound = 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 = 0 -RecordsinkElement = filesink | 1,0 | async,0 -UseNoiseSuppressor = 0 -DropVideoFrame = 0 -PassFirstVideoFrame = 0 - -[Mux] -3GP = avmux_3gp | 0,0 -AMR = avmux_amr | 0,0 -MP4 = avmux_mp4 | 0,0 -OGG = oggmux | 0,0 -WAV = wavenc | 0,0 -AAC = avmux_adts | 0,0 -M2TS = mpegtsmux | 0,0 - diff --git a/mmfw-sysconf-simulator/etc/multimedia/mmfw_player.ini.wayland b/mmfw-sysconf-simulator/etc/multimedia/mmfw_player.ini similarity index 100% rename from mmfw-sysconf-simulator/etc/multimedia/mmfw_player.ini.wayland rename to mmfw-sysconf-simulator/etc/multimedia/mmfw_player.ini diff --git a/mmfw-sysconf-simulator/etc/multimedia/mmfw_player.ini.x b/mmfw-sysconf-simulator/etc/multimedia/mmfw_player.ini.x deleted file mode 100644 index 2f03f05..0000000 --- a/mmfw-sysconf-simulator/etc/multimedia/mmfw_player.ini.x +++ /dev/null @@ -1,98 +0,0 @@ -[general] - -; if disabled typefind element will used directely -use decodebin = no ; async state change problem exist - -use sink handler = yes - -disable segtrap = yes ; same effect with --gst-disable-segtrap - -; set default videosink element according to video surface type(X, EVAS, NULL) -videosink element overlay = xvimagesink -videosink element evas = evasimagesink -videosink element fake = fakesink - -video converter element = ffmpegcolorspace - -audiosink element = avsysaudiosink - -drmsrc element = filesrc - -; if yes. gstreamer will not update registry -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_, v4l2 - -async start = yes - -multiple codec supported = yes - -; parameters for initializing gstreamer -gstparam1 = -gstparam2 = -gstparam3 = -gstparam4 = -gstparam5 = - -; generating dot file representing pipeline state -generate dot = no - -; parameter for clock provide in audiosink -provide clock = yes - -; allowed timeout for changing pipeline state -live state change timeout = 30 ; sec -localplayback state change timeout = 10 ; sec - -; delay in msec for sending EOS -eos delay = 150 ; msec - -; extracted pcm buffer size -pcm buffer size = 51200 ; 50Kbytes - -[http streaming] - -httpsrc element = souphttpsrc - -; if set, use file or not use memory for buffering -http file buffer path = /home/owner/content - -http buffering limit = 99.0 ; percent - -http max size bytes = 1048576 ; bytes - -http buffering time = 1.2 - -http timeout = 30 ; sec - - -[rtsp streaming] - -rtspsrc element = rtspsrc - -rtsp buffering time = 5000; msec - -rtsp rebuffering time = 15000; msec - -rtsp do typefinding = no; if no, caps on rtspsrc:src pad will be used for autoplugging - -rtsp error concealment = yes - - -[hw accelation] -use video hw accel = no - - -[priority] - -use priority setting = no - -demux = 95 - -videosink = 96 - -audiosink = 97 - -ringbuffer = 98 diff --git a/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder.ini.wayland b/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder.ini similarity index 100% rename from mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder.ini.wayland rename to mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder.ini diff --git a/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder.ini.x b/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder.ini.x deleted file mode 100644 index ef16ba7..0000000 --- a/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_camcorder.ini.x +++ /dev/null @@ -1,105 +0,0 @@ -; < 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 -ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini -VideosrcElement = tvcamerasrc | 1,1 | do-timestamp,1 | device,/dev/video241 -UseVideoscale = 1 -VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1 -UseZeroCopyFormat = 0 -DeviceCount = 1 - -[AudioInput] -AudioDevice = 0 || 0 -AudiosrcElement = pulsesrc | 1,0 | do-timestamp,1 - -[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: Overlay surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 4: Remote -Videosink = 0,3,4 || 3 -VideosinkElementOverlay = xvimagesink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | 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 - -[VideoEncoder] -MPEG4 = avenc_mpeg4 | 0,0 - -[AudioEncoder] -AMR = amrnbenc | 0,0 -AAC = avenc_aac | 1,0 | compliance,-2 -WAVE = wavenc | 0,0 -MP3 = lame | 0,0 - -[ImageEncoder] -JPEG = jpegenc | 0,0 -;PNG = pngenc | 0,0 - -[Capture] -UseEncodebin = 0 -UseCaptureMode = 0 -VideoscaleElement = videoscale | 1,0 | method,1 - -[Record] -UseAudioEncoderQueue = 1 -UseVideoEncoderQueue = 0 -VideoProfile = 0 -VideoAutoAudioConvert = 1 -VideoAutoAudioResample = 0 -VideoAutoColorSpace = 0 -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 = avmux_3gp | 0,0 -AMR = avmux_amr | 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-hawkp/etc/multimedia/mmfw_player.ini.wayland b/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_player.ini similarity index 100% rename from mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_player.ini.wayland rename to mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_player.ini diff --git a/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_player.ini.x b/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_player.ini.x deleted file mode 100644 index 2e6c3c6..0000000 --- a/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_player.ini.x +++ /dev/null @@ -1,79 +0,0 @@ -[general] - -disable segtrap = yes ; same effect with --gst-disable-segtrap - -; set default videosink element according to video surface type(X, EVAS, NULL) -videosink element overlay = xvimagesink -videosink element evas = evasimagesink -videosink element fake = fakesink - -video converter element = - -audiosink element = pulsesink - - -drmsrc element = filesrc - -; if yes. gstreamer will not update registry -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 = v4l2 - -; ignore resume play just for debugging -ignore first skip request = no - -;audio/video decode type(0:DEFAULT, 1:HW, 2:SW, 3:DISABLE) -video decoder type = 0 -audio decoder type = 0 - -async start = yes - -multiple codec supported = yes - -; parameters for initializing gstreamer -; DEFAULT SET (--gst-debug=*:2) -gstparam1 = --gst-debug=*:2 -gstparam2 = -gstparam3 = -gstparam4 = -gstparam5 = - -; generating dot file representing pipeline state -; DEFAULT MUST BE 'no'. If 'yes', mmplayer will set env-variable for it's session as "export GST_DEBUG_DUMP_DOT_DIR=/tmp/" -generate dot = no - -; parameter is for only video to be determined -; which clock will be used -; if yes, system clock will be used -; apart from this, audiosink is clock provider for audio -use system clock = yes - -; allowed timeout for changing pipeline state -live state change timeout = 30 ; sec -localplayback state change timeout = 10 ; sec - -; delay in msec for sending EOS -eos delay = 0 ; msec - -; for asm function enable = yes, disable = no -enable asm = yes - -; extracted pcm buffer size -pcm buffer size = 51200 ; 50Kbytes - -[http streaming] - -httpsrc element = souphttpsrc - -; if set, use file or not use memory for buffering -http file buffer path = /home/owner/content - -http buffering limit = 99.0 ; percent - -http max size bytes = 1048576 ; bytes - -http buffering time = 1.2 - -http timeout = 30 ; sec diff --git a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder.ini.wayland b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder.ini similarity index 100% rename from mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder.ini.wayland rename to mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder.ini diff --git a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder.ini.x b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder.ini.x deleted file mode 100644 index 497bd5b..0000000 --- a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_camcorder.ini.x +++ /dev/null @@ -1,106 +0,0 @@ -; < 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 -ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini -VideosrcElement = videotestsrc | 2,0 | do-timestamp,1 | is-live,1 -UseVideoscale = 1 -VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1 -UseZeroCopyFormat = 0 -DeviceCount = 2 - -[AudioInput] -AudioDevice = 0,1 || 0 -AudiosrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640 -AudiomodemsrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640 - -[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: Overlay surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 4: Remote -Videosink = 0,3,4 || 3 -VideosinkElementOverlay = xvimagesink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | 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 - -[VideoEncoder] -MPEG4 = avenc_mpeg4 | 0,0 - -[AudioEncoder] -AMR = amrnbenc | 0,0 -AAC = avenc_aac | 1,0 | compliance,-2 -WAVE = wavenc | 0,0 - -[ImageEncoder] -JPEG = jpegenc | 0,0 -;PNG = pngenc | 0,0 - -[Capture] -UseEncodebin = 1 -UseCaptureMode = 0 -VideoscaleElement = videoscale | 1,0 | method,1 - -[Record] -UseAudioEncoderQueue = 1 -UseVideoEncoderQueue = 0 -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 = avmux_3gp | 0,0 -AMR = avmux_amr | 0,0 -MP4 = mp4mux | 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-n4/etc/multimedia/mmfw_player.ini.wayland b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_player.ini similarity index 100% rename from mmfw-sysconf-target-n4/etc/multimedia/mmfw_player.ini.wayland rename to mmfw-sysconf-target-n4/etc/multimedia/mmfw_player.ini diff --git a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_player.ini.x b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_player.ini.x deleted file mode 100644 index 2e6c3c6..0000000 --- a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_player.ini.x +++ /dev/null @@ -1,79 +0,0 @@ -[general] - -disable segtrap = yes ; same effect with --gst-disable-segtrap - -; set default videosink element according to video surface type(X, EVAS, NULL) -videosink element overlay = xvimagesink -videosink element evas = evasimagesink -videosink element fake = fakesink - -video converter element = - -audiosink element = pulsesink - - -drmsrc element = filesrc - -; if yes. gstreamer will not update registry -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 = v4l2 - -; ignore resume play just for debugging -ignore first skip request = no - -;audio/video decode type(0:DEFAULT, 1:HW, 2:SW, 3:DISABLE) -video decoder type = 0 -audio decoder type = 0 - -async start = yes - -multiple codec supported = yes - -; parameters for initializing gstreamer -; DEFAULT SET (--gst-debug=*:2) -gstparam1 = --gst-debug=*:2 -gstparam2 = -gstparam3 = -gstparam4 = -gstparam5 = - -; generating dot file representing pipeline state -; DEFAULT MUST BE 'no'. If 'yes', mmplayer will set env-variable for it's session as "export GST_DEBUG_DUMP_DOT_DIR=/tmp/" -generate dot = no - -; parameter is for only video to be determined -; which clock will be used -; if yes, system clock will be used -; apart from this, audiosink is clock provider for audio -use system clock = yes - -; allowed timeout for changing pipeline state -live state change timeout = 30 ; sec -localplayback state change timeout = 10 ; sec - -; delay in msec for sending EOS -eos delay = 0 ; msec - -; for asm function enable = yes, disable = no -enable asm = yes - -; extracted pcm buffer size -pcm buffer size = 51200 ; 50Kbytes - -[http streaming] - -httpsrc element = souphttpsrc - -; if set, use file or not use memory for buffering -http file buffer path = /home/owner/content - -http buffering limit = 99.0 ; percent - -http max size bytes = 1048576 ; bytes - -http buffering time = 1.2 - -http timeout = 30 ; sec diff --git a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder.ini.wayland b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder.ini similarity index 100% rename from mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder.ini.wayland rename to mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder.ini diff --git a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder.ini.x b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder.ini.x deleted file mode 100644 index 29ade38..0000000 --- a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_camcorder.ini.x +++ /dev/null @@ -1,109 +0,0 @@ -; < 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 = 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 = camerasrc | 2,0 | do-timestamp,1 | num-alloc-buf,7 -UseVideoscale = 0 -VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1 -UseZeroCopyFormat = 1 -DeviceCount = 2 -SupportMediaPacketPreviewCb = 1 - -[AudioInput] -AudioDevice = 0,1 || 0 -AudiosrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640 -AudiomodemsrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640 - -[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: Overlay surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 4: Remote -Videosink = 0,3,4 || 3 -VideosinkElementOverlay = xvimagesink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-sample,0 | qos,0 | sync,0 | show-preroll-frame,0 -VideosinkElementRemote = tizenipcsink | 4,0 | permissions,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 = 0 -VideoscaleElement = videoscale | 1,0 | rotang,90 - -[VideoEncoder] -H263 = sprdenc_h263 | 0,0 -H264 = sprdenc_h264 | 0,0 -MPEG4 = sprdenc_mpeg4 | 0,0 - -[AudioEncoder] -AMR = amrnbenc | 0,0 -AAC = avenc_aac | 1,0 | compliance,-2 -WAVE = wavenc | 0,0 - -[ImageEncoder] -JPEG = jpegenc | 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 = 0 -AudioProfile = 1 -AudioAutoAudioConvert = 1 -AudioAutoAudioResample = 0 -AudioAutoColorSpace = 0 -ImageProfile = 2 -ImageAutoAudioConvert = 0 -ImageAutoAudioResample = 0 -ImageAutoColorSpace = 1 -RecordsinkElement = filesink | 1,0 | async,0 -SupportDualStream = 0 -UseNoiseSuppressor = 0 -DropVideoFrame = 0 -PassFirstVideoFrame = 0 - -[Mux] -3GP = avmux_3gp | 0,0 -AMR = avmux_amr | 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/etc/multimedia/mmfw_player.ini.wayland b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_player.ini similarity index 100% rename from mmfw-sysconf-target-tm1/etc/multimedia/mmfw_player.ini.wayland rename to mmfw-sysconf-target-tm1/etc/multimedia/mmfw_player.ini diff --git a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_player.ini.x b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_player.ini.x deleted file mode 100644 index 2e6c3c6..0000000 --- a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_player.ini.x +++ /dev/null @@ -1,79 +0,0 @@ -[general] - -disable segtrap = yes ; same effect with --gst-disable-segtrap - -; set default videosink element according to video surface type(X, EVAS, NULL) -videosink element overlay = xvimagesink -videosink element evas = evasimagesink -videosink element fake = fakesink - -video converter element = - -audiosink element = pulsesink - - -drmsrc element = filesrc - -; if yes. gstreamer will not update registry -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 = v4l2 - -; ignore resume play just for debugging -ignore first skip request = no - -;audio/video decode type(0:DEFAULT, 1:HW, 2:SW, 3:DISABLE) -video decoder type = 0 -audio decoder type = 0 - -async start = yes - -multiple codec supported = yes - -; parameters for initializing gstreamer -; DEFAULT SET (--gst-debug=*:2) -gstparam1 = --gst-debug=*:2 -gstparam2 = -gstparam3 = -gstparam4 = -gstparam5 = - -; generating dot file representing pipeline state -; DEFAULT MUST BE 'no'. If 'yes', mmplayer will set env-variable for it's session as "export GST_DEBUG_DUMP_DOT_DIR=/tmp/" -generate dot = no - -; parameter is for only video to be determined -; which clock will be used -; if yes, system clock will be used -; apart from this, audiosink is clock provider for audio -use system clock = yes - -; allowed timeout for changing pipeline state -live state change timeout = 30 ; sec -localplayback state change timeout = 10 ; sec - -; delay in msec for sending EOS -eos delay = 0 ; msec - -; for asm function enable = yes, disable = no -enable asm = yes - -; extracted pcm buffer size -pcm buffer size = 51200 ; 50Kbytes - -[http streaming] - -httpsrc element = souphttpsrc - -; if set, use file or not use memory for buffering -http file buffer path = /home/owner/content - -http buffering limit = 99.0 ; percent - -http max size bytes = 1048576 ; bytes - -http buffering time = 1.2 - -http timeout = 30 ; sec diff --git a/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_camcorder.ini.wayland b/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_camcorder.ini similarity index 100% rename from mmfw-sysconf-target-tw1/etc/multimedia/mmfw_camcorder.ini.wayland rename to mmfw-sysconf-target-tw1/etc/multimedia/mmfw_camcorder.ini diff --git a/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_camcorder.ini.x b/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_camcorder.ini.x deleted file mode 100644 index 1106a86..0000000 --- a/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_camcorder.ini.x +++ /dev/null @@ -1,106 +0,0 @@ -; < 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 = TW1 -;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 = v4l2src | 1,0 | do-timestamp,1 -UseVideoscale = 1 -VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1 -UseZeroCopyFormat = 0 -DeviceCount = 0 - -[AudioInput] -AudioDevice = 0,1 || 0 -AudiosrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640 -AudiomodemsrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640 - -[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: Overlay surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 4: Remote -Videosink = 0,3,4 || 3 -VideosinkElementOverlay = xvimagesink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-sample,0 | qos,0 | sync,0 | show-preroll-frame,0 -VideosinkElementRemote = tizenipcsink | 4,0 | permissions,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 = 0 -VideoscaleElement = videoscale | 1,0 | rotang,90 - -[VideoEncoder] -MPEG4 = avenc_mpeg4 | 0,0 - -[AudioEncoder] -AMR = amrnbenc | 0,0 -AAC = avenc_aac | 1,0 | compliance,-2 -WAVE = wavenc | 0,0 - -[ImageEncoder] -JPEG = jpegenc | 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 = 0 -AudioProfile = 1 -AudioAutoAudioConvert = 1 -AudioAutoAudioResample = 0 -AudioAutoColorSpace = 0 -ImageProfile = 2 -ImageAutoAudioConvert = 0 -ImageAutoAudioResample = 0 -ImageAutoColorSpace = 1 -RecordsinkElement = filesink | 1,0 | async,0 -SupportDualStream = 0 -UseNoiseSuppressor = 0 -DropVideoFrame = 0 -PassFirstVideoFrame = 0 - -[Mux] -3GP = avmux_3gp | 0,0 -AMR = avmux_amr | 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-tw1/etc/multimedia/mmfw_player.ini.wayland b/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_player.ini similarity index 100% rename from mmfw-sysconf-target-tw1/etc/multimedia/mmfw_player.ini.wayland rename to mmfw-sysconf-target-tw1/etc/multimedia/mmfw_player.ini diff --git a/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_player.ini.x b/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_player.ini.x deleted file mode 100644 index 2e6c3c6..0000000 --- a/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_player.ini.x +++ /dev/null @@ -1,79 +0,0 @@ -[general] - -disable segtrap = yes ; same effect with --gst-disable-segtrap - -; set default videosink element according to video surface type(X, EVAS, NULL) -videosink element overlay = xvimagesink -videosink element evas = evasimagesink -videosink element fake = fakesink - -video converter element = - -audiosink element = pulsesink - - -drmsrc element = filesrc - -; if yes. gstreamer will not update registry -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 = v4l2 - -; ignore resume play just for debugging -ignore first skip request = no - -;audio/video decode type(0:DEFAULT, 1:HW, 2:SW, 3:DISABLE) -video decoder type = 0 -audio decoder type = 0 - -async start = yes - -multiple codec supported = yes - -; parameters for initializing gstreamer -; DEFAULT SET (--gst-debug=*:2) -gstparam1 = --gst-debug=*:2 -gstparam2 = -gstparam3 = -gstparam4 = -gstparam5 = - -; generating dot file representing pipeline state -; DEFAULT MUST BE 'no'. If 'yes', mmplayer will set env-variable for it's session as "export GST_DEBUG_DUMP_DOT_DIR=/tmp/" -generate dot = no - -; parameter is for only video to be determined -; which clock will be used -; if yes, system clock will be used -; apart from this, audiosink is clock provider for audio -use system clock = yes - -; allowed timeout for changing pipeline state -live state change timeout = 30 ; sec -localplayback state change timeout = 10 ; sec - -; delay in msec for sending EOS -eos delay = 0 ; msec - -; for asm function enable = yes, disable = no -enable asm = yes - -; extracted pcm buffer size -pcm buffer size = 51200 ; 50Kbytes - -[http streaming] - -httpsrc element = souphttpsrc - -; if set, use file or not use memory for buffering -http file buffer path = /home/owner/content - -http buffering limit = 99.0 ; percent - -http max size bytes = 1048576 ; bytes - -http buffering time = 1.2 - -http timeout = 30 ; sec diff --git a/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder.ini.wayland b/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder.ini similarity index 100% rename from mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder.ini.wayland rename to mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder.ini diff --git a/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder.ini.x b/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder.ini.x deleted file mode 100644 index 19bf536..0000000 --- a/mmfw-sysconf-target-u3/etc/multimedia/mmfw_camcorder.ini.x +++ /dev/null @@ -1,106 +0,0 @@ -; < 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 -ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini -VideosrcElement = v4l2src | 1,0 | do-timestamp,1 -UseVideoscale = 1 -VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1 -UseZeroCopyFormat = 0 -DeviceCount = 1 - -[AudioInput] -AudioDevice = 0,1 || 0 -AudiosrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640 -AudiomodemsrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640 - -[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: Overlay surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 4: Remote -Videosink = 0,3,4 || 3 -VideosinkElementOverlay = xvimagesink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | 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 - -[VideoEncoder] -MPEG4 = avenc_mpeg4 | 0,0 - -[AudioEncoder] -AMR = amrnbenc | 0,0 -AAC = avenc_aac | 1,0 | compliance,-2 -WAVE = wavenc | 0,0 - -[ImageEncoder] -JPEG = jpegenc | 0,0 -;PNG = pngenc | 0,0 - -[Capture] -UseEncodebin = 1 -UseCaptureMode = 0 -VideoscaleElement = videoscale | 1,0 | method,1 - -[Record] -UseAudioEncoderQueue = 1 -UseVideoEncoderQueue = 0 -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 = avmux_3gp | 0,0 -AMR = avmux_amr | 0,0 -MP4 = mp4mux | 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-u3/etc/multimedia/mmfw_player.ini.wayland b/mmfw-sysconf-target-u3/etc/multimedia/mmfw_player.ini similarity index 100% rename from mmfw-sysconf-target-u3/etc/multimedia/mmfw_player.ini.wayland rename to mmfw-sysconf-target-u3/etc/multimedia/mmfw_player.ini diff --git a/mmfw-sysconf-target-u3/etc/multimedia/mmfw_player.ini.x b/mmfw-sysconf-target-u3/etc/multimedia/mmfw_player.ini.x deleted file mode 100644 index 2e6c3c6..0000000 --- a/mmfw-sysconf-target-u3/etc/multimedia/mmfw_player.ini.x +++ /dev/null @@ -1,79 +0,0 @@ -[general] - -disable segtrap = yes ; same effect with --gst-disable-segtrap - -; set default videosink element according to video surface type(X, EVAS, NULL) -videosink element overlay = xvimagesink -videosink element evas = evasimagesink -videosink element fake = fakesink - -video converter element = - -audiosink element = pulsesink - - -drmsrc element = filesrc - -; if yes. gstreamer will not update registry -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 = v4l2 - -; ignore resume play just for debugging -ignore first skip request = no - -;audio/video decode type(0:DEFAULT, 1:HW, 2:SW, 3:DISABLE) -video decoder type = 0 -audio decoder type = 0 - -async start = yes - -multiple codec supported = yes - -; parameters for initializing gstreamer -; DEFAULT SET (--gst-debug=*:2) -gstparam1 = --gst-debug=*:2 -gstparam2 = -gstparam3 = -gstparam4 = -gstparam5 = - -; generating dot file representing pipeline state -; DEFAULT MUST BE 'no'. If 'yes', mmplayer will set env-variable for it's session as "export GST_DEBUG_DUMP_DOT_DIR=/tmp/" -generate dot = no - -; parameter is for only video to be determined -; which clock will be used -; if yes, system clock will be used -; apart from this, audiosink is clock provider for audio -use system clock = yes - -; allowed timeout for changing pipeline state -live state change timeout = 30 ; sec -localplayback state change timeout = 10 ; sec - -; delay in msec for sending EOS -eos delay = 0 ; msec - -; for asm function enable = yes, disable = no -enable asm = yes - -; extracted pcm buffer size -pcm buffer size = 51200 ; 50Kbytes - -[http streaming] - -httpsrc element = souphttpsrc - -; if set, use file or not use memory for buffering -http file buffer path = /home/owner/content - -http buffering limit = 99.0 ; percent - -http max size bytes = 1048576 ; bytes - -http buffering time = 1.2 - -http timeout = 30 ; sec diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec index 7cbbfc9..a93934f 100644 --- a/packaging/mmfw-sysconf.spec +++ b/packaging/mmfw-sysconf.spec @@ -1,8 +1,6 @@ -%bcond_with wayland - Name: mmfw-sysconf Summary: Multimedia Framework system configuration package -Version: 0.2.68 +Version: 0.2.69 Release: 0 Group: Multimedia/Configuration License: LGPL-2.1+ and Apache-2.0 @@ -92,57 +90,35 @@ mkdir -p %{buildroot}%{_datadir} mkdir -p %{buildroot}%{_datadir}/%{name}-target-u3 cp -arf %{name}-target-u3/* %{buildroot}%{_datadir}/%{name}-target-u3 -%if %{with wayland} -mv %{buildroot}%{_datadir}/%{name}-target-u3%{_sysconfdir}/multimedia/mmfw_player.ini.wayland %{buildroot}%{_datadir}/%{name}-target-u3%{_sysconfdir}/multimedia/mmfw_player.ini -mv %{buildroot}%{_datadir}/%{name}-target-u3%{_sysconfdir}/multimedia/mmfw_camcorder.ini.wayland %{buildroot}%{_datadir}/%{name}-target-u3%{_sysconfdir}/multimedia/mmfw_camcorder.ini -rm %{buildroot}%{_datadir}/%{name}-target-u3%{_sysconfdir}/multimedia/mmfw_player.ini.x -rm %{buildroot}%{_datadir}/%{name}-target-u3%{_sysconfdir}/multimedia/mmfw_camcorder.ini.x -%else -mv %{buildroot}%{_datadir}/%{name}-target-u3%{_sysconfdir}/multimedia/mmfw_player.ini.x %{buildroot}%{_datadir}/%{name}-target-u3%{_sysconfdir}/multimedia/mmfw_player.ini -mv %{buildroot}%{_datadir}/%{name}-target-u3%{_sysconfdir}/multimedia/mmfw_camcorder.ini.x %{buildroot}%{_datadir}/%{name}-target-u3%{_sysconfdir}/multimedia/mmfw_camcorder.ini -rm %{buildroot}%{_datadir}/%{name}-target-u3%{_sysconfdir}/multimedia/mmfw_player.ini.wayland -rm %{buildroot}%{_datadir}/%{name}-target-u3%{_sysconfdir}/multimedia/mmfw_camcorder.ini.wayland -%endif + mkdir -p %{buildroot}%{_datadir}/%{name}-target-u3%{_datadir}/license cp LICENSE.APLv2.0 %{buildroot}%{_datadir}/%{name}-target-u3%{_datadir}/license/%{name}-target-u3 cat LICENSE.LGPLv2.1 >> %{buildroot}%{_datadir}/%{name}-target-u3%{_datadir}/license/%{name}-target-u3 mkdir -p %{buildroot}%{_datadir}/%{name}-target-n4 cp -arf %{name}-target-n4/* %{buildroot}%{_datadir}/%{name}-target-n4 -mv %{buildroot}%{_datadir}/%{name}-target-n4%{_sysconfdir}/multimedia/mmfw_player.ini.wayland %{buildroot}%{_datadir}/%{name}-target-n4%{_sysconfdir}/multimedia/mmfw_player.ini -mv %{buildroot}%{_datadir}/%{name}-target-n4%{_sysconfdir}/multimedia/mmfw_camcorder.ini.wayland %{buildroot}%{_datadir}/%{name}-target-n4%{_sysconfdir}/multimedia/mmfw_camcorder.ini -rm %{buildroot}%{_datadir}/%{name}-target-n4%{_sysconfdir}/multimedia/mmfw_player.ini.x -rm %{buildroot}%{_datadir}/%{name}-target-n4%{_sysconfdir}/multimedia/mmfw_camcorder.ini.x + mkdir -p %{buildroot}%{_datadir}/%{name}-target-n4%{_datadir}/license cp LICENSE.APLv2.0 %{buildroot}%{_datadir}/%{name}-target-n4%{_datadir}/license/%{name}-target-n4 cat LICENSE.LGPLv2.1 >> %{buildroot}%{_datadir}/%{name}-target-n4%{_datadir}/license/%{name}-target-n4 mkdir -p %{buildroot}%{_datadir}/%{name}-target-hawkp cp -arf %{name}-target-hawkp/* %{buildroot}%{_datadir}/%{name}-target-hawkp -mv %{buildroot}%{_datadir}/%{name}-target-hawkp%{_sysconfdir}/multimedia/mmfw_player.ini.wayland %{buildroot}%{_datadir}/%{name}-target-hawkp%{_sysconfdir}/multimedia/mmfw_player.ini -mv %{buildroot}%{_datadir}/%{name}-target-hawkp%{_sysconfdir}/multimedia/mmfw_camcorder.ini.wayland %{buildroot}%{_datadir}/%{name}-target-hawkp%{_sysconfdir}/multimedia/mmfw_camcorder.ini -rm %{buildroot}%{_datadir}/%{name}-target-hawkp%{_sysconfdir}/multimedia/mmfw_player.ini.x -rm %{buildroot}%{_datadir}/%{name}-target-hawkp%{_sysconfdir}/multimedia/mmfw_camcorder.ini.x + mkdir -p %{buildroot}%{_datadir}/%{name}-target-hawkp%{_datadir}/license cp LICENSE.APLv2.0 %{buildroot}%{_datadir}/%{name}-target-hawkp%{_datadir}/license/%{name}-target-hawkp cat LICENSE.LGPLv2.1 >> %{buildroot}%{_datadir}/%{name}-target-hawkp%{_datadir}/license/%{name}-target-hawkp mkdir -p %{buildroot}%{_datadir}/%{name}-target-tm1 cp -arf %{name}-target-tm1/* %{buildroot}%{_datadir}/%{name}-target-tm1 -mv %{buildroot}%{_datadir}/%{name}-target-tm1%{_sysconfdir}/multimedia/mmfw_player.ini.wayland %{buildroot}%{_datadir}/%{name}-target-tm1%{_sysconfdir}/multimedia/mmfw_player.ini -mv %{buildroot}%{_datadir}/%{name}-target-tm1%{_sysconfdir}/multimedia/mmfw_camcorder.ini.wayland %{buildroot}%{_datadir}/%{name}-target-tm1%{_sysconfdir}/multimedia/mmfw_camcorder.ini -rm %{buildroot}%{_datadir}/%{name}-target-tm1%{_sysconfdir}/multimedia/mmfw_player.ini.x -rm %{buildroot}%{_datadir}/%{name}-target-tm1%{_sysconfdir}/multimedia/mmfw_camcorder.ini.x + mkdir -p %{buildroot}%{_datadir}/%{name}-target-tm1%{_datadir}/license cp LICENSE.APLv2.0 %{buildroot}%{_datadir}/%{name}-target-tm1%{_datadir}/license/%{name}-target-tm1 cat LICENSE.LGPLv2.1 >> %{buildroot}%{_datadir}/%{name}-target-tm1%{_datadir}/license/%{name}-target-tm1 mkdir -p %{buildroot}%{_datadir}/%{name}-target-tw1 cp -arf %{name}-target-tw1/* %{buildroot}%{_datadir}/%{name}-target-tw1 -mv %{buildroot}%{_datadir}/%{name}-target-tw1%{_sysconfdir}/multimedia/mmfw_player.ini.wayland %{buildroot}%{_datadir}/%{name}-target-tw1%{_sysconfdir}/multimedia/mmfw_player.ini -mv %{buildroot}%{_datadir}/%{name}-target-tw1%{_sysconfdir}/multimedia/mmfw_camcorder.ini.wayland %{buildroot}%{_datadir}/%{name}-target-tw1%{_sysconfdir}/multimedia/mmfw_camcorder.ini -rm %{buildroot}%{_datadir}/%{name}-target-tw1%{_sysconfdir}/multimedia/mmfw_player.ini.x -rm %{buildroot}%{_datadir}/%{name}-target-tw1%{_sysconfdir}/multimedia/mmfw_camcorder.ini.x + mkdir -p %{buildroot}%{_datadir}/%{name}-target-tw1%{_datadir}/license cp LICENSE.APLv2.0 %{buildroot}%{_datadir}/%{name}-target-tw1%{_datadir}/license/%{name}-target-tw1 cat LICENSE.LGPLv2.1 >> %{buildroot}%{_datadir}/%{name}-target-tw1%{_datadir}/license/%{name}-target-tw1 @@ -157,17 +133,7 @@ cat LICENSE.LGPLv2.1 >> %{buildroot}%{_datadir}/%{name}-target-artik10%{_datadir mkdir -p %{buildroot}%{_datadir}/%{name}-simulator cp -arf %{name}-simulator/* %{buildroot}%{_datadir}/%{name}-simulator -%if %{with wayland} -mv %{buildroot}%{_datadir}/%{name}-simulator%{_sysconfdir}/multimedia/mmfw_player.ini.wayland %{buildroot}%{_datadir}/%{name}-simulator%{_sysconfdir}/multimedia/mmfw_player.ini -mv %{buildroot}%{_datadir}/%{name}-simulator%{_sysconfdir}/multimedia/mmfw_camcorder.ini.wayland %{buildroot}%{_datadir}/%{name}-simulator%{_sysconfdir}/multimedia/mmfw_camcorder.ini -rm %{buildroot}%{_datadir}/%{name}-simulator%{_sysconfdir}/multimedia/mmfw_player.ini.x -rm %{buildroot}%{_datadir}/%{name}-simulator%{_sysconfdir}/multimedia/mmfw_camcorder.ini.x -%else -mv %{buildroot}%{_datadir}/%{name}-simulator%{_sysconfdir}/multimedia/mmfw_player.ini.x %{buildroot}%{_datadir}/%{name}-simulator%{_sysconfdir}/multimedia/mmfw_player.ini -mv %{buildroot}%{_datadir}/%{name}-simulator%{_sysconfdir}/multimedia/mmfw_camcorder.ini.x %{buildroot}%{_datadir}/%{name}-simulator%{_sysconfdir}/multimedia/mmfw_camcorder.ini -rm %{buildroot}%{_datadir}/%{name}-simulator%{_sysconfdir}/multimedia/mmfw_player.ini.wayland -rm %{buildroot}%{_datadir}/%{name}-simulator%{_sysconfdir}/multimedia/mmfw_camcorder.ini.wayland -%endif + mkdir -p %{buildroot}%{_datadir}/%{name}-simulator%{_datadir}/license cp LICENSE.APLv2.0 %{buildroot}%{_datadir}/%{name}-simulator%{_datadir}/license/%{name}-simulator cat LICENSE.LGPLv2.1 >> %{buildroot}%{_datadir}/%{name}-simulator%{_datadir}/license/%{name}-simulator -- 2.34.1