Skip to content

Commit 942bddb

Browse files
authored
Update JitsiMeetSDKLite from v8 to v12. (#1924)
* Update JitsiMeetSDKLite from v8 to v12. * Add changelog entry * Update Ruby gems too.
1 parent b97e713 commit 942bddb

File tree

8 files changed

+77
-96
lines changed

8 files changed

+77
-96
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ gem "fastlane"
44
gem "cocoapods", '~>1.16.2'
55
gem "xcode-install"
66
gem "slather"
7-
gem "tsort"
7+
gem "tsort" # Won't be included in Ruby 4.1.0.

Gemfile.lock

Lines changed: 64 additions & 56 deletions
Large diffs are not rendered by default.

MatrixSDK.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Pod::Spec.new do |s|
6161

6262
# Use WebRTC framework included in Jitsi Meet SDK
6363
# Use the lite version so we don't add a dependency on Giphy.
64-
ss.ios.dependency 'JitsiMeetSDKLite', '8.1.2-lite'
64+
ss.ios.dependency 'JitsiMeetSDKLite', '12.0.0-lite'
6565
end
6666

6767
end

MatrixSDKExtensions/VoIP/Jingle/MXJingleCallAudioSessionConfigurator.m

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -53,36 +53,8 @@ - (void)configureAudioSessionForVideoCall:(BOOL)isVideoCall
5353
error:nil];
5454
}
5555

56-
double sampleRate;
57-
double ioBufferDuration;
58-
59-
// Set the session's sample rate or the hardware sample rate.
60-
// It is essential that we use the same sample rate as stream format
61-
// to ensure that the I/O unit does not have to do sample rate conversion.
62-
// Set the preferred audio I/O buffer duration, in seconds.
63-
NSUInteger processorCount = [NSProcessInfo processInfo].processorCount;
64-
65-
struct utsname systemInfo;
66-
uname(&systemInfo);
67-
NSString *machineName = [NSString stringWithCString:systemInfo.machine
68-
encoding:NSUTF8StringEncoding];
69-
BOOL isIphone4S = [machineName isEqualToString:@"iPhone4,1"];
70-
71-
// Use best sample rate and buffer duration if the CPU has more than one
72-
// core.
73-
if (processorCount > 1 && !isIphone4S)
74-
{
75-
sampleRate = kRTCAudioSessionHighPerformanceSampleRate;
76-
ioBufferDuration = kRTCAudioSessionHighPerformanceIOBufferDuration;
77-
}
78-
else
79-
{
80-
sampleRate = kRTCAudioSessionLowComplexitySampleRate;
81-
ioBufferDuration = kRTCAudioSessionLowComplexityIOBufferDuration;
82-
}
83-
84-
[audioSession setPreferredSampleRate:sampleRate error:nil];
85-
[audioSession setPreferredIOBufferDuration:ioBufferDuration error:nil];
56+
[audioSession setPreferredSampleRate:kRTCAudioSessionHighPerformanceSampleRate error:nil];
57+
[audioSession setPreferredIOBufferDuration:kRTCAudioSessionHighPerformanceIOBufferDuration error:nil];
8658

8759
// Initialize audio manually, activate audio only when needed
8860
RTCAudioSession.sharedInstance.useManualAudio = YES;

MatrixSDKExtensions/VoIP/Jingle/MXJingleCallStackCall.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ - (void)peerConnection:(RTCPeerConnection *)peerConnection didAddReceiver:(RTCRt
558558
dispatch_async(dispatch_get_main_queue(), ^{
559559
MXStrongifyAndReturnIfNil(self);
560560

561-
// Use self.remoteVideoView as a container of a RTCEAGLVideoView
561+
// Use self.remoteVideoView as a container of a RTCMTLVideoView
562562
self->remoteJingleVideoView = [[MXJingleVideoView alloc] initWithContainerView:self.remoteVideoView];
563563
[self->remoteVideoTrack addRenderer:self->remoteJingleVideoView];
564564
});
@@ -781,7 +781,7 @@ - (void)createLocalMediaStream
781781
[peerConnection addTrack:localVideoTrack streamIds:@[kMXJingleCallWebRTCMainStreamID]];
782782

783783
// Display the self view
784-
// Use selfVideoView as a container of a RTCEAGLVideoView
784+
// Use selfVideoView as a container of a RTCMTLVideoView
785785
MXJingleVideoView *renderView = [[MXJingleVideoView alloc] initWithContainerView:self.selfVideoView];
786786
[self startVideoCaptureWithRenderer:renderView];
787787
}

MatrixSDKExtensions/VoIP/Jingle/MXJingleVideoView.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
#import <Foundation/Foundation.h>
1717

1818
#if __has_include(<WebRTC/WebRTC.h>)
19-
#import <WebRTC/RTCEAGLVideoView.h>
19+
#import <WebRTC/RTCMTLVideoView.h>
2020

2121
NS_ASSUME_NONNULL_BEGIN
2222

2323
/**
24-
`MXJingleVideoView` is responsible for rendering RTCEAGLVideoView into
24+
`MXJingleVideoView` is responsible for rendering RTCMTLVideoView into
2525
a UIView container by keeping the aspect ratio of the video.
2626
2727
@see https://developers.google.com/talk/libjingle/developer_guide
2828
*/
2929
NS_EXTENSION_UNAVAILABLE_IOS("Rendering not available in app extensions.")
30-
@interface MXJingleVideoView : RTCEAGLVideoView <RTCVideoViewDelegate>
30+
@interface MXJingleVideoView : RTCMTLVideoView <RTCVideoViewDelegate>
3131

3232
- (instancetype)initWithContainerView:(UIView *)containerView NS_DESIGNATED_INITIALIZER;
3333

MatrixSDKExtensions/VoIP/Jingle/MXJingleVideoView.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ - (instancetype)initWithContainerView:(UIView *)theContainerView
4444

4545
videoSize = containerView.frame.size;
4646

47-
// Use 'containerView' as the container of a RTCEAGLVideoView
47+
// Use 'containerView' as the container of a RTCMTLVideoView
4848
[containerView addSubview:self];
4949
}
5050

@@ -60,8 +60,8 @@ - (void)layoutSubviews
6060
[super layoutSubviews];
6161
}
6262

63-
#pragma mark - RTCEAGLVideoViewDelegate
64-
- (void)videoView:(RTCEAGLVideoView *)videoView didChangeVideoSize:(CGSize)size
63+
#pragma mark - RTCMTLVideoViewDelegate
64+
- (void)videoView:(RTCMTLVideoView *)videoView didChangeVideoSize:(CGSize)size
6565
{
6666
videoSize = size;
6767

changelog.d/pr-1924.change

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update JitsiMeetSDKLite dependency.

0 commit comments

Comments
 (0)