Skip to content
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

Use custom WebRTC #607

Merged
merged 12 commits into from
Dec 4, 2024
Merged

Use custom WebRTC #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ad142ac
Use custom WebRTC
testableapple Nov 27, 2024
a9d8170
Fix cocoapods
testableapple Nov 27, 2024
540c220
Test main branch
testableapple Nov 27, 2024
81ade30
Update webrtc version in podspecs
testableapple Nov 27, 2024
0debbcd
Use exact version
testableapple Nov 27, 2024
5d03b46
Update unit test
testableapple Nov 27, 2024
f6f7b1b
Bump version
testableapple Nov 28, 2024
cb31d4e
Bump version
testableapple Nov 28, 2024
9ae2cd7
Fix local track
testableapple Nov 28, 2024
58116ea
Update podspecs
testableapple Dec 3, 2024
7a8ee42
Fix documentation error
ipavlidakis Dec 4, 2024
c2bb14e
Merge branch 'develop' into webrtc
testableapple Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DocumentationTests/DocumentationTests/DocumentationTests.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@
repositoryURL = "https://github.com/GetStream/stream-video-noise-cancellation-swift";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 0.9.1;
minimumVersion = 1.0.1;
};
};
40FFDC722B63F767004DA7A2 /* XCRemoteSwiftPackageReference "stream-chat-swiftui" */ = {
Expand Down
2 changes: 1 addition & 1 deletion ...ationTests/DocumentationTests/DocumentationTests/06-advanced/06-apply-video-filters.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ fileprivate func content() {
}
}
}

container {
// Get a call object
let call = streamVideo.call(callType: "default", callId: UUID().uuidString)
Expand Down
4 changes: 2 additions & 2 deletions DocumentationTests/DocumentationTests/DocumentationTests/GloballyUsedVariables.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ final class UnsecureRepository: VoIPTokenHandler {
func save(voIPPushToken: String?) {

}

func currentVoIPPushToken() -> String? {
nil
}
Expand Down Expand Up @@ -279,7 +279,7 @@ protocol VoIPTokenHandler {
}

final class CallKitService {

func reportIncomingCall(
callCid: String,
displayName: String,
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/apple/swift-protobuf.git", from: "1.18.0"),
.package(url: "https://github.com/GetStream/stream-video-swift-webrtc.git", exact: "114.5735.08")
.package(url: "https://github.com/GetStream/stream-video-swift-webrtc.git", exact: "125.6422.064")
],
targets: [
.target(
Expand Down
4 changes: 2 additions & 2 deletions Sources/StreamVideo/Utils/AudioSession/StreamRTCAudioSession.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ final class StreamRTCAudioSession: AudioSessionProtocol {
/// - Parameter mode: The audio mode to set.
/// - Throws: An error if setting the mode fails.
func setMode(_ mode: String) throws {
try source.setMode(mode)
try source.setMode(AVAudioSession.Mode(rawValue: mode))
}

/// Configures the audio category and category options for the session.
Expand All @@ -73,7 +73,7 @@ final class StreamRTCAudioSession: AudioSessionProtocol {
_ category: String,
with categoryOptions: AVAudioSession.CategoryOptions
) throws {
try source.setCategory(category, with: categoryOptions)
try source.setCategory(AVAudioSession.Category(rawValue: category), with: categoryOptions)
}

/// Activates or deactivates the audio session.
Expand Down
2 changes: 1 addition & 1 deletion Sources/StreamVideo/WebRTC/VideoCapturing/VideoCapturer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class VideoCapturer: CameraVideoCapturing {
#else
let handler = StreamVideoCaptureHandler(source: videoSource, filters: videoFilters)
videoCaptureHandler = handler
videoCapturer = RTCCameraVideoCapturer(delegate: handler)
videoCapturer = RTCCameraVideoCapturer(delegate: handler, captureSession: AVCaptureSession())
checkForBackgroundCameraAccess()
#endif
}
Expand Down
2 changes: 1 addition & 1 deletion StreamVideo-XCFramework.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Pod::Spec.new do |spec|

spec.prepare_command = <<-CMD
mkdir -p Frameworks/
curl -sL "https://github.com/GetStream/stream-video-swift-webrtc/releases/download/114.5735.08/StreamWebRTC.zip" -o Frameworks/StreamWebRTC.zip
curl -sL "https://github.com/GetStream/stream-video-swift-webrtc/releases/download/125.6422.064/StreamWebRTC.xcframework.zip" -o Frameworks/StreamWebRTC.zip
unzip -o Frameworks/StreamWebRTC.zip -d Frameworks/
rm Frameworks/StreamWebRTC.zip
CMD
Expand Down
2 changes: 1 addition & 1 deletion StreamVideo.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Pod::Spec.new do |spec|

spec.prepare_command = <<-CMD
mkdir -p Frameworks/
curl -sL "https://github.com/GetStream/stream-video-swift-webrtc/releases/download/114.5735.08/StreamWebRTC.zip" -o Frameworks/StreamWebRTC.zip
curl -sL "https://github.com/GetStream/stream-video-swift-webrtc/releases/download/125.6422.064/StreamWebRTC.xcframework.zip" -o Frameworks/StreamWebRTC.zip
unzip -o Frameworks/StreamWebRTC.zip -d Frameworks/
rm Frameworks/StreamWebRTC.zip
CMD
Expand Down
2 changes: 1 addition & 1 deletion StreamVideo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8852,7 +8852,7 @@
repositoryURL = "https://github.com/GetStream/stream-video-swift-webrtc";
requirement = {
kind = exactVersion;
version = 114.5735.8;
version = 125.6422.64;
};
};
8423B7542950BB0A00012F8D /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = {
Expand Down
2 changes: 1 addition & 1 deletion StreamVideoTests/Utils/AudioSession/StreamRTCAudioSession_Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ final class StreamRTCAudioSession_Tests: XCTestCase {

func test_category_returnsCorrectCategory() throws {
rtcAudioSession.lockForConfiguration()
try rtcAudioSession.setCategory(AVAudioSession.Category.playAndRecord.rawValue)
try rtcAudioSession.setCategory(AVAudioSession.Category.playAndRecord)
rtcAudioSession.unlockForConfiguration()

// Then
Expand Down
Loading