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

Camera and editor improvements

Browse Source
This commit is contained in:
Ilya Laktyushin
2023-05-15 15:12:51 +04:00
parent 37e7a74e4e
commit a2d7cfba4f
39 changed files with 1877 additions and 1338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@ import Foundation
import AVFoundation
import MetalKit
import SwiftSignalKit
import AccountContext
enum ExportWriterStatus {
case unknown
@@ -239,6 +240,7 @@ public final class MediaEditorVideoExport {
public private(set) var internalStatus: Status = .idle
private let context: AccountContext
private let subject: Subject
private let configuration: Configuration
private let outputPath: String
@@ -262,7 +264,10 @@ public final class MediaEditorVideoExport {
private var startTimestamp = CACurrentMediaTime()
public init(subject: Subject, configuration: Configuration, outputPath: String) {
private let semaphore = DispatchSemaphore(value: 0)
public init(context: AccountContext, subject: Subject, configuration: Configuration, outputPath: String) {
self.context = context
self.subject = subject
self.configuration = configuration
self.outputPath = outputPath
@@ -284,7 +289,7 @@ public final class MediaEditorVideoExport {
}
if self.configuration.values.requiresComposing {
self.composer = MediaEditorComposer(values: self.configuration.values, dimensions: self.configuration.dimensions)
self.composer = MediaEditorComposer(context: self.context, values: self.configuration.values, dimensions: self.configuration.dimensions)
}
self.setupVideoInput()
}
@@ -336,7 +341,7 @@ public final class MediaEditorVideoExport {
}
let audioTracks = asset.tracks(withMediaType: .audio)
if audioTracks.count > 0 {
if audioTracks.count > 0, !self.configuration.values.videoIsMuted {
let audioOutput = AVAssetReaderAudioMixOutput(audioTracks: audioTracks, audioSettings: nil)
audioOutput.alwaysCopiesSampleData = false
if reader.canAdd(audioOutput) {
@@ -420,28 +425,40 @@ public final class MediaEditorVideoExport {
return false
}
var appendFailed = false
while writer.isReadyForMoreVideoData {
let _ = self.composer?.semaphore.wait(timeout: .distantFuture)
if appendFailed {
return false
}
if reader.status != .reading || writer.status != .writing {
writer.markVideoAsFinished()
return false
}
self.pauseDispatchGroup.wait()
if let buffer = output.copyNextSampleBuffer() {
if let pixelBuffer = self.composer?.processSampleBuffer(buffer, pool: writer.pixelBufferPool) {
if let composer = self.composer {
let timestamp = CMSampleBufferGetPresentationTimeStamp(buffer)
if !writer.appendPixelBuffer(pixelBuffer, at: timestamp) {
writer.markVideoAsFinished()
return false
}
composer.processSampleBuffer(buffer, pool: writer.pixelBufferPool, completion: { pixelBuffer in
if let pixelBuffer {
if !writer.appendPixelBuffer(pixelBuffer, at: timestamp) {
writer.markVideoAsFinished()
appendFailed = true
}
} else {
if !writer.appendVideoBuffer(buffer) {
writer.markVideoAsFinished()
appendFailed = true
}
}
self.semaphore.signal()
})
self.semaphore.wait()
} else {
if !writer.appendVideoBuffer(buffer) {
writer.markVideoAsFinished()
return false
}
}
// let progress = (CMSampleBufferGetPresentationTimeStamp(buffer) - self.configuration.timeRange.start).seconds/self.duration.seconds
// if self.videoOutput === output {
// self.dispatchProgressCallback { $0.updateVideoEncodingProgress(fractionCompleted: progress) }