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

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin
2024-11-29 14:40:02 +04:00
parent 27ae29592b
commit 06defbb3f6
3 changed files with 84 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorVideoExport.swift
View File

@@ -216,6 +216,7 @@ public final class MediaEditorVideoExport {
}
var skippingUpdate = false
var initialized = false
}
private var additionalVideoOutput: [Int: VideoOutput] = [:]
@@ -761,10 +762,32 @@ public final class MediaEditorVideoExport {
for i in 0 ..< self.additionalVideoOutput.count {
if let additionalVideoOutput = self.additionalVideoOutput[i] {
if let mainTimestamp, mainTimestamp < additionalVideoOutput.startTime {
if !self.configuration.values.collage.isEmpty && !additionalVideoOutput.initialized {
additionalVideoOutput.initialized = true
if case let .videoOutput(videoOutput) = additionalVideoOutput.output {
if let _ = videoOutput.copyNextSampleBuffer(), let sampleBuffer = videoOutput.copyNextSampleBuffer() {
if let pixelBuffer = CMSampleBufferGetImageBuffer(sampleBuffer) {
additionalInput.append(.videoBuffer(VideoPixelBuffer(
pixelBuffer: pixelBuffer,
rotation: additionalVideoOutput.textureRotation,
timestamp: .zero
), additionalVideoOutput.rect))
} else {
additionalInput.append(nil)
}
} else {
additionalInput.append(nil)
}
} else {
additionalInput.append(nil)
}
} else {
additionalInput.append(nil)
}
} else {
if additionalVideoOutput.skippingUpdate {
additionalVideoOutput.skippingUpdate = false
additionalInput.append(nil)
} else {
switch additionalVideoOutput.output {
case let .image(image):
@@ -787,6 +810,8 @@ public final class MediaEditorVideoExport {
self.statusValue = .progress(Float(progress))
updatedProgress = true
}
} else {
additionalInput.append(nil)
}
if let mainComposeFramerate = self.mainComposeFramerate {
let additionalFrameRate = round(additionalVideoOutput.frameRate / 30.0) * 30.0
@@ -794,7 +819,9 @@ public final class MediaEditorVideoExport {
additionalVideoOutput.skippingUpdate = true
}
}
}
} else {
additionalInput.append(nil)
}
}
}
}