From: Jeongmo Yang Date: Fri, 6 Nov 2015 09:32:26 +0000 (+0900) Subject: Release version 0.2.23 X-Git-Tag: submit/tizen/20151109.084637^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d75a1aed6d781384a53e2e3dc19b4d30cdc4a326;p=platform%2Fcore%2Fmultimedia%2Fmmfw-sysconf.git Release version 0.2.23 1. Remove build warnings 2. [all/camera] Update for display setting Change-Id: Ie67c0a0140c15bafcdec4421f24947b5f1eed295 Signed-off-by: Jeongmo Yang --- diff --git a/mmfw-sysconf-simulator/etc/profile.d/mmf.sh b/mmfw-sysconf-simulator/etc/profile.d/mmf.sh index 7566978..4b8663e 100755 --- a/mmfw-sysconf-simulator/etc/profile.d/mmf.sh +++ b/mmfw-sysconf-simulator/etc/profile.d/mmf.sh @@ -1 +1,2 @@ +#!/bin/sh export GST_DEBUG=2 diff --git a/mmfw-sysconf-simulator/etc/pulse/default.pa b/mmfw-sysconf-simulator/etc/pulse/default.pa index e0737e8..c208aad 100755 --- a/mmfw-sysconf-simulator/etc/pulse/default.pa +++ b/mmfw-sysconf-simulator/etc/pulse/default.pa @@ -1,5 +1,3 @@ -#!/usr/bin/pulseaudio -nF -# # This file is part of PulseAudio. # # PulseAudio is free software; you can redistribute it and/or modify it diff --git a/mmfw-sysconf-simulator/etc/pulse/system.pa b/mmfw-sysconf-simulator/etc/pulse/system.pa index 03d7508..d81a5ac 100644 --- a/mmfw-sysconf-simulator/etc/pulse/system.pa +++ b/mmfw-sysconf-simulator/etc/pulse/system.pa @@ -1,5 +1,3 @@ -#!/usr/bin/pulseaudio -nF -# # This file is part of PulseAudio. # # PulseAudio is free software; you can redistribute it and/or modify it diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland index 6b54675..d220192 100644 --- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland +++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland @@ -47,10 +47,11 @@ AudiomodemsrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640 ;;; 0: MAIN LCD, 1: SUB LCD, 2:TV OUT, 3: MAIN LCD and SUB LCD, 4: MAIN LCD and TV OUT DisplayDevice = 0 || 0 ; Videosink -;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface -Videosink = 0,1,3 || 0 +;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 5: Remote +Videosink = 0,1,3,5 || 0 VideosinkElementX = waylandsink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-sample,0 | qos,0 | sync,0 | show-preroll-frame,0 VideosinkElementEvas = evasimagesink | 4,0 | 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 diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x index 51acee5..d0a2e7e 100644 --- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x +++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x @@ -47,10 +47,11 @@ AudiomodemsrcElement = pulsesrc | 2,0 | do-timestamp,1 | blocksize,640 ;;; 0: MAIN LCD, 1: SUB LCD, 2:TV OUT, 3: MAIN LCD and SUB LCD, 4: MAIN LCD and TV OUT DisplayDevice = 0 || 0 ; Videosink -;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface -Videosink = 0,1,3 || 0 +;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 5: Remote +Videosink = 0,1,3,5 || 0 VideosinkElementX = xvimagesink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-sample,0 | qos,0 | sync,0 | show-preroll-frame,0 VideosinkElementEvas = evasimagesink | 4,0 | 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 diff --git a/mmfw-sysconf-target-n4/etc/profile.d/mmf.sh b/mmfw-sysconf-target-n4/etc/profile.d/mmf.sh index 7566978..4b8663e 100755 --- a/mmfw-sysconf-target-n4/etc/profile.d/mmf.sh +++ b/mmfw-sysconf-target-n4/etc/profile.d/mmf.sh @@ -1 +1,2 @@ +#!/bin/sh export GST_DEBUG=2 diff --git a/mmfw-sysconf-target-n4/etc/pulse/default.pa b/mmfw-sysconf-target-n4/etc/pulse/default.pa index cac0b9e..ef8f114 100644 --- a/mmfw-sysconf-target-n4/etc/pulse/default.pa +++ b/mmfw-sysconf-target-n4/etc/pulse/default.pa @@ -1,5 +1,3 @@ -#!/usr/bin/pulseaudio -nF -# # This file is part of PulseAudio. # # PulseAudio is free software; you can redistribute it and/or modify it diff --git a/mmfw-sysconf-target-n4/etc/pulse/system.pa b/mmfw-sysconf-target-n4/etc/pulse/system.pa index 03d7508..d81a5ac 100644 --- a/mmfw-sysconf-target-n4/etc/pulse/system.pa +++ b/mmfw-sysconf-target-n4/etc/pulse/system.pa @@ -1,5 +1,3 @@ -#!/usr/bin/pulseaudio -nF -# # This file is part of PulseAudio. # # PulseAudio is free software; you can redistribute it and/or modify it diff --git a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.wayland b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.wayland index 57bc724..cd32e87 100644 --- a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.wayland +++ b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.wayland @@ -48,10 +48,11 @@ DisplayDevice = 0 || 0 ;;; 0: Default, 1: Pri Video ON and Sec Video Full-Screen, 2: Pri Video OFF and Sec Video Full-Screen DisplayMode = 0,1,2 || 0 ; Videosink -;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface -Videosink = 0,1,3 || 1 +;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 5: Remote +Videosink = 0,1,3,5 || 1 VideosinkElementX = waylandsink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-sample,0 | qos,0 | sync,0 | show-preroll-frame,0 VideosinkElementEvas = evasimagesink | 4,0 | 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 diff --git a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.x b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.x index 6c9c426..fe69874 100644 --- a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.x +++ b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.x @@ -48,10 +48,11 @@ DisplayDevice = 0 || 0 ;;; 0: Default, 1: Pri Video ON and Sec Video Full-Screen, 2: Pri Video OFF and Sec Video Full-Screen DisplayMode = 0,1,2 || 0 ; Videosink -;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface -Videosink = 0,1,3 || 1 +;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 5: Remote +Videosink = 0,1,3,5 || 1 VideosinkElementX = xvimagesink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-sample,0 | qos,0 | sync,0 | show-preroll-frame,0 VideosinkElementEvas = evasimagesink | 4,0 | 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 diff --git a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder_dev_video_pri.ini index 0180568..dbd5fe2 100644 --- a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder_dev_video_pri.ini +++ b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder_dev_video_pri.ini @@ -20,7 +20,7 @@ ; Input index - MSL value(convert array index) ;;; -1:NONE, 0:CAMERA0, 1:CAMERA1 InputIndex = 0,-255 || 0 -DeviceName = TEST_CAMERA +DeviceName = TEST_CAMERA_0 PreviewResolution = 320,240 | 640,480 || 320,240 CaptureResolution = 320,240 | 640,480 || 640,480 VideoResolution = 320,240 | 640,480 || 640,480 diff --git a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder_dev_video_sec.ini index 0180568..b9d590c 100644 --- a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder_dev_video_sec.ini +++ b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder_dev_video_sec.ini @@ -20,7 +20,7 @@ ; Input index - MSL value(convert array index) ;;; -1:NONE, 0:CAMERA0, 1:CAMERA1 InputIndex = 0,-255 || 0 -DeviceName = TEST_CAMERA +DeviceName = TEST_CAMERA_1 PreviewResolution = 320,240 | 640,480 || 320,240 CaptureResolution = 320,240 | 640,480 || 640,480 VideoResolution = 320,240 | 640,480 || 640,480 diff --git a/mmfw-sysconf-target-u3/etc/profile.d/mmf.sh b/mmfw-sysconf-target-u3/etc/profile.d/mmf.sh index 7566978..4b8663e 100755 --- a/mmfw-sysconf-target-u3/etc/profile.d/mmf.sh +++ b/mmfw-sysconf-target-u3/etc/profile.d/mmf.sh @@ -1 +1,2 @@ +#!/bin/sh export GST_DEBUG=2 diff --git a/mmfw-sysconf-target-u3/etc/pulse/default.pa b/mmfw-sysconf-target-u3/etc/pulse/default.pa old mode 100755 new mode 100644 index cac0b9e..ef8f114 --- a/mmfw-sysconf-target-u3/etc/pulse/default.pa +++ b/mmfw-sysconf-target-u3/etc/pulse/default.pa @@ -1,5 +1,3 @@ -#!/usr/bin/pulseaudio -nF -# # This file is part of PulseAudio. # # PulseAudio is free software; you can redistribute it and/or modify it diff --git a/mmfw-sysconf-target-u3/etc/pulse/system.pa b/mmfw-sysconf-target-u3/etc/pulse/system.pa index 03d7508..d81a5ac 100644 --- a/mmfw-sysconf-target-u3/etc/pulse/system.pa +++ b/mmfw-sysconf-target-u3/etc/pulse/system.pa @@ -1,5 +1,3 @@ -#!/usr/bin/pulseaudio -nF -# # This file is part of PulseAudio. # # PulseAudio is free software; you can redistribute it and/or modify it diff --git a/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.wayland b/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.wayland index 50ac63d..3e5d35d 100644 --- a/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.wayland +++ b/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.wayland @@ -48,10 +48,11 @@ DisplayDevice = 0 || 0 ;;; 0: Default, 1: Pri Video ON and Sec Video Full-Screen, 2: Pri Video OFF and Sec Video Full-Screen DisplayMode = 0,1,2 || 0 ; Videosink -;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface -Videosink = 0,1,3 || 1 +;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 5: Remote +Videosink = 0,1,3,5 || 1 VideosinkElementX = waylandsink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-sample,0 | qos,0 | sync,0 | show-preroll-frame,0 VideosinkElementEvas = evasimagesink | 4,0 | 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 diff --git a/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.x b/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.x index 543c7fa..3cda464 100644 --- a/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.x +++ b/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.x @@ -48,10 +48,11 @@ DisplayDevice = 0 || 0 ;;; 0: Default, 1: Pri Video ON and Sec Video Full-Screen, 2: Pri Video OFF and Sec Video Full-Screen DisplayMode = 0,1,2 || 0 ; Videosink -;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface -Videosink = 0,1,3 || 1 +;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 5: Remote +Videosink = 0,1,3,5 || 1 VideosinkElementX = xvimagesink | 6,0 | draw-borders,0 | force-aspect-ratio,1 | enable-last-sample,0 | qos,0 | sync,0 | show-preroll-frame,0 VideosinkElementEvas = evasimagesink | 4,0 | 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 diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec index 699b807..ebb7af8 100644 --- a/packaging/mmfw-sysconf.spec +++ b/packaging/mmfw-sysconf.spec @@ -2,7 +2,7 @@ Name: mmfw-sysconf Summary: Multimedia Framework system configuration package -Version: 0.2.22 +Version: 0.2.23 Release: 0 Group: Multimedia/Configuration License: Apache-2.0