ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-10-09 03:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2024-11-30 15:47:37 +04:00
parent a793176846
commit 6003931eec
3 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
submodules/TelegramUI/Components/CameraScreen/Sources/CameraCollage.swift
View File

@ -681,13 +681,13 @@ final class CameraCollageView: UIView, UIGestureRecognizerDelegate {
var delayAppearance = false
if let snapshotView = self.snapshotView {
if snapshotView is UIImageView {
} else {
delayAppearance = true
Queue.mainQueue().after(0.2, {
snapshotView.removeFromSuperview()
})
}
Queue.mainQueue().after(0.2, {
snapshotView.removeFromSuperview()
})
self.snapshotView = nil
}
if let previewLayer = self.previewLayer {

42
submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditor.swift
View File

@ -188,7 +188,7 @@ public final class MediaEditor {
private var additionalPlayers: [AVPlayer] = []
private let additionalPlayersPromise = Promise<[AVPlayer]>([])
private var additionalPlayerAudioMix: AVMutableAudioMix?
private var additionalPlayerAudioMixes: [AVMutableAudioMix] = []
private var audioPlayer: AVPlayer?
private let audioPlayerPromise = Promise<AVPlayer?>(nil)
@ -1756,7 +1756,7 @@ public final class MediaEditor {
self.additionalPlayers.forEach { $0.pause() }
self.additionalPlayers = []
self.additionalPlayersPromise.set(.single([]))
self.additionalPlayerAudioMix = nil
self.additionalPlayerAudioMixes = []
if let textureSource = self.renderer.textureSource as? UniversalTextureSource {
textureSource.forceUpdates = true
@ -1837,19 +1837,29 @@ public final class MediaEditor {
}
var additionalInputs: [UniversalTextureSource.Input] = []
var additionalPlayers: [AVPlayer] = []
var audioMixes: [AVMutableAudioMix] = []
for (input, player, volume) in results {
additionalInputs.append(input)
if let player {
if let volume {
player.volume = Float(volume)
}
additionalPlayers.append(player)
if let asset = player.currentItem?.asset {
let audioMix = AVMutableAudioMix()
let audioMixInputParameters = AVMutableAudioMixInputParameters(track: asset.tracks(withMediaType: .audio).first)
if let volume {
audioMixInputParameters.setVolume(Float(volume), at: .zero)
}
audioMix.inputParameters = [audioMixInputParameters]
player.currentItem?.audioMix = audioMix
audioMixes.append(audioMix)
}
}
}
self.additionalPlayers = additionalPlayers
self.additionalPlayersPromise.set(.single(additionalPlayers))
self.additionalPlayerAudioMixes = audioMixes
(self.renderer.textureSource as? UniversalTextureSource)?.setAdditionalInputs(additionalInputs)
@ -1878,7 +1888,7 @@ public final class MediaEditor {
self.additionalPlayers = [player]
self.additionalPlayersPromise.set(.single([player]))
self.additionalPlayerAudioMix = audioMix
self.additionalPlayerAudioMixes = [audioMix]
(self.renderer.textureSource as? UniversalTextureSource)?.setAdditionalInputs([.video(playerItem, nil)])
}
@ -1991,11 +2001,21 @@ public final class MediaEditor {
}
}
if let audioMix = self.additionalPlayerAudioMix, let asset = self.additionalPlayers.first?.currentItem?.asset {
let audioMixInputParameters = AVMutableAudioMixInputParameters(track: asset.tracks(withMediaType: .audio).first)
audioMixInputParameters.setVolume(Float(volume ?? 1.0), at: .zero)
audioMix.inputParameters = [audioMixInputParameters]
self.additionalPlayers.first?.currentItem?.audioMix = audioMix
if let trackId {
if let index = self.playerIndexForTrackId(trackId), index < self.additionalPlayerAudioMixes.count && index < self.additionalPlayers.count, let asset = self.additionalPlayers[index].currentItem?.asset {
let audioMix = self.additionalPlayerAudioMixes[index]
let audioMixInputParameters = AVMutableAudioMixInputParameters(track: asset.tracks(withMediaType: .audio).first)
audioMixInputParameters.setVolume(Float(volume ?? 1.0), at: .zero)
audioMix.inputParameters = [audioMixInputParameters]
self.additionalPlayers[index].currentItem?.audioMix = audioMix
}
} else {
if let audioMix = self.additionalPlayerAudioMixes.first, let asset = self.additionalPlayers.first?.currentItem?.asset {
let audioMixInputParameters = AVMutableAudioMixInputParameters(track: asset.tracks(withMediaType: .audio).first)
audioMixInputParameters.setVolume(Float(volume ?? 1.0), at: .zero)
audioMix.inputParameters = [audioMixInputParameters]
self.additionalPlayers.first?.currentItem?.audioMix = audioMix
}
}
}

14
submodules/TelegramUI/Components/MediaScrubberComponent/Sources/MediaScrubberComponent.swift
View File

@ -1091,17 +1091,17 @@ private class TrackView: UIView, UIScrollViewDelegate, UIGestureRecognizerDelega
self.videoTransparentFramesContainer.layer.cornerRadius = framesCornerRadius
self.videoOpaqueFramesContainer.layer.cornerRadius = framesCornerRadius
let scrubberSize = CGSize(width: availableSize.width, height: isSelected ? fullTrackHeight : collapsedTrackHeight)
var screenSpanDuration = duration
if track.isAudio && track.isMain {
if track.isAudio && track.isMain && !track.isTimeline {
screenSpanDuration = min(30.0, track.duration)
}
let minimalAudioWidth = handleWidth * 2.0
var containerTotalWidth = scrubberSize.width
if track.isAudio || !track.isMain, screenSpanDuration > 0.0 {
if !track.isTimeline, track.isAudio || !track.isMain, screenSpanDuration > 0.0 {
let trackFraction = track.duration / screenSpanDuration
if trackFraction < 1.0 - .ulpOfOne || trackFraction > 1.0 + .ulpOfOne {
containerTotalWidth = max(minimalAudioWidth, ceil(availableSize.width * trackFraction))
@ -1765,4 +1765,12 @@ private extension MediaScrubberComponent.Track {
return false
}
}
var isTimeline: Bool {
if case let .audio(_, _, _, _, isTimeline) = self {
return isTimeline
} else {
return false
}
}
}