Skip to content

Commit 1e4c9d4

Browse files
filnetfilnet
committed
LP-109 extract Windows specific gadget configurations to defaults_windows.xml
1 parent f78d161 commit 1e4c9d4

2 files changed

Lines changed: 139 additions & 131 deletions

File tree

‎ground/gcs/src/share/configurations/default.xml‎

Lines changed: 0 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -1665,31 +1665,6 @@
16651665
<backgroundImageFile>%%DATAPATH%%backgrounds/default_background.png</backgroundImageFile>
16661666
</data>
16671667
</PFD__PCT__20__PCT__28ArcGis__PCT__29>
1668-
<PFD__PCT__20__PCT__28Video__PCT__29>
1669-
<configInfo>
1670-
<locked>false</locked>
1671-
<version>0.0.0</version>
1672-
</configInfo>
1673-
<data>
1674-
<qmlFile>%%DATAPATH%%qml/PfdVideo.qml</qmlFile>
1675-
<altitudeFactor>1</altitudeFactor>
1676-
<speedFactor>1</speedFactor>
1677-
<terrainEnabled>true</terrainEnabled>
1678-
<earthFile>%%DATAPATH%%osgearth/arcgis.earth</earthFile>
1679-
<cacheOnly>false</cacheOnly>
1680-
<latitude>39.6576</latitude>
1681-
<longitude>19.8046</longitude>
1682-
<altitude>90</altitude>
1683-
<timeMode>0</timeMode>
1684-
<dateTime>@Variant(AAAAEAAlfhEClAez/w==)</dateTime>
1685-
<minAmbientLight>0.50</minAmbientLight>
1686-
<modelEnabled>false</modelEnabled>
1687-
<modelSelectionMode>1</modelSelectionMode>
1688-
<modelFile>%%DATAPATH%%models/multi/test_quad/test_quad_x.3ds</modelFile>
1689-
<backgroundImageFile>%%DATAPATH%%backgrounds/default_background.png</backgroundImageFile>
1690-
<gstPipeline>ksvideosrc device-index=0 ! videoconvert ! video/x-raw,format=RGB ! appsink name=sink emit-signals=true</gstPipeline>
1691-
</data>
1692-
</PFD__PCT__20__PCT__28Video__PCT__29>
16931668
<Model__PCT__20View>
16941669
<configInfo>
16951670
<locked>false</locked>
@@ -2825,112 +2800,6 @@
28252800
<respectAspectRatio>false</respectAspectRatio>
28262801
</data>
28272802
</Default>
2828-
<Screen__PCT__20-__PCT__20Capture__PCT__20to__PCT__20file__PCT__20__PCT__28fast__PCT__20__PCT__26__PCT__20big__PCT__29>
2829-
<configInfo>
2830-
<locked>false</locked>
2831-
<version>0.0.0</version>
2832-
</configInfo>
2833-
<data>
2834-
<autoStart>false</autoStart>
2835-
<displayControls>false</displayControls>
2836-
<displayVideo>true</displayVideo>
2837-
<pipelineDesc>dx9screencapsrc monitor=0 cursor=true ! tee name=t
2838-
t. ! queue max-size-buffers=0 max-size-time=0 max-size-bytes=0 ! timeoverlay ! autovideosink
2839-
t. ! queue max-size-buffers=0 max-size-time=0 max-size-bytes=0 ! videoconvert ! x264enc interlaced=true pass=quant quantizer=0 speed-preset=ultrafast byte-stream=true ! mpegpsmux ! filesink location=capture_fast.mpg</pipelineDesc>
2840-
<pipelineInfo></pipelineInfo>
2841-
<respectAspectRatio>true</respectAspectRatio>
2842-
</data>
2843-
</Screen__PCT__20-__PCT__20Capture__PCT__20to__PCT__20file__PCT__20__PCT__28fast__PCT__20__PCT__26__PCT__20big__PCT__29>
2844-
<Screen__PCT__20-__PCT__20Capture__PCT__20to__PCT__20file>
2845-
<configInfo>
2846-
<locked>false</locked>
2847-
<version>0.0.0</version>
2848-
</configInfo>
2849-
<data>
2850-
<autoStart>false</autoStart>
2851-
<displayControls>false</displayControls>
2852-
<displayVideo>true</displayVideo>
2853-
<pipelineDesc>dx9screencapsrc monitor=0 cursor=true ! tee name=t
2854-
t. ! queue ! timeoverlay ! autovideosink
2855-
t. ! queue ! videoconvert ! x264enc tune=zerolatency tune=zerolatency bitrate=498 ! mpegpsmux ! filesink location=capture.mpg</pipelineDesc>
2856-
<pipelineInfo></pipelineInfo>
2857-
<respectAspectRatio>true</respectAspectRatio>
2858-
</data>
2859-
</Screen__PCT__20-__PCT__20Capture__PCT__20to__PCT__20file>
2860-
<Screen__PCT__20-__PCT__20Play__PCT__20__PCT__28640x480__PCT__29>
2861-
<configInfo>
2862-
<locked>false</locked>
2863-
<version>0.0.0</version>
2864-
</configInfo>
2865-
<data>
2866-
<autoStart>false</autoStart>
2867-
<displayControls>false</displayControls>
2868-
<displayVideo>true</displayVideo>
2869-
<pipelineDesc>dx9screencapsrc monitor=0 cursor=true x=0 y=0 width=640 height=480 ! autovideosink</pipelineDesc>
2870-
<pipelineInfo></pipelineInfo>
2871-
<respectAspectRatio>false</respectAspectRatio>
2872-
</data>
2873-
</Screen__PCT__20-__PCT__20Play__PCT__20__PCT__28640x480__PCT__29>
2874-
<Screen__PCT__20-__PCT__20Play>
2875-
<configInfo>
2876-
<locked>false</locked>
2877-
<version>0.0.0</version>
2878-
</configInfo>
2879-
<data>
2880-
<autoStart>true</autoStart>
2881-
<displayControls>false</displayControls>
2882-
<displayVideo>true</displayVideo>
2883-
<pipelineDesc>dx9screencapsrc monitor=0 cursor=true ! autovideosink</pipelineDesc>
2884-
<pipelineInfo></pipelineInfo>
2885-
<respectAspectRatio>false</respectAspectRatio>
2886-
</data>
2887-
</Screen__PCT__20-__PCT__20Play>
2888-
<USB__PCT__20Camera__PCT__20-__PCT__20Capture__PCT__20to__PCT__20file__PCT__20__PCT__28fast__PCT__20__PCT__26__PCT__20big__PCT__29>
2889-
<configInfo>
2890-
<locked>false</locked>
2891-
<version>0.0.0</version>
2892-
</configInfo>
2893-
<data>
2894-
<autoStart>false</autoStart>
2895-
<displayControls>false</displayControls>
2896-
<displayVideo>true</displayVideo>
2897-
<pipelineDesc>ksvideosrc device-index=0 ! tee name=t
2898-
t. ! queue max-size-buffers=0 max-size-time=0 max-size-bytes=0 ! timeoverlay ! autovideosink
2899-
t. ! queue max-size-buffers=0 max-size-time=0 max-size-bytes=0 ! videoconvert ! x264enc interlaced=true pass=quant quantizer=0 speed-preset=ultrafast byte-stream=true ! mpegpsmux ! filesink location=capture_fast.mpg</pipelineDesc>
2900-
<pipelineInfo></pipelineInfo>
2901-
<respectAspectRatio>true</respectAspectRatio>
2902-
</data>
2903-
</USB__PCT__20Camera__PCT__20-__PCT__20Capture__PCT__20to__PCT__20file__PCT__20__PCT__28fast__PCT__20__PCT__26__PCT__20big__PCT__29>
2904-
<USB__PCT__20Camera__PCT__20-__PCT__20Capture__PCT__20to__PCT__20file>
2905-
<configInfo>
2906-
<locked>false</locked>
2907-
<version>0.0.0</version>
2908-
</configInfo>
2909-
<data>
2910-
<autoStart>false</autoStart>
2911-
<displayControls>false</displayControls>
2912-
<displayVideo>true</displayVideo>
2913-
<pipelineDesc>ksvideosrc device-index=0 ! tee name=t
2914-
t. ! queue ! timeoverlay ! autovideosink
2915-
t. ! queue ! videoconvert ! x264enc tune=zerolatency tune=zerolatency bitrate=498 ! mpegpsmux ! filesink location=capture.mpg</pipelineDesc>
2916-
<pipelineInfo></pipelineInfo>
2917-
<respectAspectRatio>true</respectAspectRatio>
2918-
</data>
2919-
</USB__PCT__20Camera__PCT__20-__PCT__20Capture__PCT__20to__PCT__20file>
2920-
<USB__PCT__20Camera__PCT__20-__PCT__20Play>
2921-
<configInfo>
2922-
<locked>false</locked>
2923-
<version>0.0.0</version>
2924-
</configInfo>
2925-
<data>
2926-
<autoStart>true</autoStart>
2927-
<displayControls>false</displayControls>
2928-
<displayVideo>true</displayVideo>
2929-
<pipelineDesc>ksvideosrc device-index=0 ! autovideosink</pipelineDesc>
2930-
<pipelineInfo></pipelineInfo>
2931-
<respectAspectRatio>false</respectAspectRatio>
2932-
</data>
2933-
</USB__PCT__20Camera__PCT__20-__PCT__20Play>
29342803
</VideoGadget>
29352804
<configInfo>
29362805
<locked>false</locked>

