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

完全实现音频正常合并进入视频，关键点在于isRealTime需要设置为true

Browse Source
This commit is contained in:
bluesea 2024-03-11 16:18:43 +08:00
parent 44e71b472c
commit 2d3a61b543
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRVideoTransformController.swift
View File

@ -592,7 +592,7 @@ extension VRVideoTransformController {
print(progress) print(progress)
// DispatchQueue.main.async { [weak self] in // DispatchQueue.main.async { [weak self] in
if(progress > 0.99){ if(progress > 0.99){
DispatchQueue.main.asyncAfter(deadline: .now() + 2) { DispatchQueue.main.asyncAfter(deadline: .now() + 20) {
// 要执行的任务 // 要执行的任务
self.exportVideo(url: outputVideoURL, outputURL: outputURL, width: width, height: height,codecType:codecType, dataRate: dataRate, horizontalDisparity: horizontalDisparity, horizontalFieldOfView: horizontalFieldOfView) { exportedAsset in self.exportVideo(url: outputVideoURL, outputURL: outputURL, width: width, height: height,codecType:codecType, dataRate: dataRate, horizontalDisparity: horizontalDisparity, horizontalFieldOfView: horizontalFieldOfView) { exportedAsset in
DispatchQueue.main.async { DispatchQueue.main.async {

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

@ -161,8 +161,8 @@ class SpatialVideoConvertor {
let time = CMSampleBufferGetOutputPresentationTimeStamp(nextSampleBuffer) let time = CMSampleBufferGetOutputPresentationTimeStamp(nextSampleBuffer)
if vw == nil { if vw == nil {
vw = VideoWriter(url: outputFile, width: Int(cwidth), height: Int(cheight), orientation: orientation, sessionStartTime: CMTime(value: 1, timescale: 30 ), isRealTime: false, queue: .main) // vw = VideoWriter(url: outputFile, width: Int(cwidth), height: Int(cheight), orientation: orientation, sessionStartTime: CMTime(value: 1, timescale: 30 ), isRealTime: true, queue: .main)
// vw = VideoWriter(url: outputFile, width: Int(cwidth), height: Int(cheight), orientation: orientation, sessionStartTime: CMTimeMake(value: 0, timescale: 1), isRealTime: false, queue: .main) vw = VideoWriter(url: outputFile, width: Int(cwidth), height: Int(cheight), orientation: orientation, sessionStartTime: CMTimeMake(value: 0, timescale: 1), isRealTime: true, queue: .main)
} }
_ = vw!.add(image: newpb!, presentationTime: time) _ = vw!.add(image: newpb!, presentationTime: time)
print( "Added frame at \(time)") print( "Added frame at \(time)")
@ -176,17 +176,17 @@ class SpatialVideoConvertor {
} }
// let vw2 = vw! let vw2 = vw!
// await vw!.addAudio(assetTrackOutput: output_audio){ await vw!.addAudio(assetTrackOutput: output_audio){
// _ = try! await vw2.finish() _ = 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()
} }

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

@ -56,10 +56,10 @@ class VideoWriter {
// 创建音频输入 // 创建音频输入
// let outputSettings_Audio:[String:Any] = [ // let outputSettings_Audio:[String:Any] = [
// AVFormatIDKey:kAudioFormatLinearPCM, // AVNumberOfChannelsKey: 2,
// AVLinearPCMIsBigEndianKey:false, // AVSampleRateKey: 44100,
// AVLinearPCMIsFloatKey:false, // AVFormatIDKey:kAudioFormatMPEG4AAC,
// AVLinearPCMBitDepthKey:16, // AVEncoderAudioQualityKey: AVAudioQuality.min.rawValue
// ] // ]
let outputSettings_Audio = [ let outputSettings_Audio = [
@ -122,10 +122,7 @@ class VideoWriter {
else { else {
print("不是audio类型...") print("不是audio类型...")
} }
try! await Task.sleep(nanoseconds: 200_000_000)
} }
// }
print("audio读取完毕。。。。") print("audio读取完毕。。。。")
await callback() await callback()
print("audio func 执行完毕。。。。...") print("audio func 执行完毕。。。。...")
@ -168,7 +165,6 @@ class VideoWriter {
func finish() async throws -> AVAsset? { func finish() async throws -> AVAsset? {
print("开始调用finish...") print("开始调用finish...")
// return nil
writerInput_Audio.markAsFinished() writerInput_Audio.markAsFinished()
writerInput.markAsFinished() writerInput.markAsFinished()
print("VideoWriter: calling writer.finishWriting()") print("VideoWriter: calling writer.finishWriting()")