3-group-ios/VPCamera3
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去掉无用的异步调用

Browse Source
This commit is contained in:
bluesea 2024-03-11 16:29:24 +08:00
parent 2d3a61b543
commit 2856b13cbe
2 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SwiftProject/SwiftProject/Project/Util/SpatialVideoConvertor.swift
View File

@ -176,17 +176,14 @@ class SpatialVideoConvertor {
} }
let vw2 = vw! vw!.addAudio(assetTrackOutput: output_audio)
await vw!.addAudio(assetTrackOutput: output_audio){
_ = try! await vw2.finish()
}
print( "status - \(assetReader.status)") print( "status - \(assetReader.status)")
print( "status - \(assetReader.error?.localizedDescription ?? "None")") print( "status - \(assetReader.error?.localizedDescription ?? "None")")
print( "Finished") print( "Finished")
// _ = try await vw!.finish() _ = try await vw!.finish()
} }

16
SwiftProject/SwiftProject/Project/Util/VideoWriter.swift
View File

@ -55,13 +55,6 @@ class VideoWriter {
// 创建音频输入 // 创建音频输入
// let outputSettings_Audio:[String:Any] = [
// AVNumberOfChannelsKey: 2,
// AVSampleRateKey: 44100,
// AVFormatIDKey:kAudioFormatMPEG4AAC,
// AVEncoderAudioQualityKey: AVAudioQuality.min.rawValue
// ]
let outputSettings_Audio = [ let outputSettings_Audio = [
AVFormatIDKey: kAudioFormatLinearPCM, // 指定未压缩格式 AVFormatIDKey: kAudioFormatLinearPCM, // 指定未压缩格式
AVSampleRateKey: 44100, AVSampleRateKey: 44100,
@ -72,12 +65,10 @@ class VideoWriter {
AVLinearPCMIsNonInterleaved:false, AVLinearPCMIsNonInterleaved:false,
] as [String:Any] ] as [String:Any]
// self.writerInput_Audio = AVAssetWriterInput(mediaType: AVMediaType.audio, outputSettings: outputSettings_Audio)
// let outputSettings_Audio = AVOutputSettingsAssistant.init(preset: .preset1920x1080)?.audioSettings
self.writerInput_Audio = AVAssetWriterInput.init(mediaType: .audio, outputSettings: outputSettings_Audio) self.writerInput_Audio = AVAssetWriterInput.init(mediaType: .audio, outputSettings: outputSettings_Audio)
self.writerInput_Audio.expectsMediaDataInRealTime = false self.writerInput_Audio.expectsMediaDataInRealTime = false
// self.writerInput_Audio.
if writer.canAdd(self.writerInput_Audio) { if writer.canAdd(self.writerInput_Audio) {
writer.add(self.writerInput_Audio) writer.add(self.writerInput_Audio)
print("writer 添加input audio成功...") print("writer 添加input audio成功...")
@ -99,8 +90,7 @@ class VideoWriter {
self.writerInput = input self.writerInput = input
} }
//追加音频 //追加音频
func addAudio(assetTrackOutput:AVAssetReaderTrackOutput,callback:@escaping @Sendable () async -> Void) async { func addAudio(assetTrackOutput:AVAssetReaderTrackOutput) {
// self.writerInput_Audio.requestMediaDataWhenReady(on: DispatchQueue.main) {
while let sample = assetTrackOutput.copyNextSampleBuffer() { while let sample = assetTrackOutput.copyNextSampleBuffer() {
print("audio read buffer....") print("audio read buffer....")
let formatDesc:CMFormatDescription = CMSampleBufferGetFormatDescription(sample)! let formatDesc:CMFormatDescription = CMSampleBufferGetFormatDescription(sample)!
@ -123,8 +113,6 @@ class VideoWriter {
print("不是audio类型...") print("不是audio类型...")
} }
} }
print("audio读取完毕。。。。")
await callback()
print("audio func 执行完毕。。。。...") print("audio func 执行完毕。。。。...")
} }