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

Fix story audio volume setup

Browse Source
This commit is contained in:
Ilya Laktyushin 2023-09-03 21:42:34 +04:00
parent 9a934d874b
commit 7500ef7dea
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -382,6 +382,8 @@ public final class MediaEditorVideoExport {
private func setupWithAsset(_ asset: AVAsset, additionalAsset: AVAsset?) {
var inputAsset = asset
var inputAudioMix: AVMutableAudioMix?
if let audioData = self.configuration.values.audioTrack {
let mixComposition = AVMutableComposition()
let audioPath = fullDraftPath(peerId: self.configuration.values.peerId, path: audioData.path)
@ -398,10 +400,10 @@ public final class MediaEditorVideoExport {
return
}
let timeRange: CMTimeRange = CMTimeRangeMake(start: .zero, duration: duration)
try? videoTrack.insertTimeRange(timeRange, of: videoAssetTrack, at: .zero)
if let audioAssetTrack = asset.tracks(withMediaType: .audio).first, let audioTrack = mixComposition.addMutableTrack(withMediaType: .audio, preferredTrackID: kCMPersistentTrackID_Invalid), !self.configuration.values.videoIsMuted {
try? audioTrack.insertTimeRange(timeRange, of: audioAssetTrack, at: .zero)
}
@ -412,6 +414,17 @@ public final class MediaEditorVideoExport {
}
try? musicTrack.insertTimeRange(musicRange, of: musicAssetTrack, at: self.configuration.audioStartTime)
if let volume = self.configuration.values.audioTrackVolume, volume < 1.0 {
let audioMix = AVMutableAudioMix()
var audioMixParam: [AVMutableAudioMixInputParameters] = []
let param: AVMutableAudioMixInputParameters = AVMutableAudioMixInputParameters(track: musicTrack)
param.trackID = musicTrack.trackID
param.setVolume(Float(volume), at: CMTime.zero)
audioMixParam.append(param)
audioMix.inputParameters = audioMixParam
inputAudioMix = audioMix
}
inputAsset = mixComposition
}
@ -503,6 +516,7 @@ public final class MediaEditorVideoExport {
let audioTracks = inputAsset.tracks(withMediaType: .audio)
if audioTracks.count > 0, !self.configuration.values.videoIsMuted || self.configuration.values.audioTrack != nil {
let audioOutput = AVAssetReaderAudioMixOutput(audioTracks: audioTracks, audioSettings: nil)
audioOutput.audioMix = inputAudioMix
audioOutput.alwaysCopiesSampleData = false
if reader.canAdd(audioOutput) {
reader.add(audioOutput)