projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a3d00f3)
docs:examples: Fix building iOS examples
authorThibault Saunier <tsaunier@igalia.com>
Thu, 21 Apr 2022 13:18:56 +0000 (09:18 -0400)
committerThibault Saunier <tsaunier@igalia.com>
Thu, 21 Apr 2022 13:18:56 +0000 (09:18 -0400)
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2264>

subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m patch | blob | history
subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m patch | blob | history
subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m patch | blob | history
subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m patch | blob | history
subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m patch | blob | history
subprojects/gst-examples/playback/player/ios/GstPlay/gst_ios_init.m patch | blob | history

diff --git a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m
index f5903be..7395296 100644 (file)
--- a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m
+++ b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m
@@ -47,15 +47,12 @@ GST_PLUGIN_STATIC_DECLARE(rawparse);
 #if defined(GST_IOS_PLUGIN_TYPEFINDFUNCTIONS) || defined(GST_IOS_PLUGINS_CORE)
 GST_PLUGIN_STATIC_DECLARE(typefindfunctions);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOCONVERT) || defined(GST_IOS_PLUGINS_CORE)
-GST_PLUGIN_STATIC_DECLARE(videoconvert);
+#if defined(GST_IOS_PLUGIN_VIDEOCONVERTSCALE) || defined(GST_IOS_PLUGINS_CORE)
+GST_PLUGIN_STATIC_DECLARE(videoconvertscale);
 #endif
 #if defined(GST_IOS_PLUGIN_VIDEORATE) || defined(GST_IOS_PLUGINS_CORE)
 GST_PLUGIN_STATIC_DECLARE(videorate);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOSCALE) || defined(GST_IOS_PLUGINS_CORE)
-GST_PLUGIN_STATIC_DECLARE(videoscale);
-#endif
 #if defined(GST_IOS_PLUGIN_VIDEOTESTSRC) || defined(GST_IOS_PLUGINS_CORE)
 GST_PLUGIN_STATIC_DECLARE(videotestsrc);
 #endif
@@ -619,15 +616,12 @@ gst_ios_init (void)
 #if defined(GST_IOS_PLUGIN_TYPEFINDFUNCTIONS) || defined(GST_IOS_PLUGINS_CORE)
     GST_PLUGIN_STATIC_REGISTER(typefindfunctions);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOCONVERT) || defined(GST_IOS_PLUGINS_CORE)
-    GST_PLUGIN_STATIC_REGISTER(videoconvert);
+#if defined(GST_IOS_PLUGIN_VIDEOCONVERTSCALE) || defined(GST_IOS_PLUGINS_CORE)
+    GST_PLUGIN_STATIC_REGISTER(videoconvertscale);
 #endif
 #if defined(GST_IOS_PLUGIN_VIDEORATE) || defined(GST_IOS_PLUGINS_CORE)
     GST_PLUGIN_STATIC_REGISTER(videorate);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOSCALE) || defined(GST_IOS_PLUGINS_CORE)
-    GST_PLUGIN_STATIC_REGISTER(videoscale);
-#endif
 #if defined(GST_IOS_PLUGIN_VIDEOTESTSRC) || defined(GST_IOS_PLUGINS_CORE)
     GST_PLUGIN_STATIC_REGISTER(videotestsrc);
 #endif
diff --git a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m
index f5903be..7395296 100644 (file)
--- a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m
+++ b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m
@@ -47,15 +47,12 @@ GST_PLUGIN_STATIC_DECLARE(rawparse);
 #if defined(GST_IOS_PLUGIN_TYPEFINDFUNCTIONS) || defined(GST_IOS_PLUGINS_CORE)
 GST_PLUGIN_STATIC_DECLARE(typefindfunctions);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOCONVERT) || defined(GST_IOS_PLUGINS_CORE)
-GST_PLUGIN_STATIC_DECLARE(videoconvert);
+#if defined(GST_IOS_PLUGIN_VIDEOCONVERTSCALE) || defined(GST_IOS_PLUGINS_CORE)
+GST_PLUGIN_STATIC_DECLARE(videoconvertscale);
 #endif
 #if defined(GST_IOS_PLUGIN_VIDEORATE) || defined(GST_IOS_PLUGINS_CORE)
 GST_PLUGIN_STATIC_DECLARE(videorate);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOSCALE) || defined(GST_IOS_PLUGINS_CORE)
