Skip to content

Commit 9db66cf

Browse files
authored
[Fix]MetalView scale calculation (#61) (#62)
1 parent 174759c commit 9db66cf

File tree

1 file changed

+3
-20
lines changed

1 file changed

+3
-20
lines changed

sdk/objc/components/renderer/metal/RTCMTLVideoView.m

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -137,25 +137,13 @@ - (void)setMultipleTouchEnabled:(BOOL)multipleTouchEnabled {
137137
}
138138
#endif
139139

140-
- (CGFloat)currentScaleFactor {
141-
CGFloat scale = 1.0;
142-
#if TARGET_OS_IPHONE
143-
scale = [UIScreen mainScreen].scale;
144-
#elif TARGET_OS_OSX
145-
scale = [NSScreen mainScreen].backingScaleFactor;
146-
#endif
147-
return MAX(scale, 1.0);
148-
}
149-
150140
- (void)performLayout {
151141
CGRect bounds = self.bounds;
152142
self.metalView.frame = bounds;
153143
if (!CGSizeEqualToSize(self.videoFrameSize, CGSizeZero)) {
154144
self.metalView.drawableSize = [self drawableSize];
155145
} else {
156-
// Apply scale factor for default size as well (when videoFrameSize is zero)
157-
CGFloat scale = [self currentScaleFactor];
158-
self.metalView.drawableSize = CGSizeMake(bounds.size.width * scale, bounds.size.height * scale);
146+
self.metalView.drawableSize = bounds.size;
159147
}
160148
}
161149

@@ -258,16 +246,11 @@ - (CGSize)drawableSize {
258246
BOOL sizeIsLandscape = (self.videoFrame.rotation == RTC_OBJC_TYPE(RTCVideoRotation_0)) ||
259247
(self.videoFrame.rotation == RTC_OBJC_TYPE(RTCVideoRotation_180));
260248

261-
CGSize size;
262249
if (useLandscape == sizeIsLandscape) {
263-
size = videoFrameSize;
250+
return videoFrameSize;
264251
} else {
265-
size = CGSizeMake(videoFrameSize.height, videoFrameSize.width);
252+
return CGSizeMake(videoFrameSize.height, videoFrameSize.width);
266253
}
267-
268-
// Apply scale factor for retina displays
269-
CGFloat scale = [self currentScaleFactor];
270-
return CGSizeMake(size.width * scale, size.height * scale);
271254
}
272255

273256
#pragma mark - RTC_OBJC_TYPE(RTCVideoRenderer)

0 commit comments

Comments
 (0)