Skip to content

Add WHIP/WHEP support for ultra-low-latency streaming, ingest, and playback #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
anishmenon wants to merge 1 commit into from
Closed

Add WHIP/WHEP support for ultra-low-latency streaming, ingest, and playback #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
375 changes: 75 additions & 300 deletions Common/Localizable.xcstrings
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions Common/Various/CommonUtils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,7 @@ private let cameraPositionRtmp = "(RTMP)"
private let cameraPositionSrtla = "(SRT(LA))"
private let cameraPositionRist = "(RIST)"
private let cameraPositionRtsp = "(RTSP)"
private let cameraPositionWhep = "(WHEP)"
private let cameraPositionMediaPlayer = "(Media player)"

func rtmpCamera(name: String) -> String {
Expand Down Expand Up @@ -532,6 +533,14 @@ func isRtspCameraOrMic(camera: String) -> Bool {
return camera.hasSuffix(cameraPositionRtsp)
}

func whepCamera(name: String) -> String {
return "\(name) \(cameraPositionWhep)"
}

func isWhepCameraOrMic(camera: String) -> Bool {
return camera.hasSuffix(cameraPositionWhep)
}

func mediaPlayerCamera(name: String) -> String {
return "\(name) \(cameraPositionMediaPlayer)"
}
Expand Down
8 changes: 8 additions & 0 deletions Common/Various/Validate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,14 @@ func isValidUrl(url value: String,
if let message = isValidRtmpUrl(url: value, rtmpStreamKeyRequired: rtmpStreamKeyRequired) {
return message
}
case "http":
break
case "https":
break
case "whip":
break
case "whips":
break
case "srt":
if let message = isValidSrtUrl(url: value) {
return message
Expand Down
2 changes: 1 addition & 1 deletion Moblin Screen Recording/Moblin Screen Recording.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<dict>
<key>com.apple.security.application-groups</key>
<array>
<string>group.com.eerimoq.Moblin</string>
<string>group.io.meetmo.mocam</string>
</array>
</dict>
</plist>
54 changes: 44 additions & 10 deletions Moblin.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
03ECDF532B8E4E6000BD920E /* Moblin.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 03ECDF462B8E4E5E00BD920E /* Moblin.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
03ECDF5D2B8E5F0B00BD920E /* WrappingHStack in Frameworks */ = {isa = PBXBuildFile; productRef = 03ECDF5C2B8E5F0B00BD920E /* WrappingHStack */; };
03F465EC2C441D1400630708 /* CrcSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 03F465EB2C441D1400630708 /* CrcSwift */; };
08A1B2C3D4E5F67890123459 /* HaishinKit in Frameworks */ = {isa = PBXBuildFile; productRef = 08A1B2C3D4E5F67890123457 /* HaishinKit */; };
08A1B2C3D4E5F6789012345A /* RTCHaishinKit in Frameworks */ = {isa = PBXBuildFile; productRef = 08A1B2C3D4E5F67890123458 /* RTCHaishinKit */; };
882D0C162DF76F5B0035BFAF /* BlackSharkLib in Frameworks */ = {isa = PBXBuildFile; productRef = 882D0C152DF76F5B0035BFAF /* BlackSharkLib */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -230,6 +232,8 @@
03A08B7C2AC295620018BA95 /* AlertToast in Frameworks */,
0377239C2DE35191007D040D /* VRMSceneKit in Frameworks */,
03BC116B2AE56C2200C38FC4 /* SDWebImageWebPCoder in Frameworks */,
08A1B2C3D4E5F67890123459 /* HaishinKit in Frameworks */,
08A1B2C3D4E5F6789012345A /* RTCHaishinKit in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -364,6 +368,8 @@
035351932F1C271700428DAC /* AppAuthCore */,
035351952F1C27A500428DAC /* AppAuth */,
0360FD152F228EEB00FF8847 /* MetalPetal */,
08A1B2C3D4E5F67890123457 /* HaishinKit */,
08A1B2C3D4E5F67890123458 /* RTCHaishinKit */,
);
productName = Mobs;
productReference = 035E9E332A9A02D6009D4F5A /* Moblin.app */;
Expand Down Expand Up @@ -519,6 +525,7 @@
882D0C142DF76F5B0035BFAF /* XCRemoteSwiftPackageReference "BlackSharkLib" */,
035351922F1C271700428DAC /* XCRemoteSwiftPackageReference "AppAuth-iOS" */,
0360FD142F228EEB00FF8847 /* XCRemoteSwiftPackageReference "MetalPetal" */,
08A1B2C3D4E5F67890123456 /* XCLocalSwiftPackageReference "Vendor/HaishinKit.swift" */,
);
productRefGroup = 035E9E342A9A02D6009D4F5A /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -643,6 +650,7 @@
CODE_SIGN_ENTITLEMENTS = "Moblin Screen Recording/Moblin Screen Recording.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 442HHYCXW8;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -661,7 +669,7 @@
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 30.2027.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.eerimoq.Mobs.Moblin-Capture";
PRODUCT_BUNDLE_IDENTIFIER = io.webmo.mocam.Capture;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand All @@ -680,6 +688,7 @@
CODE_SIGN_ENTITLEMENTS = "Moblin Screen Recording/Moblin Screen Recording.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 442HHYCXW8;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -698,7 +707,7 @@
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 30.2027.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.eerimoq.Mobs.Moblin-Capture";
PRODUCT_BUNDLE_IDENTIFIER = io.webmo.mocam.Capture;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand Down Expand Up @@ -857,10 +866,12 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = 442HHYCXW8;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Moblin/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Moblin;
INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.video";
INFOPLIST_KEY_NSBluetoothAlwaysUsageDescription = "Moblin communicates with DJI cameras using Bluetooth.";
INFOPLIST_KEY_NSCameraUsageDescription = "Moblin live streams video from the camera.";
Expand Down Expand Up @@ -889,7 +900,7 @@
MTLLINKER_FLAGS = "-fcikernel";
MTL_COMPILER_FLAGS = "-fcikernel";
MTL_HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS)";
PRODUCT_BUNDLE_IDENTIFIER = com.eerimoq.Mobs;
PRODUCT_BUNDLE_IDENTIFIER = io.webmo.mocam;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
Expand All @@ -912,10 +923,12 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = 442HHYCXW8;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Moblin/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Moblin;
INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.video";
INFOPLIST_KEY_NSBluetoothAlwaysUsageDescription = "Moblin communicates with DJI cameras using Bluetooth.";
INFOPLIST_KEY_NSCameraUsageDescription = "Moblin live streams video from the camera.";
Expand Down Expand Up @@ -944,7 +957,7 @@
MTLLINKER_FLAGS = "-fcikernel";
MTL_COMPILER_FLAGS = "-fcikernel";
MTL_HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS)";
PRODUCT_BUNDLE_IDENTIFIER = com.eerimoq.Mobs;
PRODUCT_BUNDLE_IDENTIFIER = io.webmo.mocam;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
Expand All @@ -963,6 +976,7 @@
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 442HHYCXW8;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -981,7 +995,7 @@
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 0.1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.eerimoq.Mobs.Watch.Widget;
PRODUCT_BUNDLE_IDENTIFIER = io.webmo.mocam.Watch.Widget;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos;
SKIP_INSTALL = YES;
Expand All @@ -1000,6 +1014,7 @@
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 442HHYCXW8;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -1018,7 +1033,7 @@
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 0.1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.eerimoq.Mobs.Watch.Widget;
PRODUCT_BUNDLE_IDENTIFIER = io.webmo.mocam.Watch.Widget;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos;
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -1081,6 +1096,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"Moblin Watch/Preview Content\"";
DEVELOPMENT_TEAM = 442HHYCXW8;
ENABLE_PREVIEWS = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
Expand All @@ -1094,15 +1110,15 @@
INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = Yes;
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = Yes;
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
INFOPLIST_KEY_WKCompanionAppBundleIdentifier = com.eerimoq.Mobs;
INFOPLIST_KEY_WKCompanionAppBundleIdentifier = io.webmo.mocam;
INFOPLIST_KEY_WKRunsIndependentlyOfCompanionApp = NO;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 0.1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.eerimoq.Mobs.Watch;
PRODUCT_BUNDLE_IDENTIFIER = io.webmo.mocam.Watch;
PRODUCT_NAME = Moblin;
SDKROOT = watchos;
SKIP_INSTALL = YES;
Expand All @@ -1123,6 +1139,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"Moblin Watch/Preview Content\"";
DEVELOPMENT_TEAM = 442HHYCXW8;
ENABLE_PREVIEWS = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
Expand All @@ -1136,15 +1153,15 @@
INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = Yes;
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = Yes;
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
INFOPLIST_KEY_WKCompanionAppBundleIdentifier = com.eerimoq.Mobs;
INFOPLIST_KEY_WKCompanionAppBundleIdentifier = io.webmo.mocam;
INFOPLIST_KEY_WKRunsIndependentlyOfCompanionApp = NO;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 0.1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.eerimoq.Mobs.Watch;
PRODUCT_BUNDLE_IDENTIFIER = io.webmo.mocam.Watch;
PRODUCT_NAME = Moblin;
SDKROOT = watchos;
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -1214,6 +1231,13 @@
};
/* End XCConfigurationList section */

