summaryrefslogtreecommitdiff
path: root/gst-sdk
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2014-07-21 16:50:17 +0200
committerSebastian Dröge <sebastian@centricular.com>2014-07-21 16:50:17 +0200
commitf106d6e264348875a0b2c78803001248ba12fe22 (patch)
treee7958da1394648a3fffc3e5cbe04dead68dedbab /gst-sdk
parentac9e4c62b7fd94d2d3f9199b901fcba63f2e5969 (diff)
ios: Update gst_ios_init.[hm] files for 1.4.0
Diffstat (limited to 'gst-sdk')
-rw-r--r--gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_init.h7
-rw-r--r--gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m53
-rw-r--r--gst-sdk/tutorials/xcode iOS/Tutorial 2/gst_ios_init.h7
-rw-r--r--gst-sdk/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m53
-rw-r--r--gst-sdk/tutorials/xcode iOS/Tutorial 3/gst_ios_init.h7
-rw-r--r--gst-sdk/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m53
-rw-r--r--gst-sdk/tutorials/xcode iOS/Tutorial 4/gst_ios_init.h7
-rw-r--r--gst-sdk/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m53
-rw-r--r--gst-sdk/tutorials/xcode iOS/Tutorial 5/gst_ios_init.h7
-rw-r--r--gst-sdk/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m53
10 files changed, 270 insertions, 30 deletions
diff --git a/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_init.h b/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_init.h
index 4d8b22a..c5c929f 100644
--- a/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_init.h
+++ b/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_init.h
@@ -5,6 +5,12 @@
G_BEGIN_DECLS
+#define GST_G_IO_MODULE_DECLARE(name) \
+extern void G_PASTE(g_io_module_, G_PASTE(name, _load_static)) (void)
+
+#define GST_G_IO_MODULE_LOAD(name) \
+G_PASTE(g_io_module_, G_PASTE(name, _load_static)) ()
+
/* Uncomment each line to enable the plugin categories that your application needs.
* You can also enable individual plugins. See gst_ios_init.c to see their names
*/
@@ -21,6 +27,7 @@ G_BEGIN_DECLS
//#define GST_IOS_PLUGINS_EFFECTS
//#define GST_IOS_PLUGINS_CODECS
//#define GST_IOS_PLUGINS_NET
+//#define GST_IOS_PLUGINS_EDITING
//#define GST_IOS_GIO_MODULE_GNUTLS
diff --git a/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m b/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m
index 7ae9b44..403f9f9 100644
--- a/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m
+++ b/gst-sdk/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m
@@ -75,6 +75,9 @@ GST_PLUGIN_STATIC_DECLARE(mpegtsdemux);
#if defined(GST_IOS_PLUGIN_MPEGTSMUX) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_DECLARE(mpegtsmux);
#endif
+#if defined(GST_IOS_PLUGIN_VOAACENC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
+GST_PLUGIN_STATIC_DECLARE(voaacenc);
+#endif
#if defined(GST_IOS_PLUGIN_A52DEC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_DECLARE(a52dec);
#endif
@@ -120,14 +123,20 @@ GST_PLUGIN_STATIC_DECLARE(assrender);
#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
GST_PLUGIN_STATIC_DECLARE(mms);
#endif
+#if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
+GST_PLUGIN_STATIC_DECLARE(rtmp);
+#endif
#if defined(GST_IOS_PLUGIN_OSXAUDIO) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_DECLARE(osxaudio);
#endif
#if defined(GST_IOS_PLUGIN_APPLEMEDIA) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_DECLARE(applemedia);
#endif
-#if defined(GST_IOS_PLUGIN_EGLGLESSINK) || defined(GST_IOS_PLUGINS_SYS)
-GST_PLUGIN_STATIC_DECLARE(eglglessink);
+#if defined(GST_IOS_PLUGIN_SHM) || defined(GST_IOS_PLUGINS_SYS)
+GST_PLUGIN_STATIC_DECLARE(shm);
+#endif
+#if defined(GST_IOS_PLUGIN_OPENGL) || defined(GST_IOS_PLUGINS_SYS)
+GST_PLUGIN_STATIC_DECLARE(opengl);
#endif
#if defined(GST_IOS_PLUGIN_LIBVISUAL) || defined(GST_IOS_PLUGINS_VIS)
GST_PLUGIN_STATIC_DECLARE(libvisual);
@@ -423,6 +432,12 @@ GST_PLUGIN_STATIC_DECLARE(y4mdec);
#if defined(GST_IOS_PLUGIN_JPEGFORMAT) || defined(GST_IOS_PLUGINS_CODECS)
GST_PLUGIN_STATIC_DECLARE(jpegformat);
#endif
+#if defined(GST_IOS_PLUGIN_GDP) || defined(GST_IOS_PLUGINS_CODECS)
+GST_PLUGIN_STATIC_DECLARE(gdp);
+#endif
+#if defined(GST_IOS_PLUGIN_RSVG) || defined(GST_IOS_PLUGINS_CODECS)
+GST_PLUGIN_STATIC_DECLARE(rsvg);
+#endif
#if defined(GST_IOS_PLUGIN_TCP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_DECLARE(tcp);
#endif
@@ -447,10 +462,13 @@ GST_PLUGIN_STATIC_DECLARE(dataurisrc);
#if defined(GST_IOS_PLUGIN_SDP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_DECLARE(sdp);
#endif
+#if defined(GST_IOS_PLUGIN_GNONLIN) || defined(GST_IOS_PLUGINS_EDITING)
+GST_PLUGIN_STATIC_DECLARE(gnonlin);
+#endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
#include <gio/gio.h>
- G_IO_MODULE_DECLARE(gnutls);
+ GST_G_IO_MODULE_DECLARE(gnutls);
#endif
void
@@ -467,6 +485,7 @@ gst_ios_init (void)
const gchar *tmp_dir = [tmp UTF8String];
const gchar *cache_dir = [cache UTF8String];
const gchar *docs_dir = [docs UTF8String];
+ gchar *ca_certificates;
g_setenv ("TMP", tmp_dir, TRUE);
g_setenv ("TEMP", tmp_dir, TRUE);
@@ -480,6 +499,10 @@ gst_ios_init (void)
g_setenv ("XDG_CONFIG_HOME", cache_dir, TRUE);
g_setenv ("XDG_DATA_HOME", resources_dir, TRUE);
g_setenv ("FONTCONFIG_PATH", resources_dir, TRUE);
+
+ ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certifcates.crt", NULL);
+ g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE);
+ g_free (ca_certificates);
gst_init (NULL, NULL);
@@ -558,6 +581,9 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_MPEGTSMUX) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_REGISTER(mpegtsmux);
#endif
+#if defined(GST_IOS_PLUGIN_VOAACENC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
+ GST_PLUGIN_STATIC_REGISTER(voaacenc);
+#endif
#if defined(GST_IOS_PLUGIN_A52DEC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_REGISTER(a52dec);
#endif
@@ -603,14 +629,20 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
GST_PLUGIN_STATIC_REGISTER(mms);
#endif
+#if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
+ GST_PLUGIN_STATIC_REGISTER(rtmp);
+#endif
#if defined(GST_IOS_PLUGIN_OSXAUDIO) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_REGISTER(osxaudio);
#endif
#if defined(GST_IOS_PLUGIN_APPLEMEDIA) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_REGISTER(applemedia);
#endif
-#if defined(GST_IOS_PLUGIN_EGLGLESSINK) || defined(GST_IOS_PLUGINS_SYS)
- GST_PLUGIN_STATIC_REGISTER(eglglessink);
+#if defined(GST_IOS_PLUGIN_SHM) || defined(GST_IOS_PLUGINS_SYS)
+ GST_PLUGIN_STATIC_REGISTER(shm);
+#endif
+#if defined(GST_IOS_PLUGIN_OPENGL) || defined(GST_IOS_PLUGINS_SYS)
+ GST_PLUGIN_STATIC_REGISTER(opengl);
#endif
#if defined(GST_IOS_PLUGIN_LIBVISUAL) || defined(GST_IOS_PLUGINS_VIS)
GST_PLUGIN_STATIC_REGISTER(libvisual);
@@ -906,6 +938,12 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_JPEGFORMAT) || defined(GST_IOS_PLUGINS_CODECS)
GST_PLUGIN_STATIC_REGISTER(jpegformat);
#endif
+#if defined(GST_IOS_PLUGIN_GDP) || defined(GST_IOS_PLUGINS_CODECS)
+ GST_PLUGIN_STATIC_REGISTER(gdp);
+#endif
+#if defined(GST_IOS_PLUGIN_RSVG) || defined(GST_IOS_PLUGINS_CODECS)
+ GST_PLUGIN_STATIC_REGISTER(rsvg);
+#endif
#if defined(GST_IOS_PLUGIN_TCP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_REGISTER(tcp);
#endif
@@ -930,9 +968,12 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_SDP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_REGISTER(sdp);
#endif
+#if defined(GST_IOS_PLUGIN_GNONLIN) || defined(GST_IOS_PLUGINS_EDITING)
+ GST_PLUGIN_STATIC_REGISTER(gnonlin);
+#endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
- G_IO_MODULE_LOAD(gnutls);
+ GST_G_IO_MODULE_LOAD(gnutls);
#endif
/* Lower the ranks of filesrc and giosrc so iosavassetsrc is
diff --git a/gst-sdk/tutorials/xcode iOS/Tutorial 2/gst_ios_init.h b/gst-sdk/tutorials/xcode iOS/Tutorial 2/gst_ios_init.h
index 90acb3e..b1471b2 100644
--- a/gst-sdk/tutorials/xcode iOS/Tutorial 2/gst_ios_init.h
+++ b/gst-sdk/tutorials/xcode iOS/Tutorial 2/gst_ios_init.h
@@ -5,6 +5,12 @@
G_BEGIN_DECLS
+#define GST_G_IO_MODULE_DECLARE(name) \
+extern void G_PASTE(g_io_module_, G_PASTE(name, _load_static)) (void)
+
+#define GST_G_IO_MODULE_LOAD(name) \
+G_PASTE(g_io_module_, G_PASTE(name, _load_static)) ()
+
/* Uncomment each line to enable the plugin categories that your application needs.
* You can also enable individual plugins. See gst_ios_init.c to see their names
*/
@@ -21,6 +27,7 @@ G_BEGIN_DECLS
//#define GST_IOS_PLUGINS_EFFECTS
//#define GST_IOS_PLUGINS_CODECS
//#define GST_IOS_PLUGINS_NET
+//#define GST_IOS_PLUGINS_EDITING
//#define GST_IOS_GIO_MODULE_GNUTLS
diff --git a/gst-sdk/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m b/gst-sdk/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m
index 7ae9b44..403f9f9 100644
--- a/gst-sdk/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m
+++ b/gst-sdk/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m
@@ -75,6 +75,9 @@ GST_PLUGIN_STATIC_DECLARE(mpegtsdemux);
#if defined(GST_IOS_PLUGIN_MPEGTSMUX) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_DECLARE(mpegtsmux);
#endif
+#if defined(GST_IOS_PLUGIN_VOAACENC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
+GST_PLUGIN_STATIC_DECLARE(voaacenc);
+#endif
#if defined(GST_IOS_PLUGIN_A52DEC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_DECLARE(a52dec);
#endif
@@ -120,14 +123,20 @@ GST_PLUGIN_STATIC_DECLARE(assrender);
#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
GST_PLUGIN_STATIC_DECLARE(mms);
#endif
+#if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
+GST_PLUGIN_STATIC_DECLARE(rtmp);
+#endif
#if defined(GST_IOS_PLUGIN_OSXAUDIO) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_DECLARE(osxaudio);
#endif
#if defined(GST_IOS_PLUGIN_APPLEMEDIA) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_DECLARE(applemedia);
#endif
-#if defined(GST_IOS_PLUGIN_EGLGLESSINK) || defined(GST_IOS_PLUGINS_SYS)
-GST_PLUGIN_STATIC_DECLARE(eglglessink);
+#if defined(GST_IOS_PLUGIN_SHM) || defined(GST_IOS_PLUGINS_SYS)
+GST_PLUGIN_STATIC_DECLARE(shm);
+#endif
+#if defined(GST_IOS_PLUGIN_OPENGL) || defined(GST_IOS_PLUGINS_SYS)
+GST_PLUGIN_STATIC_DECLARE(opengl);
#endif
#if defined(GST_IOS_PLUGIN_LIBVISUAL) || defined(GST_IOS_PLUGINS_VIS)
GST_PLUGIN_STATIC_DECLARE(libvisual);
@@ -423,6 +432,12 @@ GST_PLUGIN_STATIC_DECLARE(y4mdec);
#if defined(GST_IOS_PLUGIN_JPEGFORMAT) || defined(GST_IOS_PLUGINS_CODECS)
GST_PLUGIN_STATIC_DECLARE(jpegformat);
#endif
+#if defined(GST_IOS_PLUGIN_GDP) || defined(GST_IOS_PLUGINS_CODECS)
+GST_PLUGIN_STATIC_DECLARE(gdp);
+#endif
+#if defined(GST_IOS_PLUGIN_RSVG) || defined(GST_IOS_PLUGINS_CODECS)
+GST_PLUGIN_STATIC_DECLARE(rsvg);
+#endif
#if defined(GST_IOS_PLUGIN_TCP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_DECLARE(tcp);
#endif
@@ -447,10 +462,13 @@ GST_PLUGIN_STATIC_DECLARE(dataurisrc);
#if defined(GST_IOS_PLUGIN_SDP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_DECLARE(sdp);
#endif
+#if defined(GST_IOS_PLUGIN_GNONLIN) || defined(GST_IOS_PLUGINS_EDITING)
+GST_PLUGIN_STATIC_DECLARE(gnonlin);
+#endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
#include <gio/gio.h>
- G_IO_MODULE_DECLARE(gnutls);
+ GST_G_IO_MODULE_DECLARE(gnutls);
#endif
void
@@ -467,6 +485,7 @@ gst_ios_init (void)
const gchar *tmp_dir = [tmp UTF8String];
const gchar *cache_dir = [cache UTF8String];
const gchar *docs_dir = [docs UTF8String];
+ gchar *ca_certificates;
g_setenv ("TMP", tmp_dir, TRUE);
g_setenv ("TEMP", tmp_dir, TRUE);
@@ -480,6 +499,10 @@ gst_ios_init (void)
g_setenv ("XDG_CONFIG_HOME", cache_dir, TRUE);
g_setenv ("XDG_DATA_HOME", resources_dir, TRUE);
g_setenv ("FONTCONFIG_PATH", resources_dir, TRUE);
+
+ ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certifcates.crt", NULL);
+ g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE);
+ g_free (ca_certificates);
gst_init (NULL, NULL);
@@ -558,6 +581,9 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_MPEGTSMUX) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_REGISTER(mpegtsmux);
#endif
+#if defined(GST_IOS_PLUGIN_VOAACENC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
+ GST_PLUGIN_STATIC_REGISTER(voaacenc);
+#endif
#if defined(GST_IOS_PLUGIN_A52DEC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_REGISTER(a52dec);
#endif
@@ -603,14 +629,20 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
GST_PLUGIN_STATIC_REGISTER(mms);
#endif
+#if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
+ GST_PLUGIN_STATIC_REGISTER(rtmp);
+#endif
#if defined(GST_IOS_PLUGIN_OSXAUDIO) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_REGISTER(osxaudio);
#endif
#if defined(GST_IOS_PLUGIN_APPLEMEDIA) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_REGISTER(applemedia);
#endif
-#if defined(GST_IOS_PLUGIN_EGLGLESSINK) || defined(GST_IOS_PLUGINS_SYS)
- GST_PLUGIN_STATIC_REGISTER(eglglessink);
+#if defined(GST_IOS_PLUGIN_SHM) || defined(GST_IOS_PLUGINS_SYS)
+ GST_PLUGIN_STATIC_REGISTER(shm);
+#endif
+#if defined(GST_IOS_PLUGIN_OPENGL) || defined(GST_IOS_PLUGINS_SYS)
+ GST_PLUGIN_STATIC_REGISTER(opengl);
#endif
#if defined(GST_IOS_PLUGIN_LIBVISUAL) || defined(GST_IOS_PLUGINS_VIS)
GST_PLUGIN_STATIC_REGISTER(libvisual);
@@ -906,6 +938,12 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_JPEGFORMAT) || defined(GST_IOS_PLUGINS_CODECS)
GST_PLUGIN_STATIC_REGISTER(jpegformat);
#endif
+#if defined(GST_IOS_PLUGIN_GDP) || defined(GST_IOS_PLUGINS_CODECS)
+ GST_PLUGIN_STATIC_REGISTER(gdp);
+#endif
+#if defined(GST_IOS_PLUGIN_RSVG) || defined(GST_IOS_PLUGINS_CODECS)
+ GST_PLUGIN_STATIC_REGISTER(rsvg);
+#endif
#if defined(GST_IOS_PLUGIN_TCP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_REGISTER(tcp);
#endif
@@ -930,9 +968,12 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_SDP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_REGISTER(sdp);
#endif
+#if defined(GST_IOS_PLUGIN_GNONLIN) || defined(GST_IOS_PLUGINS_EDITING)
+ GST_PLUGIN_STATIC_REGISTER(gnonlin);
+#endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
- G_IO_MODULE_LOAD(gnutls);
+ GST_G_IO_MODULE_LOAD(gnutls);
#endif
/* Lower the ranks of filesrc and giosrc so iosavassetsrc is
diff --git a/gst-sdk/tutorials/xcode iOS/Tutorial 3/gst_ios_init.h b/gst-sdk/tutorials/xcode iOS/Tutorial 3/gst_ios_init.h
index 7d9d70f..f87cfe1 100644
--- a/gst-sdk/tutorials/xcode iOS/Tutorial 3/gst_ios_init.h
+++ b/gst-sdk/tutorials/xcode iOS/Tutorial 3/gst_ios_init.h
@@ -5,6 +5,12 @@
G_BEGIN_DECLS
+#define GST_G_IO_MODULE_DECLARE(name) \
+extern void G_PASTE(g_io_module_, G_PASTE(name, _load_static)) (void)
+
+#define GST_G_IO_MODULE_LOAD(name) \
+G_PASTE(g_io_module_, G_PASTE(name, _load_static)) ()
+
/* Uncomment each line to enable the plugin categories that your application needs.
* You can also enable individual plugins. See gst_ios_init.c to see their names
*/
@@ -21,6 +27,7 @@ G_BEGIN_DECLS
#define GST_IOS_PLUGINS_EFFECTS
//#define GST_IOS_PLUGINS_CODECS
//#define GST_IOS_PLUGINS_NET
+//#define GST_IOS_PLUGINS_EDITING
//#define GST_IOS_GIO_MODULE_GNUTLS
diff --git a/gst-sdk/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m b/gst-sdk/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m
index 7ae9b44..403f9f9 100644
--- a/gst-sdk/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m
+++ b/gst-sdk/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m
@@ -75,6 +75,9 @@ GST_PLUGIN_STATIC_DECLARE(mpegtsdemux);
#if defined(GST_IOS_PLUGIN_MPEGTSMUX) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_DECLARE(mpegtsmux);
#endif
+#if defined(GST_IOS_PLUGIN_VOAACENC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
+GST_PLUGIN_STATIC_DECLARE(voaacenc);
+#endif
#if defined(GST_IOS_PLUGIN_A52DEC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_DECLARE(a52dec);
#endif
@@ -120,14 +123,20 @@ GST_PLUGIN_STATIC_DECLARE(assrender);
#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
GST_PLUGIN_STATIC_DECLARE(mms);
#endif
+#if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
+GST_PLUGIN_STATIC_DECLARE(rtmp);
+#endif
#if defined(GST_IOS_PLUGIN_OSXAUDIO) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_DECLARE(osxaudio);
#endif
#if defined(GST_IOS_PLUGIN_APPLEMEDIA) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_DECLARE(applemedia);
#endif
-#if defined(GST_IOS_PLUGIN_EGLGLESSINK) || defined(GST_IOS_PLUGINS_SYS)
-GST_PLUGIN_STATIC_DECLARE(eglglessink);
+#if defined(GST_IOS_PLUGIN_SHM) || defined(GST_IOS_PLUGINS_SYS)
+GST_PLUGIN_STATIC_DECLARE(shm);
+#endif
+#if defined(GST_IOS_PLUGIN_OPENGL) || defined(GST_IOS_PLUGINS_SYS)
+GST_PLUGIN_STATIC_DECLARE(opengl);
#endif
#if defined(GST_IOS_PLUGIN_LIBVISUAL) || defined(GST_IOS_PLUGINS_VIS)
GST_PLUGIN_STATIC_DECLARE(libvisual);
@@ -423,6 +432,12 @@ GST_PLUGIN_STATIC_DECLARE(y4mdec);
#if defined(GST_IOS_PLUGIN_JPEGFORMAT) || defined(GST_IOS_PLUGINS_CODECS)
GST_PLUGIN_STATIC_DECLARE(jpegformat);
#endif
+#if defined(GST_IOS_PLUGIN_GDP) || defined(GST_IOS_PLUGINS_CODECS)
+GST_PLUGIN_STATIC_DECLARE(gdp);
+#endif
+#if defined(GST_IOS_PLUGIN_RSVG) || defined(GST_IOS_PLUGINS_CODECS)
+GST_PLUGIN_STATIC_DECLARE(rsvg);
+#endif
#if defined(GST_IOS_PLUGIN_TCP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_DECLARE(tcp);
#endif
@@ -447,10 +462,13 @@ GST_PLUGIN_STATIC_DECLARE(dataurisrc);
#if defined(GST_IOS_PLUGIN_SDP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_DECLARE(sdp);
#endif
+#if defined(GST_IOS_PLUGIN_GNONLIN) || defined(GST_IOS_PLUGINS_EDITING)
+GST_PLUGIN_STATIC_DECLARE(gnonlin);
+#endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
#include <gio/gio.h>
- G_IO_MODULE_DECLARE(gnutls);
+ GST_G_IO_MODULE_DECLARE(gnutls);
#endif
void
@@ -467,6 +485,7 @@ gst_ios_init (void)
const gchar *tmp_dir = [tmp UTF8String];
const gchar *cache_dir = [cache UTF8String];
const gchar *docs_dir = [docs UTF8String];
+ gchar *ca_certificates;
g_setenv ("TMP", tmp_dir, TRUE);
g_setenv ("TEMP", tmp_dir, TRUE);
@@ -480,6 +499,10 @@ gst_ios_init (void)
g_setenv ("XDG_CONFIG_HOME", cache_dir, TRUE);
g_setenv ("XDG_DATA_HOME", resources_dir, TRUE);
g_setenv ("FONTCONFIG_PATH", resources_dir, TRUE);
+
+ ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certifcates.crt", NULL);
+ g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE);
+ g_free (ca_certificates);
gst_init (NULL, NULL);
@@ -558,6 +581,9 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_MPEGTSMUX) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_REGISTER(mpegtsmux);
#endif
+#if defined(GST_IOS_PLUGIN_VOAACENC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
+ GST_PLUGIN_STATIC_REGISTER(voaacenc);
+#endif
#if defined(GST_IOS_PLUGIN_A52DEC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_REGISTER(a52dec);
#endif
@@ -603,14 +629,20 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
GST_PLUGIN_STATIC_REGISTER(mms);
#endif
+#if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
+ GST_PLUGIN_STATIC_REGISTER(rtmp);
+#endif
#if defined(GST_IOS_PLUGIN_OSXAUDIO) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_REGISTER(osxaudio);
#endif
#if defined(GST_IOS_PLUGIN_APPLEMEDIA) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_REGISTER(applemedia);
#endif
-#if defined(GST_IOS_PLUGIN_EGLGLESSINK) || defined(GST_IOS_PLUGINS_SYS)
- GST_PLUGIN_STATIC_REGISTER(eglglessink);
+#if defined(GST_IOS_PLUGIN_SHM) || defined(GST_IOS_PLUGINS_SYS)
+ GST_PLUGIN_STATIC_REGISTER(shm);
+#endif
+#if defined(GST_IOS_PLUGIN_OPENGL) || defined(GST_IOS_PLUGINS_SYS)
+ GST_PLUGIN_STATIC_REGISTER(opengl);
#endif
#if defined(GST_IOS_PLUGIN_LIBVISUAL) || defined(GST_IOS_PLUGINS_VIS)
GST_PLUGIN_STATIC_REGISTER(libvisual);
@@ -906,6 +938,12 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_JPEGFORMAT) || defined(GST_IOS_PLUGINS_CODECS)
GST_PLUGIN_STATIC_REGISTER(jpegformat);
#endif
+#if defined(GST_IOS_PLUGIN_GDP) || defined(GST_IOS_PLUGINS_CODECS)
+ GST_PLUGIN_STATIC_REGISTER(gdp);
+#endif
+#if defined(GST_IOS_PLUGIN_RSVG) || defined(GST_IOS_PLUGINS_CODECS)
+ GST_PLUGIN_STATIC_REGISTER(rsvg);
+#endif
#if defined(GST_IOS_PLUGIN_TCP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_REGISTER(tcp);
#endif
@@ -930,9 +968,12 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_SDP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_REGISTER(sdp);
#endif
+#if defined(GST_IOS_PLUGIN_GNONLIN) || defined(GST_IOS_PLUGINS_EDITING)
+ GST_PLUGIN_STATIC_REGISTER(gnonlin);
+#endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
- G_IO_MODULE_LOAD(gnutls);
+ GST_G_IO_MODULE_LOAD(gnutls);
#endif
/* Lower the ranks of filesrc and giosrc so iosavassetsrc is
diff --git a/gst-sdk/tutorials/xcode iOS/Tutorial 4/gst_ios_init.h b/gst-sdk/tutorials/xcode iOS/Tutorial 4/gst_ios_init.h
index 5706402..79ee758 100644
--- a/gst-sdk/tutorials/xcode iOS/Tutorial 4/gst_ios_init.h
+++ b/gst-sdk/tutorials/xcode iOS/Tutorial 4/gst_ios_init.h
@@ -5,6 +5,12 @@
G_BEGIN_DECLS
+#define GST_G_IO_MODULE_DECLARE(name) \
+extern void G_PASTE(g_io_module_, G_PASTE(name, _load_static)) (void)
+
+#define GST_G_IO_MODULE_LOAD(name) \
+G_PASTE(g_io_module_, G_PASTE(name, _load_static)) ()
+
/* Uncomment each line to enable the plugin categories that your application needs.
* You can also enable individual plugins. See gst_ios_init.c to see their names
*/
@@ -21,6 +27,7 @@ G_BEGIN_DECLS
//#define GST_IOS_PLUGINS_EFFECTS
#define GST_IOS_PLUGINS_CODECS
#define GST_IOS_PLUGINS_NET
+//#define GST_IOS_PLUGINS_EDITING
//#define GST_IOS_GIO_MODULE_GNUTLS
diff --git a/gst-sdk/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m b/gst-sdk/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m
index 7ae9b44..403f9f9 100644
--- a/gst-sdk/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m
+++ b/gst-sdk/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m
@@ -75,6 +75,9 @@ GST_PLUGIN_STATIC_DECLARE(mpegtsdemux);
#if defined(GST_IOS_PLUGIN_MPEGTSMUX) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_DECLARE(mpegtsmux);
#endif
+#if defined(GST_IOS_PLUGIN_VOAACENC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
+GST_PLUGIN_STATIC_DECLARE(voaacenc);
+#endif
#if defined(GST_IOS_PLUGIN_A52DEC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_DECLARE(a52dec);
#endif
@@ -120,14 +123,20 @@ GST_PLUGIN_STATIC_DECLARE(assrender);
#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
GST_PLUGIN_STATIC_DECLARE(mms);
#endif
+#if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
+GST_PLUGIN_STATIC_DECLARE(rtmp);
+#endif
#if defined(GST_IOS_PLUGIN_OSXAUDIO) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_DECLARE(osxaudio);
#endif
#if defined(GST_IOS_PLUGIN_APPLEMEDIA) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_DECLARE(applemedia);
#endif
-#if defined(GST_IOS_PLUGIN_EGLGLESSINK) || defined(GST_IOS_PLUGINS_SYS)
-GST_PLUGIN_STATIC_DECLARE(eglglessink);
+#if defined(GST_IOS_PLUGIN_SHM) || defined(GST_IOS_PLUGINS_SYS)
+GST_PLUGIN_STATIC_DECLARE(shm);
+#endif
+#if defined(GST_IOS_PLUGIN_OPENGL) || defined(GST_IOS_PLUGINS_SYS)
+GST_PLUGIN_STATIC_DECLARE(opengl);
#endif
#if defined(GST_IOS_PLUGIN_LIBVISUAL) || defined(GST_IOS_PLUGINS_VIS)
GST_PLUGIN_STATIC_DECLARE(libvisual);
@@ -423,6 +432,12 @@ GST_PLUGIN_STATIC_DECLARE(y4mdec);
#if defined(GST_IOS_PLUGIN_JPEGFORMAT) || defined(GST_IOS_PLUGINS_CODECS)
GST_PLUGIN_STATIC_DECLARE(jpegformat);
#endif
+#if defined(GST_IOS_PLUGIN_GDP) || defined(GST_IOS_PLUGINS_CODECS)
+GST_PLUGIN_STATIC_DECLARE(gdp);
+#endif
+#if defined(GST_IOS_PLUGIN_RSVG) || defined(GST_IOS_PLUGINS_CODECS)
+GST_PLUGIN_STATIC_DECLARE(rsvg);
+#endif
#if defined(GST_IOS_PLUGIN_TCP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_DECLARE(tcp);
#endif
@@ -447,10 +462,13 @@ GST_PLUGIN_STATIC_DECLARE(dataurisrc);
#if defined(GST_IOS_PLUGIN_SDP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_DECLARE(sdp);
#endif
+#if defined(GST_IOS_PLUGIN_GNONLIN) || defined(GST_IOS_PLUGINS_EDITING)
+GST_PLUGIN_STATIC_DECLARE(gnonlin);
+#endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
#include <gio/gio.h>
- G_IO_MODULE_DECLARE(gnutls);
+ GST_G_IO_MODULE_DECLARE(gnutls);
#endif
void
@@ -467,6 +485,7 @@ gst_ios_init (void)
const gchar *tmp_dir = [tmp UTF8String];
const gchar *cache_dir = [cache UTF8String];
const gchar *docs_dir = [docs UTF8String];
+ gchar *ca_certificates;
g_setenv ("TMP", tmp_dir, TRUE);
g_setenv ("TEMP", tmp_dir, TRUE);
@@ -480,6 +499,10 @@ gst_ios_init (void)
g_setenv ("XDG_CONFIG_HOME", cache_dir, TRUE);
g_setenv ("XDG_DATA_HOME", resources_dir, TRUE);
g_setenv ("FONTCONFIG_PATH", resources_dir, TRUE);
+
+ ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certifcates.crt", NULL);
+ g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE);
+ g_free (ca_certificates);
gst_init (NULL, NULL);
@@ -558,6 +581,9 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_MPEGTSMUX) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_REGISTER(mpegtsmux);
#endif
+#if defined(GST_IOS_PLUGIN_VOAACENC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
+ GST_PLUGIN_STATIC_REGISTER(voaacenc);
+#endif
#if defined(GST_IOS_PLUGIN_A52DEC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_REGISTER(a52dec);
#endif
@@ -603,14 +629,20 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
GST_PLUGIN_STATIC_REGISTER(mms);
#endif
+#if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
+ GST_PLUGIN_STATIC_REGISTER(rtmp);
+#endif
#if defined(GST_IOS_PLUGIN_OSXAUDIO) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_REGISTER(osxaudio);
#endif
#if defined(GST_IOS_PLUGIN_APPLEMEDIA) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_REGISTER(applemedia);
#endif
-#if defined(GST_IOS_PLUGIN_EGLGLESSINK) || defined(GST_IOS_PLUGINS_SYS)
- GST_PLUGIN_STATIC_REGISTER(eglglessink);
+#if defined(GST_IOS_PLUGIN_SHM) || defined(GST_IOS_PLUGINS_SYS)
+ GST_PLUGIN_STATIC_REGISTER(shm);
+#endif
+#if defined(GST_IOS_PLUGIN_OPENGL) || defined(GST_IOS_PLUGINS_SYS)
+ GST_PLUGIN_STATIC_REGISTER(opengl);
#endif
#if defined(GST_IOS_PLUGIN_LIBVISUAL) || defined(GST_IOS_PLUGINS_VIS)
GST_PLUGIN_STATIC_REGISTER(libvisual);
@@ -906,6 +938,12 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_JPEGFORMAT) || defined(GST_IOS_PLUGINS_CODECS)
GST_PLUGIN_STATIC_REGISTER(jpegformat);
#endif
+#if defined(GST_IOS_PLUGIN_GDP) || defined(GST_IOS_PLUGINS_CODECS)
+ GST_PLUGIN_STATIC_REGISTER(gdp);
+#endif
+#if defined(GST_IOS_PLUGIN_RSVG) || defined(GST_IOS_PLUGINS_CODECS)
+ GST_PLUGIN_STATIC_REGISTER(rsvg);
+#endif
#if defined(GST_IOS_PLUGIN_TCP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_REGISTER(tcp);
#endif
@@ -930,9 +968,12 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_SDP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_REGISTER(sdp);
#endif
+#if defined(GST_IOS_PLUGIN_GNONLIN) || defined(GST_IOS_PLUGINS_EDITING)
+ GST_PLUGIN_STATIC_REGISTER(gnonlin);
+#endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
- G_IO_MODULE_LOAD(gnutls);
+ GST_G_IO_MODULE_LOAD(gnutls);
#endif
/* Lower the ranks of filesrc and giosrc so iosavassetsrc is
diff --git a/gst-sdk/tutorials/xcode iOS/Tutorial 5/gst_ios_init.h b/gst-sdk/tutorials/xcode iOS/Tutorial 5/gst_ios_init.h
index 5706402..79ee758 100644
--- a/gst-sdk/tutorials/xcode iOS/Tutorial 5/gst_ios_init.h
+++ b/gst-sdk/tutorials/xcode iOS/Tutorial 5/gst_ios_init.h
@@ -5,6 +5,12 @@
G_BEGIN_DECLS
+#define GST_G_IO_MODULE_DECLARE(name) \
+extern void G_PASTE(g_io_module_, G_PASTE(name, _load_static)) (void)
+
+#define GST_G_IO_MODULE_LOAD(name) \
+G_PASTE(g_io_module_, G_PASTE(name, _load_static)) ()
+
/* Uncomment each line to enable the plugin categories that your application needs.
* You can also enable individual plugins. See gst_ios_init.c to see their names
*/
@@ -21,6 +27,7 @@ G_BEGIN_DECLS
//#define GST_IOS_PLUGINS_EFFECTS
#define GST_IOS_PLUGINS_CODECS
#define GST_IOS_PLUGINS_NET
+//#define GST_IOS_PLUGINS_EDITING
//#define GST_IOS_GIO_MODULE_GNUTLS
diff --git a/gst-sdk/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m b/gst-sdk/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m
index 7ae9b44..403f9f9 100644
--- a/gst-sdk/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m
+++ b/gst-sdk/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m
@@ -75,6 +75,9 @@ GST_PLUGIN_STATIC_DECLARE(mpegtsdemux);
#if defined(GST_IOS_PLUGIN_MPEGTSMUX) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_DECLARE(mpegtsmux);
#endif
+#if defined(GST_IOS_PLUGIN_VOAACENC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
+GST_PLUGIN_STATIC_DECLARE(voaacenc);
+#endif
#if defined(GST_IOS_PLUGIN_A52DEC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_DECLARE(a52dec);
#endif
@@ -120,14 +123,20 @@ GST_PLUGIN_STATIC_DECLARE(assrender);
#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
GST_PLUGIN_STATIC_DECLARE(mms);
#endif
+#if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
+GST_PLUGIN_STATIC_DECLARE(rtmp);
+#endif
#if defined(GST_IOS_PLUGIN_OSXAUDIO) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_DECLARE(osxaudio);
#endif
#if defined(GST_IOS_PLUGIN_APPLEMEDIA) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_DECLARE(applemedia);
#endif
-#if defined(GST_IOS_PLUGIN_EGLGLESSINK) || defined(GST_IOS_PLUGINS_SYS)
-GST_PLUGIN_STATIC_DECLARE(eglglessink);
+#if defined(GST_IOS_PLUGIN_SHM) || defined(GST_IOS_PLUGINS_SYS)
+GST_PLUGIN_STATIC_DECLARE(shm);
+#endif
+#if defined(GST_IOS_PLUGIN_OPENGL) || defined(GST_IOS_PLUGINS_SYS)
+GST_PLUGIN_STATIC_DECLARE(opengl);
#endif
#if defined(GST_IOS_PLUGIN_LIBVISUAL) || defined(GST_IOS_PLUGINS_VIS)
GST_PLUGIN_STATIC_DECLARE(libvisual);
@@ -423,6 +432,12 @@ GST_PLUGIN_STATIC_DECLARE(y4mdec);
#if defined(GST_IOS_PLUGIN_JPEGFORMAT) || defined(GST_IOS_PLUGINS_CODECS)
GST_PLUGIN_STATIC_DECLARE(jpegformat);
#endif
+#if defined(GST_IOS_PLUGIN_GDP) || defined(GST_IOS_PLUGINS_CODECS)
+GST_PLUGIN_STATIC_DECLARE(gdp);
+#endif
+#if defined(GST_IOS_PLUGIN_RSVG) || defined(GST_IOS_PLUGINS_CODECS)
+GST_PLUGIN_STATIC_DECLARE(rsvg);
+#endif
#if defined(GST_IOS_PLUGIN_TCP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_DECLARE(tcp);
#endif
@@ -447,10 +462,13 @@ GST_PLUGIN_STATIC_DECLARE(dataurisrc);
#if defined(GST_IOS_PLUGIN_SDP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_DECLARE(sdp);
#endif
+#if defined(GST_IOS_PLUGIN_GNONLIN) || defined(GST_IOS_PLUGINS_EDITING)
+GST_PLUGIN_STATIC_DECLARE(gnonlin);
+#endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
#include <gio/gio.h>
- G_IO_MODULE_DECLARE(gnutls);
+ GST_G_IO_MODULE_DECLARE(gnutls);
#endif
void
@@ -467,6 +485,7 @@ gst_ios_init (void)
const gchar *tmp_dir = [tmp UTF8String];
const gchar *cache_dir = [cache UTF8String];
const gchar *docs_dir = [docs UTF8String];
+ gchar *ca_certificates;
g_setenv ("TMP", tmp_dir, TRUE);
g_setenv ("TEMP", tmp_dir, TRUE);
@@ -480,6 +499,10 @@ gst_ios_init (void)
g_setenv ("XDG_CONFIG_HOME", cache_dir, TRUE);
g_setenv ("XDG_DATA_HOME", resources_dir, TRUE);
g_setenv ("FONTCONFIG_PATH", resources_dir, TRUE);
+
+ ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certifcates.crt", NULL);
+ g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE);
+ g_free (ca_certificates);
gst_init (NULL, NULL);
@@ -558,6 +581,9 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_MPEGTSMUX) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_REGISTER(mpegtsmux);
#endif
+#if defined(GST_IOS_PLUGIN_VOAACENC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
+ GST_PLUGIN_STATIC_REGISTER(voaacenc);
+#endif
#if defined(GST_IOS_PLUGIN_A52DEC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
GST_PLUGIN_STATIC_REGISTER(a52dec);
#endif
@@ -603,14 +629,20 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_MMS) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
GST_PLUGIN_STATIC_REGISTER(mms);
#endif
+#if defined(GST_IOS_PLUGIN_RTMP) || defined(GST_IOS_PLUGINS_NET_RESTRICTED)
+ GST_PLUGIN_STATIC_REGISTER(rtmp);
+#endif
#if defined(GST_IOS_PLUGIN_OSXAUDIO) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_REGISTER(osxaudio);
#endif
#if defined(GST_IOS_PLUGIN_APPLEMEDIA) || defined(GST_IOS_PLUGINS_SYS)
GST_PLUGIN_STATIC_REGISTER(applemedia);
#endif
-#if defined(GST_IOS_PLUGIN_EGLGLESSINK) || defined(GST_IOS_PLUGINS_SYS)
- GST_PLUGIN_STATIC_REGISTER(eglglessink);
+#if defined(GST_IOS_PLUGIN_SHM) || defined(GST_IOS_PLUGINS_SYS)
+ GST_PLUGIN_STATIC_REGISTER(shm);
+#endif
+#if defined(GST_IOS_PLUGIN_OPENGL) || defined(GST_IOS_PLUGINS_SYS)
+ GST_PLUGIN_STATIC_REGISTER(opengl);
#endif
#if defined(GST_IOS_PLUGIN_LIBVISUAL) || defined(GST_IOS_PLUGINS_VIS)
GST_PLUGIN_STATIC_REGISTER(libvisual);
@@ -906,6 +938,12 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_JPEGFORMAT) || defined(GST_IOS_PLUGINS_CODECS)
GST_PLUGIN_STATIC_REGISTER(jpegformat);
#endif
+#if defined(GST_IOS_PLUGIN_GDP) || defined(GST_IOS_PLUGINS_CODECS)
+ GST_PLUGIN_STATIC_REGISTER(gdp);
+#endif
+#if defined(GST_IOS_PLUGIN_RSVG) || defined(GST_IOS_PLUGINS_CODECS)
+ GST_PLUGIN_STATIC_REGISTER(rsvg);
+#endif
#if defined(GST_IOS_PLUGIN_TCP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_REGISTER(tcp);
#endif
@@ -930,9 +968,12 @@ gst_ios_init (void)
#if defined(GST_IOS_PLUGIN_SDP) || defined(GST_IOS_PLUGINS_NET)
GST_PLUGIN_STATIC_REGISTER(sdp);
#endif
+#if defined(GST_IOS_PLUGIN_GNONLIN) || defined(GST_IOS_PLUGINS_EDITING)
+ GST_PLUGIN_STATIC_REGISTER(gnonlin);
+#endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
- G_IO_MODULE_LOAD(gnutls);
+ GST_G_IO_MODULE_LOAD(gnutls);
#endif
/* Lower the ranks of filesrc and giosrc so iosavassetsrc is