Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
  •  
  •  
  •  
77 changes: 76 additions & 1 deletion Common/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -60465,6 +60465,9 @@
}
}
}
},
"Custom WHIP" : {

},
"Cycling power device" : {
"localizations" : {
Expand Down Expand Up @@ -65053,6 +65056,9 @@
}
}
}
},
"Disable the WHIP server to change its settings." : {

},
"Disabled connections will not be used." : {
"localizations" : {
Expand Down Expand Up @@ -70517,6 +70523,9 @@
}
}
}
},
"Each stream can receive video from one WHIP publisher on the local network." : {

},
"Effects" : {
"localizations" : {
Expand Down Expand Up @@ -74809,6 +74818,12 @@
}
}
}
},
"Enter one of the URLs into the WHIP publisher device to send video to this stream. Usually enter the WiFi or Personal Hotspot URL." : {

},
"Enter STUN/TURN URLs, one per line." : {

},
"Estimated viewer delay" : {
"localizations" : {
Expand Down Expand Up @@ -75401,6 +75416,12 @@
}
}
}
},
"Example: http://192.168.1.50:8080/live/whip" : {

},
"Example: https://example.com/live/whip" : {

},
"Example: rtmp://arn03.contribute.live-video.net/app/live_123321_sdfopjfwjfpawjefpjawef" : {
"localizations" : {
Expand Down Expand Up @@ -76881,6 +76902,9 @@
}
}
}
},
"Example: stun:stun.l.google.com:19302" : {

},
"EXB" : {
"localizations" : {
Expand Down Expand Up @@ -96094,6 +96118,12 @@
}
}
}
},
"https://example.com/live/whip" : {

},
"ICE servers" : {

},
"Icons to buy" : {
"localizations" : {
Expand Down Expand Up @@ -109996,6 +110026,9 @@
}
}
}
},
"Malformed WHIP URL" : {

},
"Manage streams" : {
"localizations" : {
Expand Down Expand Up @@ -111618,6 +111651,9 @@
}
}
}
},
"Max retries" : {

},
"Maximum" : {
"localizations" : {
Expand Down Expand Up @@ -129819,6 +129855,9 @@
}
}
}
},
"Note: Custom ICE servers may be ignored depending on WHIP backend." : {

},
"NOTE: Only works on Mac as `hevc_videotoolbox` uses Apple’s encoder." : {
"localizations" : {
Expand Down Expand Up @@ -137208,7 +137247,7 @@
}
}
},
"Periodic, audio and video" : {
"Periodic audio and video" : {

},
"Permissions" : {
Expand Down Expand Up @@ -139726,6 +139765,9 @@
}
}
}
},
"Please use a valid whip:// URL." : {

},
"PNGTuber" : {
"localizations" : {
Expand Down Expand Up @@ -196244,6 +196286,9 @@
}
}
}
},
"Template: https://my_domain/my_endpoint" : {

},
"Template: rtmp://[nearby_ingest_endpoint](https://help.twitch.tv/s/twitch-ingest-recommendation)/app/" : {
"localizations" : {
Expand Down Expand Up @@ -202750,6 +202795,9 @@
}
}
}
},
"The TCP port the WHIP server listens for publishers on." : {

},
"The UDP port %u will also be used." : {
"localizations" : {
Expand Down Expand Up @@ -203934,6 +203982,9 @@
}
}
}
},
"The WHIP server allows Moblin to receive video streams over the network using WebRTC (WHIP)." : {

},
"The zoom (in X) to set when switching to given camera, if enabled." : {
"localizations" : {
Expand Down Expand Up @@ -214442,6 +214493,9 @@
}
}
}
},
"Update Settings → Streams → %@ → Video/Audio." : {

},
"Uptime" : {
"localizations" : {
Expand Down Expand Up @@ -223903,6 +223957,27 @@
},
"When \"Audio only\" mode is selected, no video will be rendered at all. Only audio will play." : {

},
"WHEP client" : {

},
"WHEP disconnected" : {

},
"WHIP" : {

},
"WHIP disconnected" : {

},
"WHIP requires H.264 video and Opus audio." : {

},
"WHIP server" : {

},
"WHIP uses HTTP/HTTPS endpoints. (whip:// is also accepted for compatibility.)" : {

},
"Whirlpool" : {
"localizations" : {
Expand Down
9 changes: 9 additions & 0 deletions Common/Various/CommonUtils.swift
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
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
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>
Loading