From f90916f4bbdbc14975fbbb362dbce13511720881 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Thu, 21 Apr 2022 09:18:56 -0400 Subject: [PATCH] docs:examples: Fix building iOS examples Part-of: --- .../examples/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m | 14 ++++---------- .../examples/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m | 14 ++++---------- .../examples/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m | 14 ++++---------- .../examples/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m | 14 ++++---------- .../examples/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m | 14 ++++---------- .../playback/player/ios/GstPlay/gst_ios_init.m | 14 ++++---------- 6 files changed, 24 insertions(+), 60 deletions(-) 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 -- 2.7.4