ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-08-08 08:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cherry-pick various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2024-01-22 15:09:25 +04:00
parent cdcda05f95
commit 1fb7544b52
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
submodules/Camera/Sources/Camera.swift
View File

@ -85,26 +85,19 @@ final class CameraDeviceContext {
} }
private func maxDimensions(additional: Bool, preferWide: Bool) -> CMVideoDimensions { private func maxDimensions(additional: Bool, preferWide: Bool) -> CMVideoDimensions {
// if self.isRoundVideo { if self.isRoundVideo && !Camera.isDualCameraSupported {
// if additional { return CMVideoDimensions(width: 640, height: 480)
// return CMVideoDimensions(width: 640, height: 480) } else {
// } else {
// return CMVideoDimensions(width: 1280, height: 720)
// }
// } else {
if additional || preferWide { if additional || preferWide {
return CMVideoDimensions(width: 1920, height: 1440) return CMVideoDimensions(width: 1920, height: 1440)
} else { } else {
return CMVideoDimensions(width: 1920, height: 1080) return CMVideoDimensions(width: 1920, height: 1080)
} }
// } }
} }
private func preferredMaxFrameRate(useLower: Bool) -> Double { private func preferredMaxFrameRate(useLower: Bool) -> Double {
if !self.exclusive { if !self.exclusive || self.isRoundVideo || useLower {
return 30.0
}
if useLower {
return 30.0 return 30.0
} }
switch DeviceModel.current { switch DeviceModel.current {

2
submodules/Camera/Sources/CameraOutput.swift
View File

@ -532,7 +532,7 @@ final class CameraOutput: NSObject {
if let current = self.roundVideoFilter { if let current = self.roundVideoFilter {
filter = current filter = current
} else { } else {
filter = CameraRoundVideoFilter(ciContext: self.ciContext, colorSpace: self.colorSpace) filter = CameraRoundVideoFilter(ciContext: self.ciContext, colorSpace: self.colorSpace, simple: self.exclusive)
self.roundVideoFilter = filter self.roundVideoFilter = filter
} }
if !filter.isPrepared { if !filter.isPrepared {

19
submodules/Camera/Sources/CameraRoundVideoFilter.swift
View File

@ -92,6 +92,7 @@ private func preallocateBuffers(pool: CVPixelBufferPool, allocationThreshold: In
final class CameraRoundVideoFilter { final class CameraRoundVideoFilter {
private let ciContext: CIContext private let ciContext: CIContext
private let colorSpace: CGColorSpace private let colorSpace: CGColorSpace
private let simple: Bool
private var resizeFilter: CIFilter? private var resizeFilter: CIFilter?
private var overlayFilter: CIFilter? private var overlayFilter: CIFilter?
@ -105,9 +106,10 @@ final class CameraRoundVideoFilter {
private(set) var isPrepared = false private(set) var isPrepared = false
init(ciContext: CIContext, colorSpace: CGColorSpace) { init(ciContext: CIContext, colorSpace: CGColorSpace, simple: Bool) {
self.ciContext = ciContext self.ciContext = ciContext
self.colorSpace = colorSpace self.colorSpace = colorSpace
self.simple = simple
} }
func prepare(with formatDescription: CMFormatDescription, outputRetainedBufferCountHint: Int) { func prepare(with formatDescription: CMFormatDescription, outputRetainedBufferCountHint: Int) {
@ -164,14 +166,19 @@ final class CameraRoundVideoFilter {
sourceImage = sourceImage.oriented(additional ? .leftMirrored : .right) sourceImage = sourceImage.oriented(additional ? .leftMirrored : .right)
let scale = CGFloat(videoMessageDimensions.width) / min(sourceImage.extent.width, sourceImage.extent.height) let scale = CGFloat(videoMessageDimensions.width) / min(sourceImage.extent.width, sourceImage.extent.height)
resizeFilter.setValue(sourceImage, forKey: kCIInputImageKey) if !self.simple {
resizeFilter.setValue(scale, forKey: kCIInputScaleKey) resizeFilter.setValue(sourceImage, forKey: kCIInputImageKey)
resizeFilter.setValue(scale, forKey: kCIInputScaleKey)
if let resizedImage = resizeFilter.outputImage {
sourceImage = resizedImage if let resizedImage = resizeFilter.outputImage {
sourceImage = resizedImage
} else {
sourceImage = sourceImage.transformed(by: CGAffineTransformMakeScale(scale, scale), highQualityDownsample: true)
}
} else { } else {
sourceImage = sourceImage.transformed(by: CGAffineTransformMakeScale(scale, scale), highQualityDownsample: true) sourceImage = sourceImage.transformed(by: CGAffineTransformMakeScale(scale, scale), highQualityDownsample: true)
} }
sourceImage = sourceImage.transformed(by: CGAffineTransformMakeTranslation(0.0, -(sourceImage.extent.height - sourceImage.extent.width) / 2.0)) sourceImage = sourceImage.transformed(by: CGAffineTransformMakeTranslation(0.0, -(sourceImage.extent.height - sourceImage.extent.width) / 2.0))
sourceImage = sourceImage.cropped(to: CGRect(x: 0.0, y: 0.0, width: sourceImage.extent.width, height: sourceImage.extent.width)) sourceImage = sourceImage.cropped(to: CGRect(x: 0.0, y: 0.0, width: sourceImage.extent.width, height: sourceImage.extent.width))