-GST_PLUGIN_STATIC_DECLARE(videoscale);
-#endif
 #if defined(GST_IOS_PLUGIN_VIDEOTESTSRC) || defined(GST_IOS_PLUGINS_CORE)
 GST_PLUGIN_STATIC_DECLARE(videotestsrc);
 #endif
@@ -619,15 +616,12 @@ gst_ios_init (void)
 #if defined(GST_IOS_PLUGIN_TYPEFINDFUNCTIONS) || defined(GST_IOS_PLUGINS_CORE)
     GST_PLUGIN_STATIC_REGISTER(typefindfunctions);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOCONVERT) || defined(GST_IOS_PLUGINS_CORE)
-    GST_PLUGIN_STATIC_REGISTER(videoconvert);
+#if defined(GST_IOS_PLUGIN_VIDEOCONVERTSCALE) || defined(GST_IOS_PLUGINS_CORE)
+    GST_PLUGIN_STATIC_REGISTER(videoconvertscale);
 #endif
 #if defined(GST_IOS_PLUGIN_VIDEORATE) || defined(GST_IOS_PLUGINS_CORE)
     GST_PLUGIN_STATIC_REGISTER(videorate);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOSCALE) || defined(GST_IOS_PLUGINS_CORE)
-    GST_PLUGIN_STATIC_REGISTER(videoscale);
-#endif
 #if defined(GST_IOS_PLUGIN_VIDEOTESTSRC) || defined(GST_IOS_PLUGINS_CORE)
     GST_PLUGIN_STATIC_REGISTER(videotestsrc);
 #endif
diff --git a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m
index f5903be..7395296 100644 (file)
--- a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m
+++ b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m
@@ -47,15 +47,12 @@ GST_PLUGIN_STATIC_DECLARE(rawparse);
 #if defined(GST_IOS_PLUGIN_TYPEFINDFUNCTIONS) || defined(GST_IOS_PLUGINS_CORE)
 GST_PLUGIN_STATIC_DECLARE(typefindfunctions);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOCONVERT) || defined(GST_IOS_PLUGINS_CORE)
-GST_PLUGIN_STATIC_DECLARE(videoconvert);
+#if defined(GST_IOS_PLUGIN_VIDEOCONVERTSCALE) || defined(GST_IOS_PLUGINS_CORE)
+GST_PLUGIN_STATIC_DECLARE(videoconvertscale);
 #endif
 #if defined(GST_IOS_PLUGIN_VIDEORATE) || defined(GST_IOS_PLUGINS_CORE)
 GST_PLUGIN_STATIC_DECLARE(videorate);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOSCALE) || defined(GST_IOS_PLUGINS_CORE)
-GST_PLUGIN_STATIC_DECLARE(videoscale);
-#endif
 #if defined(GST_IOS_PLUGIN_VIDEOTESTSRC) || defined(GST_IOS_PLUGINS_CORE)
 GST_PLUGIN_STATIC_DECLARE(videotestsrc);
 #endif
@@ -619,15 +616,12 @@ gst_ios_init (void)
 #if defined(GST_IOS_PLUGIN_TYPEFINDFUNCTIONS) || defined(GST_IOS_PLUGINS_CORE)
     GST_PLUGIN_STATIC_REGISTER(typefindfunctions);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOCONVERT) || defined(GST_IOS_PLUGINS_CORE)
-    GST_PLUGIN_STATIC_REGISTER(videoconvert);
+#if defined(GST_IOS_PLUGIN_VIDEOCONVERTSCALE) || defined(GST_IOS_PLUGINS_CORE)
+    GST_PLUGIN_STATIC_REGISTER(videoconvertscale);
 #endif
 #if defined(GST_IOS_PLUGIN_VIDEORATE) || defined(GST_IOS_PLUGINS_CORE)
     GST_PLUGIN_STATIC_REGISTER(videorate);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOSCALE) || defined(GST_IOS_PLUGINS_CORE)
-    GST_PLUGIN_STATIC_REGISTER(videoscale);
-#endif
 #if defined(GST_IOS_PLUGIN_VIDEOTESTSRC) || defined(GST_IOS_PLUGINS_CORE)
     GST_PLUGIN_STATIC_REGISTER(videotestsrc);
 #endif
