From 04fcccb05eab93ffe43b9d481d1572eec84bd810 Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Tue, 26 Jan 2016 15:03:09 +0900 Subject: [PATCH] [camera] Change for display setting Change-Id: If0de75e79b2d22272e9afd9d7ce8bdc088fc4cde Signed-off-by: Jeongmo Yang --- mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland | 6 +++--- mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x | 6 +++--- .../usr/etc/mmfw_camcorder.ini.wayland | 6 +++--- mmfw-sysconf-target-hawkp/usr/etc/mmfw_camcorder.ini.x | 6 +++--- mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.wayland | 6 +++--- mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.x | 6 +++--- mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.wayland | 6 +++--- mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.x | 6 +++--- mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.wayland | 6 +++--- mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.x | 6 +++--- packaging/mmfw-sysconf.spec | 2 +- 11 files changed, 31 insertions(+), 31 deletions(-) diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland index e6dbba8..f3e3029 100644 --- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland +++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.wayland @@ -51,9 +51,9 @@ 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 || 0 ; Videosink -;;; 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 +;;; 0: Overlay surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 4: Remote +Videosink = 0,1,3,4 || 0 +VideosinkElementOverlay = 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 diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x index 52ab99c..2dc967d 100644 --- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x +++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini.x @@ -51,9 +51,9 @@ 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 || 0 ; Videosink -;;; 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 +;;; 0: Overlay surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 4: Remote +Videosink = 0,1,3,4 || 0 +VideosinkElementOverlay = 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 diff --git a/mmfw-sysconf-target-hawkp/usr/etc/mmfw_camcorder.ini.wayland b/mmfw-sysconf-target-hawkp/usr/etc/mmfw_camcorder.ini.wayland index b9c1233..90a7588 100644 --- a/mmfw-sysconf-target-hawkp/usr/etc/mmfw_camcorder.ini.wayland +++ b/mmfw-sysconf-target-hawkp/usr/etc/mmfw_camcorder.ini.wayland @@ -47,9 +47,9 @@ 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, 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 +;;; 0: Overlay surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 4: Remote +Videosink = 0,1,3,4 || 1 +VideosinkElementOverlay = 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 diff --git a/mmfw-sysconf-target-hawkp/usr/etc/mmfw_camcorder.ini.x b/mmfw-sysconf-target-hawkp/usr/etc/mmfw_camcorder.ini.x index 6ae3f7b..6f98edf 100644 --- a/mmfw-sysconf-target-hawkp/usr/etc/mmfw_camcorder.ini.x +++ b/mmfw-sysconf-target-hawkp/usr/etc/mmfw_camcorder.ini.x @@ -47,9 +47,9 @@ 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, 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 +;;; 0: Overlay surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 4: Remote +Videosink = 0,1,3,4 || 1 +VideosinkElementOverlay = 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 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 cd32e87..302bcd6 100644 --- a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.wayland +++ b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.wayland @@ -48,9 +48,9 @@ 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, 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 +;;; 0: Overlay surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 4: Remote +Videosink = 0,1,3,4 || 1 +VideosinkElementOverlay = 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 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 fe69874..3e66b25 100644 --- a/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.x +++ b/mmfw-sysconf-target-n4/usr/etc/mmfw_camcorder.ini.x @@ -48,9 +48,9 @@ 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, 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 +;;; 0: Overlay surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 4: Remote +Videosink = 0,1,3,4 || 1 +VideosinkElementOverlay = 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 diff --git a/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.wayland b/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.wayland index 34353d7..588a58c 100644 --- a/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.wayland +++ b/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.wayland @@ -49,9 +49,9 @@ 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, 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 +;;; 0: Overlay surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 4: Remote +Videosink = 0,1,3,4 || 1 +VideosinkElementOverlay = 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 = 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 diff --git a/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.x b/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.x index 8a487d8..c1fa06b 100644 --- a/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.x +++ b/mmfw-sysconf-target-tm1/usr/etc/mmfw_camcorder.ini.x @@ -49,9 +49,9 @@ 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, 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 +;;; 0: Overlay surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 4: Remote +Videosink = 0,1,3,4 || 1 +VideosinkElementOverlay = 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 = 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 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 3e5d35d..4d94158 100644 --- a/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.wayland +++ b/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.wayland @@ -48,9 +48,9 @@ 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, 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 +;;; 0: Overlay surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 4: Remote +Videosink = 0,1,3,4 || 1 +VideosinkElementOverlay = 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 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 3cda464..235f8e8 100644 --- a/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.x +++ b/mmfw-sysconf-target-u3/usr/etc/mmfw_camcorder.ini.x @@ -48,9 +48,9 @@ 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, 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 +;;; 0: Overlay surface, 1: Evas surface, 2: GL surface, 3: NULL surface, 4: Remote +Videosink = 0,1,3,4 || 1 +VideosinkElementOverlay = 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 diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec index 41e2626..4c4f646 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.46 +Version: 0.2.47 Release: 0 Group: Multimedia/Configuration License: LGPL-2.1+ and Apache-2.0 -- 2.34.1