‎ground/gcs/src/share/configurations/default_windows.xml‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
<gcs>
2+
<UAVGadgetConfigurations>
3+
<PfdQmlGadget>
4+
<PFD__PCT__20__PCT__28Video__PCT__29>
5+
<configInfo>
6+
<locked>false</locked>
7+
<version>0.0.0</version>
8+
</configInfo>
9+
<data>
10+
<qmlFile>%%DATAPATH%%qml/PfdVideo.qml</qmlFile>
11+
<altitudeFactor>1</altitudeFactor>
12+
<speedFactor>1</speedFactor>
13+
<terrainEnabled>true</terrainEnabled>
14+
<earthFile>%%DATAPATH%%osgearth/arcgis.earth</earthFile>
15+
<cacheOnly>false</cacheOnly>
16+
<latitude>39.6576</latitude>
17+
<longitude>19.8046</longitude>
18+
<altitude>90</altitude>
19+
<timeMode>0</timeMode>
20+
<dateTime>@Variant(AAAAEAAlfhEClAez/w==)</dateTime>
21+
<minAmbientLight>0.50</minAmbientLight>
22+
<modelEnabled>false</modelEnabled>
23+
<modelSelectionMode>1</modelSelectionMode>
24+
<modelFile>%%DATAPATH%%models/multi/test_quad/test_quad_x.3ds</modelFile>
25+
<backgroundImageFile>%%DATAPATH%%backgrounds/default_background.png</backgroundImageFile>
26+
<gstPipeline>ksvideosrc device-index=0 ! videoconvert ! video/x-raw,format=RGB ! appsink name=sink emit-signals=true</gstPipeline>
27+
</data>
28+
</PFD__PCT__20__PCT__28Video__PCT__29>
29+
</PfdQmlGadget>
30+
<VideoGadget>
31+
<Screen__PCT__20-__PCT__20Capture__PCT__20to__PCT__20file__PCT__20__PCT__28fast__PCT__20__PCT__26__PCT__20big__PCT__29>
32+
<configInfo>
33+
<locked>false</locked>
34+
<version>0.0.0</version>
35+
</configInfo>
36+
<data>
37+
<autoStart>false</autoStart>
38+
<displayControls>false</displayControls>
39+
<displayVideo>true</displayVideo>
40+
<pipelineDesc>dx9screencapsrc monitor=0 cursor=true ! tee name=t
41+
t. ! queue max-size-buffers=0 max-size-time=0 max-size-bytes=0 ! timeoverlay ! autovideosink
42+
t. ! queue max-size-buffers=0 max-size-time=0 max-size-bytes=0 ! videoconvert ! x264enc interlaced=true pass=quant quantizer=0 speed-preset=ultrafast byte-stream=true ! mpegpsmux ! filesink location=capture_fast.mpg</pipelineDesc>
43+
<pipelineInfo></pipelineInfo>
44+
<respectAspectRatio>true</respectAspectRatio>
45+
</data>
46+
</Screen__PCT__20-__PCT__20Capture__PCT__20to__PCT__20file__PCT__20__PCT__28fast__PCT__20__PCT__26__PCT__20big__PCT__29>
47+
<Screen__PCT__20-__PCT__20Capture__PCT__20to__PCT__20file>
48+
<configInfo>
49+
<locked>false</locked>
50+
<version>0.0.0</version>
51+
</configInfo>
52+
<data>
53+
<autoStart>false</autoStart>
54+
<displayControls>false</displayControls>
55+
<displayVideo>true</displayVideo>
56+
<pipelineDesc>dx9screencapsrc monitor=0 cursor=true ! tee name=t
57+
t. ! queue ! timeoverlay ! autovideosink
58+
t. ! queue ! videoconvert ! x264enc tune=zerolatency tune=zerolatency bitrate=498 ! mpegpsmux ! filesink location=capture.mpg</pipelineDesc>
59+
<pipelineInfo></pipelineInfo>
60+
<respectAspectRatio>true</respectAspectRatio>
61+
</data>
62+
</Screen__PCT__20-__PCT__20Capture__PCT__20to__PCT__20file>
63+
<Screen__PCT__20-__PCT__20Play__PCT__20__PCT__28640x480__PCT__29>
64+
<configInfo>
65+
<locked>false</locked>
66+
<version>0.0.0</version>
67+
</configInfo>
68+
<data>
69+
<autoStart>false</autoStart>
70+
<displayControls>false</displayControls>
71+
<displayVideo>true</displayVideo>
72+
<pipelineDesc>dx9screencapsrc monitor=0 cursor=true x=0 y=0 width=640 height=480 ! autovideosink</pipelineDesc>
73+
<pipelineInfo></pipelineInfo>
74+
<respectAspectRatio>false</respectAspectRatio>
75+
</data>
76+
</Screen__PCT__20-__PCT__20Play__PCT__20__PCT__28640x480__PCT__29>
77+
<Screen__PCT__20-__PCT__20Play>
78+
<configInfo>
79+
<locked>false</locked>
80+
<version>0.0.0</version>
81+
</configInfo>
82+
<data>
83+
<autoStart>true</autoStart>
84+
<displayControls>false</displayControls>
85+
<displayVideo>true</displayVideo>
86+
<pipelineDesc>dx9screencapsrc monitor=0 cursor=true ! autovideosink</pipelineDesc>
87+
<pipelineInfo></pipelineInfo>
88+
<respectAspectRatio>false</respectAspectRatio>
89+
</data>
90+
</Screen__PCT__20-__PCT__20Play>
91+
<USB__PCT__20Camera__PCT__20-__PCT__20Capture__PCT__20to__PCT__20file__PCT__20__PCT__28fast__PCT__20__PCT__26__PCT__20big__PCT__29>
92+
<configInfo>
93+
<locked>false</locked>
94+
<version>0.0.0</version>
95+
</configInfo>
96+
<data>
97+
<autoStart>false</autoStart>
98+
<displayControls>false</displayControls>
99+
<displayVideo>true</displayVideo>
100+
<pipelineDesc>ksvideosrc device-index=0 ! tee name=t
101+
t. ! queue max-size-buffers=0 max-size-time=0 max-size-bytes=0 ! timeoverlay ! autovideosink
102+
t. ! queue max-size-buffers=0 max-size-time=0 max-size-bytes=0 ! videoconvert ! x264enc interlaced=true pass=quant quantizer=0 speed-preset=ultrafast byte-stream=true ! mpegpsmux ! filesink location=capture_fast.mpg</pipelineDesc>
103+
<pipelineInfo></pipelineInfo>
104+
<respectAspectRatio>true</respectAspectRatio>
105+
</data>
106+
</USB__PCT__20Camera__PCT__20-__PCT__20Capture__PCT__20to__PCT__20file__PCT__20__PCT__28fast__PCT__20__PCT__26__PCT__20big__PCT__29>
107+
<USB__PCT__20Camera__PCT__20-__PCT__20Capture__PCT__20to__PCT__20file>
108+
<configInfo>
109+
<locked>false</locked>
110+
<version>0.0.0</version>
111+
</configInfo>
112+
<data>
113+
<autoStart>false</autoStart>
114+
<displayControls>false</displayControls>
115+
<displayVideo>true</displayVideo>
116+
<pipelineDesc>ksvideosrc device-index=0 ! tee name=t
117+
t. ! queue ! timeoverlay ! autovideosink
118+
t. ! queue ! videoconvert ! x264enc tune=zerolatency tune=zerolatency bitrate=498 ! mpegpsmux ! filesink location=capture.mpg</pipelineDesc>
119+
<pipelineInfo></pipelineInfo>
120+
<respectAspectRatio>true</respectAspectRatio>
121+
</data>
122+
</USB__PCT__20Camera__PCT__20-__PCT__20Capture__PCT__20to__PCT__20file>
123+
<USB__PCT__20Camera__PCT__20-__PCT__20Play>
124+
<configInfo>
125+
<locked>false</locked>
126+
<version>0.0.0</version>
127+
</configInfo>
128+
<data>
129+
<autoStart>true</autoStart>
130+
<displayControls>false</displayControls>
131+
<displayVideo>true</displayVideo>
132+
<pipelineDesc>ksvideosrc device-index=0 ! autovideosink</pipelineDesc>
133+
<pipelineInfo></pipelineInfo>
134+
<respectAspectRatio>false</respectAspectRatio>
135+
</data>
136+
</USB__PCT__20Camera__PCT__20-__PCT__20Play>
137+
</VideoGadget>
138+
</UAVGadgetConfigurations>
139+
</gcs>

0 commit comments

Comments
 (0)