diff --git a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m
index f5903be..7395296 100644 (file)
--- a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m
+++ b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m
@@ -47,15 +47,12 @@ GST_PLUGIN_STATIC_DECLARE(rawparse);
 #if defined(GST_IOS_PLUGIN_TYPEFINDFUNCTIONS) || defined(GST_IOS_PLUGINS_CORE)
 GST_PLUGIN_STATIC_DECLARE(typefindfunctions);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOCONVERT) || defined(GST_IOS_PLUGINS_CORE)
-GST_PLUGIN_STATIC_DECLARE(videoconvert);
+#if defined(GST_IOS_PLUGIN_VIDEOCONVERTSCALE) || defined(GST_IOS_PLUGINS_CORE)
+GST_PLUGIN_STATIC_DECLARE(videoconvertscale);
 #endif
 #if defined(GST_IOS_PLUGIN_VIDEORATE) || defined(GST_IOS_PLUGINS_CORE)
 GST_PLUGIN_STATIC_DECLARE(videorate);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOSCALE) || defined(GST_IOS_PLUGINS_CORE)
-GST_PLUGIN_STATIC_DECLARE(videoscale);
-#endif
 #if defined(GST_IOS_PLUGIN_VIDEOTESTSRC) || defined(GST_IOS_PLUGINS_CORE)
 GST_PLUGIN_STATIC_DECLARE(videotestsrc);
 #endif
@@ -619,15 +616,12 @@ gst_ios_init (void)
 #if defined(GST_IOS_PLUGIN_TYPEFINDFUNCTIONS) || defined(GST_IOS_PLUGINS_CORE)
     GST_PLUGIN_STATIC_REGISTER(typefindfunctions);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOCONVERT) || defined(GST_IOS_PLUGINS_CORE)
-    GST_PLUGIN_STATIC_REGISTER(videoconvert);
+#if defined(GST_IOS_PLUGIN_VIDEOCONVERTSCALE) || defined(GST_IOS_PLUGINS_CORE)
+    GST_PLUGIN_STATIC_REGISTER(videoconvertscale);
 #endif
 #if defined(GST_IOS_PLUGIN_VIDEORATE) || defined(GST_IOS_PLUGINS_CORE)
     GST_PLUGIN_STATIC_REGISTER(videorate);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOSCALE) || defined(GST_IOS_PLUGINS_CORE)
-    GST_PLUGIN_STATIC_REGISTER(videoscale);
-#endif
 #if defined(GST_IOS_PLUGIN_VIDEOTESTSRC) || defined(GST_IOS_PLUGINS_CORE)
     GST_PLUGIN_STATIC_REGISTER(videotestsrc);
 #endif
diff --git a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m
index f5903be..7395296 100644 (file)
--- a/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m
+++ b/subprojects/gst-docs/examples/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m
@@ -47,15 +47,12 @@ GST_PLUGIN_STATIC_DECLARE(rawparse);
 #if defined(GST_IOS_PLUGIN_TYPEFINDFUNCTIONS) || defined(GST_IOS_PLUGINS_CORE)
 GST_PLUGIN_STATIC_DECLARE(typefindfunctions);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOCONVERT) || defined(GST_IOS_PLUGINS_CORE)
-GST_PLUGIN_STATIC_DECLARE(videoconvert);
+#if defined(GST_IOS_PLUGIN_VIDEOCONVERTSCALE) || defined(GST_IOS_PLUGINS_CORE)
+GST_PLUGIN_STATIC_DECLARE(videoconvertscale);
 #endif
 #if defined(GST_IOS_PLUGIN_VIDEORATE) || defined(GST_IOS_PLUGINS_CORE)
 GST_PLUGIN_STATIC_DECLARE(videorate);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOSCALE) || defined(GST_IOS_PLUGINS_CORE)
-GST_PLUGIN_STATIC_DECLARE(videoscale);
-#endif
 #if defined(GST_IOS_PLUGIN_VIDEOTESTSRC) || defined(GST_IOS_PLUGINS_CORE)
 GST_PLUGIN_STATIC_DECLARE(videotestsrc);
 #endif
