Skip to content

Commit 3c2ca88

Browse files
codeanticodecodeanticode
committed
pre-load libraries on Linux
1 parent 0c99d25 commit 3c2ca88

File tree

5 files changed

+143
-154
lines changed

5 files changed

+143
-154
lines changed

‎src/processing/video/Capture.java

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Part of the Processing project - http://processing.org
55
6-
Copyright (c) 2012-19 The Processing Foundation
6+
Copyright (c) 2012-22 The Processing Foundation
77
Copyright (c) 2004-12 Ben Fry and Casey Reas
88
GStreamer implementation ported from GSVideo library by Andres Colubri
99
The previous version of this code was developed by Hernando Barragan

‎src/processing/video/Environment.java

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Part of the Processing project - http://processing.org
55
6-
Copyright (c) 2012-19 The Processing Foundation
6+
Copyright (c) 2012-22 The Processing Foundation
77
Copyright (c) 2004-12 Ben Fry and Casey Reas
88
99
Based on from:

‎src/processing/video/LibraryLoader.java

100644100755
Lines changed: 61 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Part of the Processing project - http://processing.org
55
6-
Copyright (c) 2012-19 The Processing Foundation
6+
Copyright (c) 2012-22 The Processing Foundation
77
Copyright (c) 2011-12 Ben Fry and Casey Reas
88
GStreamer implementation ported from GSVideo library by Andres Colubri
99
Library loader based on code by Tal Shalif
@@ -45,7 +45,7 @@ public interface DummyLibrary extends Library {
4545
private static LibraryLoader instance;
4646

4747
static final Object[][] WINDOWS_DEPENDENCIES = {
48-
// Core gstreamer libraries
48+
// Core GStreamer libraries
4949
{ "libgstadaptivedemux-1.0-0", new String[] {}, false },
5050
{ "libgstallocators-1.0-0", new String[] {}, false },
5151
{ "libgstapp-1.0-0", new String[] {}, false },
@@ -158,79 +158,68 @@ public interface DummyLibrary extends Library {
158158
};
159159

160160
static final Object[][] LINUX_DEPENDENCIES = {
161-
{ "libgstbase-1.0", new String[] {}, false },
162-
{ "libgstreamer-1.0", new String[] {}, false },
163-
{ "libgstadaptivedemux-1.0", new String[] {}, false },
164-
{ "libgstallocators-1.0", new String[] {}, false },
165-
{ "libgstapp-1.0", new String[] {}, false },
166-
{ "libgstaudio-1.0", new String[] {}, false },
167-
{ "libgstbadaudio-1.0", new String[] {}, false },
168-
{ "libgstbasecamerabinsrc-1.0", new String[] {}, false },
169-
{ "libgstcheck-1.0", new String[] {}, false },
170-
{ "libgstcodecparsers-1.0", new String[] {}, false },
171-
{ "libgstcontroller-1.0", new String[] {}, false },
172-
{ "libgstfft-1.0", new String[] {}, false },
173-
{ "libgstinsertbin-1.0", new String[] {}, false },
174-
{ "libgstisoff-1.0", new String[] {}, false },
175-
{ "libgstmpegts-1.0", new String[] {}, false },
176-
{ "libgstnet-1.0", new String[] {}, false },
177-
{ "libgstpbutils-1.0", new String[] {}, false },
178-
{ "libgstphotography-1.0", new String[] {}, false },
179-
{ "libgstplayer-1.0", new String[] {}, false },
180-
{ "libgstriff-1.0", new String[] {}, false },
181-
{ "libgstrtp-1.0", new String[] {}, false },
182-
{ "libgstrtsp-1.0", new String[] {}, false },
183-
{ "libgstrtspserver-1.0", new String[] {}, false },
184-
{ "libgstsctp-1.0", new String[] {}, false },
185-
{ "libgstsdp-1.0", new String[] {}, false },
186-
{ "libgsttag-1.0", new String[] {}, false },
187-
{ "libgsturidownloader-1.0", new String[] {}, false },
188-
{ "libgstvalidate-1.0", new String[] {}, false },
189-
{ "libgstvalidate-default-overrides-1.0", new String[] {}, false },
190-
{ "libgstvideo-1.0", new String[] {}, false },
191-
{ "libgstwebrtc-1.0", new String[] {}, false },
192-
193-
{ "libglib-2.0", new String[] {}, false },
194-
{ "libgobject-2.0", new String[] {}, false },
195-
{ "libgio-2.0", new String[] {}, false },
196-
{ "libgmodule-2.0", new String[] {}, false },
197-
{ "libgthread-2.0", new String[] {}, false },
198-
199-
{ "libavcodec", new String[] {}, false },
200-
{ "libavdevice", new String[] {}, false },
201-
{ "libavfilter", new String[] {}, false },
202-
{ "libavformat", new String[] {}, false },
203-
{ "libavresample", new String[] {}, false },
204-
{ "libavutil", new String[] {}, false },
205-
{ "libges-1.0", new String[] {}, false },
206-
{ "libjson-glib-1.0", new String[] {}, false },
207-
{ "libnice", new String[] {}, false },
208-
{ "libnice.10", new String[] {}, false },
209-
{ "libopenh264", new String[] {}, false },
210-
{ "libopenh264.4", new String[] {}, false },
211-
{ "liborc-0.4", new String[] {}, false },
212-
{ "liborc-test-0.4", new String[] {}, false },
213-
{ "libpostproc", new String[] {}, false },
214-
{ "libswresample", new String[] {}, false },
215-
{ "libswscale", new String[] {}, false },
216-
{ "libx264", new String[] {}, false }
161+
// GLib libraries
162+
{ "glib-2.0", new String[] {}, false },
163+
{ "gobject-2.0", new String[] {}, false },
164+
{ "gio-2.0", new String[] {}, false },
165+
{ "gmodule-2.0", new String[] {}, false },
166+
{ "gthread-2.0", new String[] {}, false },
167+
168+
// Core GStreamer libraries
169+
{ "gstreamer-1.0", new String[] {}, false },
170+
{ "gstbase-1.0", new String[] {}, false },
171+
{ "gsturidownloader-1.0", new String[] {}, false },
172+
{ "gstadaptivedemux-1.0", new String[] {}, false },
173+
{ "gstapp-1.0", new String[] {}, false },
174+
{ "gsttag-1.0", new String[] {}, false },
175+
{ "gstvideo-1.0", new String[] {}, false },
176+
{ "gstaudio-1.0", new String[] {}, false },
177+
{ "gstpbutils-1.0", new String[] {}, false },
178+
{ "gstplayer-1.0", new String[] {}, false },
179+
{ "gstbadaudio-1.0", new String[] {}, false },
180+
{ "gstbasecamerabinsrc-1.0", new String[] {}, false },
181+
{ "gstcheck-1.0", new String[] {}, false },
182+
{ "gstcodecparsers-1.0", new String[] {}, false },
183+
{ "gstcontroller-1.0", new String[] {}, false },
184+
{ "gstfft-1.0", new String[] {}, false },
185+
{ "gstinsertbin-1.0", new String[] {}, false },
186+
{ "gstisoff-1.0", new String[] {}, false },
187+
{ "gstmpegts-1.0", new String[] {}, false },
188+
{ "gstnet-1.0", new String[] {}, false },
189+
{ "gstphotography-1.0", new String[] {}, false },
190+
{ "gstallocators-1.0", new String[] {}, false },
191+
{ "gstriff-1.0", new String[] {}, false },
192+
{ "gstrtp-1.0", new String[] {}, false },
193+
{ "gstrtsp-1.0", new String[] {}, false },
194+
{ "gstsdp-1.0", new String[] {}, false },
195+
{ "gstsctp-1.0", new String[] {}, false },
196+
{ "gstrtspserver-1.0", new String[] {}, false },
197+
{ "gstvalidate-1.0", new String[] {}, false },
198+
{ "gstvalidate-default-overrides-1.0", new String[] {}, false },
199+
{ "gstwebrtc-1.0", new String[] {}, false },
200+
201+
// External libraries
202+
{ "avutil", new String[] {}, false },
203+
{ "swresample", new String[] {}, false },
204+
{ "swscale", new String[] {}, false },
205+
{ "avcodec", new String[] {}, false },
206+
{ "avformat", new String[] {}, false },
207+
{ "avresample", new String[] {}, false },
208+
{ "avfilter", new String[] {}, false },
209+
{ "avdevice", new String[] {}, false },
210+
{ "ges-1.0", new String[] {}, false },
211+
{ "json-glib-1.0", new String[] {}, false },
212+
{ "nice", new String[] {}, false },
213+
{ "x264", new String[] {}, false },
214+
{ "openh264", new String[] {}, false },
215+
{ "orc-0.4", new String[] {}, false },
216+
{ "orc-test-0.4", new String[] {}, false },
217+
{ "postproc", new String[] {}, false }
217218
};
218219

219-
static final Object[][] MACOS_DEPENDENCIES = {
220-
{ "gstbase-1.0", new String[] { "gstreamer-1.0" }, true },
221-
{ "gstinterfaces-1.0", new String[] { "gstreamer-1.0" }, true },
222-
{ "gstcontroller-1.0", new String[] { "gstreamer-1.0" }, true },
223-
{ "gstaudio-1.0", new String[] { "gstbase-1.0" }, true },
224-
{ "gstvideo-1.0", new String[] { "gstbase-1.0" }, true } };
225-
226-
static final Object[][] DEFAULT_DEPENDENCIES = {
227-
{ "gstreamer-1.0", new String[] {}, true },
228-
{ "gstbase-1.0", new String[] { "gstreamer-1.0" }, true },
229-
{ "gstinterfaces-1.0", new String[] { "gstreamer-1.0" }, true },
230-
{ "gstcontroller-1.0", new String[] { "gstreamer-1.0" }, true },
231-
{ "gstaudio-1.0", new String[] { "gstbase-1.0" }, true },
232-
{ "gstvideo-1.0", new String[] { "gstbase-1.0" }, true }, };
220+
static final Object[][] MACOS_DEPENDENCIES = { };
233221

222+
static final Object[][] DEFAULT_DEPENDENCIES = { };
234223

235224
static final Object[][] dependencies =
236225
Platform.isWindows() ? WINDOWS_DEPENDENCIES :

‎src/processing/video/Movie.java

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Part of the Processing project - http://processing.org
55
6-
Copyright (c) 2012-19 The Processing Foundation
6+
Copyright (c) 2012-22 The Processing Foundation
77
Copyright (c) 2004-12 Ben Fry and Casey Reas
88
GStreamer implementation ported from GSVideo library by Andres Colubri
99
The previous version of this code was developed by Hernando Barragan

0 commit comments

Comments
 (0)