projects / platform / core / multimedia / mmfw-sysconf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6a750f4)
Release version 0.2.23 98/51298/1 accepted/tizen/mobile/20151109.233938 accepted/tizen/tv/20151109.233948 accepted/tizen/wearable/20151109.234000 submit/tizen/20151109.084637 submit/tizen/20151109.102233
authorJeongmo Yang <jm80.yang@samsung.com>
Fri, 6 Nov 2015 09:32:26 +0000 (18:32 +0900)
committerJeongmo Yang <jm80.yang@samsung.com>
Fri, 6 Nov 2015 09:32:26 +0000 (18:32 +0900)
1. Remove build warnings
2. [all/camera] Update for display setting

Change-Id: Ie67c0a0140c15bafcdec4421f24947b5f1eed295
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
18 files changed:
mmfw-sysconf-simulator/etc/profile.d/mmf.sh patch | blob | history
mmfw-sysconf-simulator/etc/pulse/default.pa patch | blob | history
mmfw-sysconf-simulator/etc/pulse/system.pa patch | blob | history
mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland patch | blob | history
mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x patch | blob | history
mmfw-sysconf-target-n4/etc/profile.d/mmf.sh patch | blob | history
mmfw-sysconf-target-n4/etc/pulse/default.pa patch | blob | history
mmfw-sysconf-target-n4/etc/pulse/system.pa patch | blob | history
mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.wayland patch | blob | history
mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.x patch | blob | history
mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder_dev_video_pri.ini patch | blob | history
mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder_dev_video_sec.ini patch | blob | history
mmfw-sysconf-target-u3/etc/profile.d/mmf.sh patch | blob | history
mmfw-sysconf-target-u3/etc/pulse/default.pa [changed mode: 0755->0644] patch | blob | history
mmfw-sysconf-target-u3/etc/pulse/system.pa patch | blob | history
mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.wayland patch | blob | history
mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.x patch | blob | history
packaging/mmfw-sysconf.spec patch | blob | history

diff --git a/mmfw-sysconf-simulator/etc/profile.d/mmf.sh b/mmfw-sysconf-simulator/etc/profile.d/mmf.sh
index 7566978cf0b01f32549fba65e21c0e697410f6f2..4b8663e2cdf2ce3b600585b174f308aef75bbe88 100755 (executable)
--- 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 e0737e812698633f6d23e7ef198b672047d7e3eb..c208aadac60a07ed8f7c12483593c78fb2ba0b6c 100755 (executable)
--- 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 03d75084c7d8599c6a09f89a3e3ab5a850be61cc..d81a5aceee549bc3a703ccff5fe31a1f95d23300 100644 (file)
--- 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 6b546757d5689d4b72be0de738e53db091d034c1..d220192f2371b23b6203d555bf2468746006793e 100644 (file)
--- 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 51acee5063f1759a4b5f9d682a7697b6e9f86680..d0a2e7ead91fc72e99455332fa3417730a385d72 100644 (file)
--- 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 7566978cf0b01f32549fba65e21c0e697410f6f2..4b8663e2cdf2ce3b600585b174f308aef75bbe88 100755 (executable)
--- 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 cac0b9eb547808ed9b09e7eafc9ed112ba741dd7..ef8f1145270442db35d7967279d368176ea576ff 100644 (file)
--- 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 03d75084c7d8599c6a09f89a3e3ab5a850be61cc..d81a5aceee549bc3a703ccff5fe31a1f95d23300 100644 (file)
--- 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 57bc724913a960f3f41118d32af4fcd4269b8356..cd32e870e7627401901d43a9d89483ef8073db5c 100644 (file)
--- 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 6c9c426b90b163104b6ec78b68314e8197aa418c..fe698743ae906efe7197f60f25fecb7128fde608 100644 (file)
--- 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 0180568ba95c1405b349d418bdde1694649cef98..dbd5fe2b8a85154b46c74954cb2c313cc8da82c4 100644 (file)
--- 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 0180568ba95c1405b349d418bdde1694649cef98..b9d590c6c576a5ee580bda510914096c17720c70 100644 (file)
--- 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 7566978cf0b01f32549fba65e21c0e697410f6f2..4b8663e2cdf2ce3b600585b174f308aef75bbe88 100755 (executable)
--- 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 (executable)
new mode 100644 (file)
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 03d75084c7d8599c6a09f89a3e3ab5a850be61cc..d81a5aceee549bc3a703ccff5fe31a1f95d23300 100644 (file)
--- 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 50ac63d49d57dd2255e53804c3d5ce56e3053e7a..3e5d35dcf22672bd5cb4759f2df5f53b3aac8e26 100644 (file)
--- 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 543c7fa11a5c9fe094b789d54b0d23eaf46cbf71..3cda464074ddd8cf2e6bd8ce65af01594a00e70a 100644 (file)
--- 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 699b8071a7f8abe006c6c35e5dee819cf2c1f287..ebb7af84266986d51f41418699f57336b097fc2a 100644 (file)
--- 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
Domain: Multimedia / Media Common;