@@ -619,15 +616,12 @@ gst_ios_init (void)
 #if defined(GST_IOS_PLUGIN_TYPEFINDFUNCTIONS) || defined(GST_IOS_PLUGINS_CORE)
     GST_PLUGIN_STATIC_REGISTER(typefindfunctions);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOCONVERT) || defined(GST_IOS_PLUGINS_CORE)
-    GST_PLUGIN_STATIC_REGISTER(videoconvert);
+#if defined(GST_IOS_PLUGIN_VIDEOCONVERTSCALE) || defined(GST_IOS_PLUGINS_CORE)
+    GST_PLUGIN_STATIC_REGISTER(videoconvertscale);
 #endif
 #if defined(GST_IOS_PLUGIN_VIDEORATE) || defined(GST_IOS_PLUGINS_CORE)
     GST_PLUGIN_STATIC_REGISTER(videorate);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOSCALE) || defined(GST_IOS_PLUGINS_CORE)
-    GST_PLUGIN_STATIC_REGISTER(videoscale);
-#endif
 #if defined(GST_IOS_PLUGIN_VIDEOTESTSRC) || defined(GST_IOS_PLUGINS_CORE)
     GST_PLUGIN_STATIC_REGISTER(videotestsrc);
 #endif
diff --git a/subprojects/gst-examples/playback/player/ios/GstPlay/gst_ios_init.m b/subprojects/gst-examples/playback/player/ios/GstPlay/gst_ios_init.m
index f5903be..7395296 100644 (file)
--- a/subprojects/gst-examples/playback/player/ios/GstPlay/gst_ios_init.m
+++ b/subprojects/gst-examples/playback/player/ios/GstPlay/gst_ios_init.m
@@ -47,15 +47,12 @@ GST_PLUGIN_STATIC_DECLARE(rawparse);
 #if defined(GST_IOS_PLUGIN_TYPEFINDFUNCTIONS) || defined(GST_IOS_PLUGINS_CORE)
 GST_PLUGIN_STATIC_DECLARE(typefindfunctions);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOCONVERT) || defined(GST_IOS_PLUGINS_CORE)
-GST_PLUGIN_STATIC_DECLARE(videoconvert);
+#if defined(GST_IOS_PLUGIN_VIDEOCONVERTSCALE) || defined(GST_IOS_PLUGINS_CORE)
+GST_PLUGIN_STATIC_DECLARE(videoconvertscale);
 #endif
 #if defined(GST_IOS_PLUGIN_VIDEORATE) || defined(GST_IOS_PLUGINS_CORE)
 GST_PLUGIN_STATIC_DECLARE(videorate);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOSCALE) || defined(GST_IOS_PLUGINS_CORE)
-GST_PLUGIN_STATIC_DECLARE(videoscale);
-#endif
 #if defined(GST_IOS_PLUGIN_VIDEOTESTSRC) || defined(GST_IOS_PLUGINS_CORE)
 GST_PLUGIN_STATIC_DECLARE(videotestsrc);
 #endif
@@ -619,15 +616,12 @@ gst_ios_init (void)
 #if defined(GST_IOS_PLUGIN_TYPEFINDFUNCTIONS) || defined(GST_IOS_PLUGINS_CORE)
     GST_PLUGIN_STATIC_REGISTER(typefindfunctions);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOCONVERT) || defined(GST_IOS_PLUGINS_CORE)
-    GST_PLUGIN_STATIC_REGISTER(videoconvert);
+#if defined(GST_IOS_PLUGIN_VIDEOCONVERTSCALE) || defined(GST_IOS_PLUGINS_CORE)
+    GST_PLUGIN_STATIC_REGISTER(videoconvertscale);
 #endif
 #if defined(GST_IOS_PLUGIN_VIDEORATE) || defined(GST_IOS_PLUGINS_CORE)
     GST_PLUGIN_STATIC_REGISTER(videorate);
 #endif
-#if defined(GST_IOS_PLUGIN_VIDEOSCALE) || defined(GST_IOS_PLUGINS_CORE)
-    GST_PLUGIN_STATIC_REGISTER(videoscale);
-#endif
 #if defined(GST_IOS_PLUGIN_VIDEOTESTSRC) || defined(GST_IOS_PLUGINS_CORE)
     GST_PLUGIN_STATIC_REGISTER(videotestsrc);
 #endif
Domain: Multimedia / Media Common;