From f106d6e264348875a0b2c78803001248ba12fe22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 21 Jul 2014 16:50:17 +0200 Subject: [PATCH] ios: Update gst_ios_init.[hm] files for 1.4.0 --- .../xcode iOS/Tutorial 1/gst_ios_init.h | 7 +++ .../xcode iOS/Tutorial 1/gst_ios_init.m | 53 ++++++++++++++++--- .../xcode iOS/Tutorial 2/gst_ios_init.h | 7 +++ .../xcode iOS/Tutorial 2/gst_ios_init.m | 53 ++++++++++++++++--- .../xcode iOS/Tutorial 3/gst_ios_init.h | 7 +++ .../xcode iOS/Tutorial 3/gst_ios_init.m | 53 ++++++++++++++++--- .../xcode iOS/Tutorial 4/gst_ios_init.h | 7 +++ .../xcode iOS/Tutorial 4/gst_ios_init.m | 53 ++++++++++++++++--- .../xcode iOS/Tutorial 5/gst_ios_init.h | 7 +++ .../xcode iOS/Tutorial 5/gst_ios_init.m | 53 ++++++++++++++++--- 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 4d8b22ad93..c5c929fa16 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 7ae9b4447b..403f9f9c17 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 - 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 90acb3eba7..b1471b25a3 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 7ae9b4447b..403f9f9c17 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 - 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 7d9d70f9cb..f87cfe17a4 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 7ae9b4447b..403f9f9c17 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 - 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 57064020b4..79ee758a4e 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 7ae9b4447b..403f9f9c17 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 - 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 57064020b4..79ee758a4e 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 7ae9b4447b..403f9f9c17 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 - 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