/* Begin XCLocalSwiftPackageReference section */
08A1B2C3D4E5F67890123456 /* XCLocalSwiftPackageReference "Vendor/HaishinKit.swift" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = Vendor/HaishinKit.swift;
};
/* End XCLocalSwiftPackageReference section */

/* Begin XCRemoteSwiftPackageReference section */
0318D3682CF51D6900E12F3B /* XCRemoteSwiftPackageReference "swift-protobuf" */ = {
isa = XCRemoteSwiftPackageReference;
Expand Down Expand Up @@ -1459,6 +1483,16 @@
package = 03F465EA2C441D1400630708 /* XCRemoteSwiftPackageReference "CrcSwift" */;
productName = CrcSwift;
};
08A1B2C3D4E5F67890123457 /* HaishinKit */ = {
isa = XCSwiftPackageProductDependency;
package = 08A1B2C3D4E5F67890123456 /* XCLocalSwiftPackageReference "Vendor/HaishinKit.swift" */;
productName = HaishinKit;
};
08A1B2C3D4E5F67890123458 /* RTCHaishinKit */ = {
isa = XCSwiftPackageProductDependency;
package = 08A1B2C3D4E5F67890123456 /* XCLocalSwiftPackageReference "Vendor/HaishinKit.swift" */;
productName = RTCHaishinKit;
};
882D0C152DF76F5B0035BFAF /* BlackSharkLib */ = {
isa = XCSwiftPackageProductDependency;
package = 882D0C142DF76F5B0035BFAF /* XCRemoteSwiftPackageReference "BlackSharkLib" */;
Expand Down
11 changes: 10 additions & 1 deletion Moblin.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 27 additions & 31 deletions Moblin/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
</array>
</dict>
</array>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
Expand All @@ -36,6 +34,23 @@
<string>IntentIntent</string>
<string>MuteIntent</string>
</array>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
<true/>
<key>UISceneConfigurations</key>
<dict>
<key>UIWindowSceneSessionRoleExternalDisplayNonInteractive</key>
<array>
<dict>
<key>UISceneConfigurationName</key>
<string>External Display</string>
<key>UISceneDelegateClassName</key>
<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
</dict>
</array>
</dict>
</dict>
<key>UIBackgroundModes</key>
<array>
<string>audio</string>
Expand All @@ -44,34 +59,15 @@
</array>
<key>UIFileSharingEnabled</key>
<true/>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
<true/>
<key>UISceneConfigurations</key>
<dict>
<key>UIWindowSceneSessionRoleExternalDisplayNonInteractive</key>
<array>
<dict>
<key>UISceneDelegateClassName</key>
<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
<key>UISceneConfigurationName</key>
<string>External Display</string>
</dict>
</array>
</dict>
</dict>
<key>CFBundleIdentifier</key>
<string></string>
<key>WiFiAwareServices</key>
<dict>
<key>_moblin._udp</key>
<dict>
<key>Publishable</key>
<dict/>
<key>Subscribable</key>
<dict/>
</dict>
</dict>
<key>WiFiAwareServices</key>
<dict>
<key>_moblin._udp</key>
<dict>
<key>Publishable</key>
<dict/>
<key>Subscribable</key>
<dict/>
</dict>
</dict>
</dict>
</plist>
Loading