mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-03 06:56:46 +00:00
playback/player/ios: Updated the iOS example in order to be compatible with the latest GStreamer as well as Apple Hardware
-) Disabled bitcode generation -) Removed/Renamed several plugins in the gst_ios_init.m
This commit is contained in:
Simon Himmelbauer
Sebastian Dröge
parent
1e0b3ed778
commit
9ebe002f51
3 changed files with 35 additions and 34 deletions
|
|
@ -23,6 +23,7 @@
|
|||
AD2B885C198D65470070367B /* MainStoryboard_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AD2B885A198D65470070367B /* MainStoryboard_iPad.storyboard */; };
|
||||
AD2B8861198D65780070367B /* LibraryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AD2B885E198D65780070367B /* LibraryViewController.m */; };
|
||||
AD2B8862198D65780070367B /* VideoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AD2B8860198D65780070367B /* VideoViewController.m */; };
|
||||
F4D8C7D71ED455260019B8A3 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = F4D8C7D61ED455260019B8A3 /* libiconv.tbd */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXFileReference section */
|
||||
|
|
@ -51,6 +52,7 @@
|
|||
AD2B885E198D65780070367B /* LibraryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LibraryViewController.m; sourceTree = "<group>"; };
|
||||
AD2B885F198D65780070367B /* VideoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoViewController.h; sourceTree = "<group>"; };
|
||||
AD2B8860198D65780070367B /* VideoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VideoViewController.m; sourceTree = "<group>"; };
|
||||
F4D8C7D61ED455260019B8A3 /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXFrameworksBuildPhase section */
|
||||
|
|
@ -58,6 +60,7 @@
|
|||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
F4D8C7D71ED455260019B8A3 /* libiconv.tbd in Frameworks */,
|
||||
AD2B8821198D631B0070367B /* CoreGraphics.framework in Frameworks */,
|
||||
AD2B8825198D631B0070367B /* GStreamer.framework in Frameworks */,
|
||||
AD2B8823198D631B0070367B /* UIKit.framework in Frameworks */,
|
||||
|
|
@ -88,6 +91,7 @@
|
|||
AD2B881D198D631B0070367B /* Frameworks */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F4D8C7D61ED455260019B8A3 /* libiconv.tbd */,
|
||||
AD2B881E198D631B0070367B /* Foundation.framework */,
|
||||
AD2B8820198D631B0070367B /* CoreGraphics.framework */,
|
||||
AD2B8822198D631B0070367B /* UIKit.framework */,
|
||||
|
|
@ -157,7 +161,7 @@
|
|||
AD2B8813198D631B0070367B /* Project object */ = {
|
||||
isa = PBXProject;
|
||||
attributes = {
|
||||
LastUpgradeCheck = 0510;
|
||||
LastUpgradeCheck = 0830;
|
||||
ORGANIZATIONNAME = "Sebastian Dröge";
|
||||
};
|
||||
buildConfigurationList = AD2B8816198D631B0070367B /* Build configuration list for PBXProject "GstPlay" */;
|
||||
|
|
@ -234,13 +238,20 @@
|
|||
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
||||
CLANG_WARN_EMPTY_BODY = YES;
|
||||
CLANG_WARN_ENUM_CONVERSION = YES;
|
||||
CLANG_WARN_INFINITE_RECURSION = YES;
|
||||
CLANG_WARN_INT_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
|
||||
COPY_PHASE_STRIP = NO;
|
||||
ENABLE_BITCODE = NO;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
ENABLE_TESTABILITY = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu99;
|
||||
GCC_DYNAMIC_NO_PIC = NO;
|
||||
GCC_NO_COMMON_BLOCKS = YES;
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"DEBUG=1",
|
||||
|
|
@ -253,7 +264,7 @@
|
|||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
SDKROOT = iphoneos;
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
|
|
@ -273,20 +284,26 @@
|
|||
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
||||
CLANG_WARN_EMPTY_BODY = YES;
|
||||
CLANG_WARN_ENUM_CONVERSION = YES;
|
||||
CLANG_WARN_INFINITE_RECURSION = YES;
|
||||
CLANG_WARN_INT_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
|
||||
COPY_PHASE_STRIP = YES;
|
||||
ENABLE_BITCODE = NO;
|
||||
ENABLE_NS_ASSERTIONS = NO;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu99;
|
||||
GCC_NO_COMMON_BLOCKS = YES;
|
||||
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
|
||||
GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
|
||||
SDKROOT = iphoneos;
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
VALIDATE_PRODUCT = YES;
|
||||
|
|
@ -296,7 +313,6 @@
|
|||
AD2B8851198D631B0070367B /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ARCHS = armv7;
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
|
||||
FRAMEWORK_SEARCH_PATHS = (
|
||||
|
|
@ -310,7 +326,7 @@
|
|||
../lib,
|
||||
);
|
||||
INFOPLIST_FILE = "GstPlay/GstPlay-Info.plist";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
|
||||
OTHER_LDFLAGS = (
|
||||
"-lresolv",
|
||||
"-lstdc++",
|
||||
|
|
@ -339,6 +355,7 @@
|
|||
"-framework",
|
||||
AssetsLibrary,
|
||||
);
|
||||
PRODUCT_BUNDLE_IDENTIFIER = simon.himmelbauer;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
WRAPPER_EXTENSION = app;
|
||||
};
|
||||
|
|
@ -347,7 +364,6 @@
|
|||
AD2B8852198D631B0070367B /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ARCHS = armv7;
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
|
||||
FRAMEWORK_SEARCH_PATHS = (
|
||||
|
|
@ -361,7 +377,7 @@
|
|||
../lib,
|
||||
);
|
||||
INFOPLIST_FILE = "GstPlay/GstPlay-Info.plist";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
|
||||
OTHER_LDFLAGS = (
|
||||
"-lresolv",
|
||||
"-lstdc++",
|
||||
|
|
@ -390,6 +406,7 @@
|
|||
"-framework",
|
||||
AssetsLibrary,
|
||||
);
|
||||
PRODUCT_BUNDLE_IDENTIFIER = simon.himmelbauer;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
WRAPPER_EXTENSION = app;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<key>CFBundleExecutable</key>
|
||||
<string>${EXECUTABLE_NAME}</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.freedesktop.gstreamer.${PRODUCT_NAME:rfc1034identifier}</string>
|
||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
|
|
@ -24,6 +24,8 @@
|
|||
<string>1.0</string>
|
||||
<key>LSRequiresIPhoneOS</key>
|
||||
<true/>
|
||||
<key>NSPhotoLibraryUsageDescription</key>
|
||||
<string>This app requires access to the photo library for demo purposes.</string>
|
||||
<key>UIMainStoryboardFile</key>
|
||||
<string>MainStoryboard_iPhone</string>
|
||||
<key>UIMainStoryboardFile~ipad</key>
|
||||
|
|
|
|||
|
|
@ -99,9 +99,6 @@ GST_PLUGIN_STATIC_DECLARE(dvdsub);
|
|||
#if defined(GST_IOS_PLUGIN_DVDLPCMDEC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
|
||||
GST_PLUGIN_STATIC_DECLARE(dvdlpcmdec);
|
||||
#endif
|
||||
#if defined(GST_IOS_PLUGIN_MAD) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
|
||||
GST_PLUGIN_STATIC_DECLARE(mad);
|
||||
#endif
|
||||
#if defined(GST_IOS_PLUGIN_MPEG2DEC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
|
||||
GST_PLUGIN_STATIC_DECLARE(mpeg2dec);
|
||||
#endif
|
||||
|
|
@ -435,11 +432,8 @@ GST_PLUGIN_STATIC_DECLARE(pnm);
|
|||
#if defined(GST_IOS_PLUGIN_RFBSRC) || defined(GST_IOS_PLUGINS_CODECS)
|
||||
GST_PLUGIN_STATIC_DECLARE(rfbsrc);
|
||||
#endif
|
||||
#if defined(GST_IOS_PLUGIN_SCHRO) || defined(GST_IOS_PLUGINS_CODECS)
|
||||
GST_PLUGIN_STATIC_DECLARE(schro);
|
||||
#endif
|
||||
#if defined(GST_IOS_PLUGIN_GSTSIREN) || defined(GST_IOS_PLUGINS_CODECS)
|
||||
GST_PLUGIN_STATIC_DECLARE(gstsiren);
|
||||
#if defined(GST_IOS_PLUGIN_SIREN) || defined(GST_IOS_PLUGINS_CODECS)
|
||||
GST_PLUGIN_STATIC_DECLARE(siren);
|
||||
#endif
|
||||
#if defined(GST_IOS_PLUGIN_SMOOTHSTREAMING) || defined(GST_IOS_PLUGINS_CODECS)
|
||||
GST_PLUGIN_STATIC_DECLARE(smoothstreaming);
|
||||
|
|
@ -486,11 +480,8 @@ GST_PLUGIN_STATIC_DECLARE(soup);
|
|||
#if defined(GST_IOS_PLUGIN_UDP) || defined(GST_IOS_PLUGINS_NET)
|
||||
GST_PLUGIN_STATIC_DECLARE(udp);
|
||||
#endif
|
||||
#if defined(GST_IOS_PLUGIN_DATAURISRC) || defined(GST_IOS_PLUGINS_NET)
|
||||
GST_PLUGIN_STATIC_DECLARE(dataurisrc);
|
||||
#endif
|
||||
#if defined(GST_IOS_PLUGIN_SDP) || defined(GST_IOS_PLUGINS_NET)
|
||||
GST_PLUGIN_STATIC_DECLARE(sdp);
|
||||
#if defined(GST_IOS_PLUGIN_SDPELEM) || defined(GST_IOS_PLUGINS_NET)
|
||||
GST_PLUGIN_STATIC_DECLARE(sdpelem);
|
||||
#endif
|
||||
#if defined(GST_IOS_PLUGIN_SRTP) || defined(GST_IOS_PLUGINS_NET)
|
||||
GST_PLUGIN_STATIC_DECLARE(srtp);
|
||||
|
|
@ -638,9 +629,6 @@ gst_ios_init (void)
|
|||
#if defined(GST_IOS_PLUGIN_DVDLPCMDEC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
|
||||
GST_PLUGIN_STATIC_REGISTER(dvdlpcmdec);
|
||||
#endif
|
||||
#if defined(GST_IOS_PLUGIN_MAD) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
|
||||
GST_PLUGIN_STATIC_REGISTER(mad);
|
||||
#endif
|
||||
#if defined(GST_IOS_PLUGIN_MPEG2DEC) || defined(GST_IOS_PLUGINS_CODECS_RESTRICTED)
|
||||
GST_PLUGIN_STATIC_REGISTER(mpeg2dec);
|
||||
#endif
|
||||
|
|
@ -974,11 +962,8 @@ gst_ios_init (void)
|
|||
#if defined(GST_IOS_PLUGIN_RFBSRC) || defined(GST_IOS_PLUGINS_CODECS)
|
||||
GST_PLUGIN_STATIC_REGISTER(rfbsrc);
|
||||
#endif
|
||||
#if defined(GST_IOS_PLUGIN_SCHRO) || defined(GST_IOS_PLUGINS_CODECS)
|
||||
GST_PLUGIN_STATIC_REGISTER(schro);
|
||||
#endif
|
||||
#if defined(GST_IOS_PLUGIN_GSTSIREN) || defined(GST_IOS_PLUGINS_CODECS)
|
||||
GST_PLUGIN_STATIC_REGISTER(gstsiren);
|
||||
#if defined(GST_IOS_PLUGIN_SIREN) || defined(GST_IOS_PLUGINS_CODECS)
|
||||
GST_PLUGIN_STATIC_REGISTER(siren);
|
||||
#endif
|
||||
#if defined(GST_IOS_PLUGIN_SMOOTHSTREAMING) || defined(GST_IOS_PLUGINS_CODECS)
|
||||
GST_PLUGIN_STATIC_REGISTER(smoothstreaming);
|
||||
|
|
@ -1025,11 +1010,8 @@ gst_ios_init (void)
|
|||
#if defined(GST_IOS_PLUGIN_UDP) || defined(GST_IOS_PLUGINS_NET)
|
||||
GST_PLUGIN_STATIC_REGISTER(udp);
|
||||
#endif
|
||||
#if defined(GST_IOS_PLUGIN_DATAURISRC) || defined(GST_IOS_PLUGINS_NET)
|
||||
GST_PLUGIN_STATIC_REGISTER(dataurisrc);
|
||||
#endif
|
||||
#if defined(GST_IOS_PLUGIN_SDP) || defined(GST_IOS_PLUGINS_NET)
|
||||
GST_PLUGIN_STATIC_REGISTER(sdp);
|
||||
#if defined(GST_IOS_PLUGIN_SDPELEM) || defined(GST_IOS_PLUGINS_NET)
|
||||
GST_PLUGIN_STATIC_REGISTER(sdpelem);
|
||||
#endif
|
||||
#if defined(GST_IOS_PLUGIN_SRTP) || defined(GST_IOS_PLUGINS_NET)
|
||||
GST_PLUGIN_STATIC_REGISTER(srtp);
|
||||
|
|
|
|||
Loading…
Reference in a new issue