-
-
Notifications
You must be signed in to change notification settings - Fork 618
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Support for multi-channel audio streaming #1273
Merged
shogo4405
merged 2 commits into
shogo4405:main
from
stream-labs:feature/multichannel-audio
Aug 29, 2023
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| // | ||
| // Created by Lev Sokolov on 2023-08-24. | ||
| // Copyright (c) 2023 Shogo Endo. All rights reserved. | ||
| // | ||
|
|
||
| import AVFoundation | ||
|
|
||
| extension AVAudioFormat { | ||
| public override var description: String { | ||
| var descriptionParts: [String] = [] | ||
|
|
||
| descriptionParts.append("Sample Rate: \(sampleRate) Hz") | ||
| descriptionParts.append("Channels: \(channelCount)") | ||
|
|
||
| if let channelLayout = channelLayout { | ||
| descriptionParts.append("Channel Layout: \(channelLayout.layout.readableDescription)") | ||
| } | ||
|
|
||
| descriptionParts.append("Format: \(commonFormat.readableDescription)") | ||
| descriptionParts.append(isInterleaved ? "Interleaved" : "Non-interleaved") | ||
| descriptionParts.append(isStandard ? "Standard" : "Non-standard") | ||
|
|
||
| if let audioFormatID = audioFormatID { | ||
| descriptionParts.append("AudioFormatID: \(audioFormatID.audioFormatIDDescription) (\(audioFormatID))") | ||
| } | ||
|
|
||
| descriptionParts.append("Settings: \(settings)") | ||
|
|
||
| return descriptionParts.joined(separator: ", ") | ||
| } | ||
|
|
||
| var audioFormatID: AudioFormatID? { | ||
| guard let formatIDValue = settings[AVFormatIDKey] as? NSNumber else { | ||
| return nil | ||
| } | ||
| return AudioFormatID(formatIDValue.uint32Value) | ||
| } | ||
| } | ||
|
|
||
|
|
||
| extension UnsafePointer<AudioChannelLayout> { | ||
| var readableDescription: String { | ||
| let layout = pointee | ||
| let channelTag = layout.mChannelLayoutTag | ||
| let bitmap = layout.mChannelBitmap | ||
| let numberChannelDescriptions = layout.mNumberChannelDescriptions | ||
| let channelDescriptions = channelDescriptions | ||
| let channelLabels = channelDescriptions.map { $0.mChannelLabel } | ||
| return "tag: \(channelTag), bitmap: \(bitmap), channels: \(numberChannelDescriptions), channelLabels: \(channelLabels)" | ||
| } | ||
|
|
||
| var channelDescriptions: [AudioChannelDescription] { | ||
| var mutablePointee = UnsafeMutablePointer(mutating: self).pointee | ||
| let numberOfDescriptions = Int(mutablePointee.mNumberChannelDescriptions) | ||
| return withUnsafePointer(to: &mutablePointee.mChannelDescriptions) { start in | ||
| let descriptionsPointer = UnsafeBufferPointer<AudioChannelDescription>(start: start, count: numberOfDescriptions) | ||
| return (0..<numberOfDescriptions).map { | ||
| descriptionsPointer[$0] | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extension AVAudioCommonFormat { | ||
| public var readableDescription: String { | ||
| switch self { | ||
| case .pcmFormatFloat32: return "float32" | ||
| case .pcmFormatFloat64: return "float64" | ||
| case .pcmFormatInt16: return "int16" | ||
| case .pcmFormatInt32: return "int32" | ||
| case .otherFormat: return "other" | ||
| @unknown default: return "unknown" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extension AudioFormatID { | ||
| public var audioFormatIDDescription: String { | ||
| switch self { | ||
| case kAudioFormatAC3: return "kAudioFormatAC3" | ||
| case kAudioFormatAES3: return "kAudioFormatAES3" | ||
| case kAudioFormatALaw: return "kAudioFormatALaw" | ||
| case kAudioFormatAMR: return "kAudioFormatAMR" | ||
| case kAudioFormatAMR_WB: return "kAudioFormatAMR_WB" | ||
| case kAudioFormatAppleIMA4: return "kAudioFormatAppleIMA4" | ||
| case kAudioFormatAppleLossless: return "kAudioFormatAppleLossless" | ||
| case kAudioFormatAudible: return "kAudioFormatAudible" | ||
| case kAudioFormatDVIIntelIMA: return "kAudioFormatDVIIntelIMA" | ||
| case kAudioFormatEnhancedAC3: return "kAudioFormatEnhancedAC3" | ||
| case kAudioFormatFLAC: return "kAudioFormatFLAC" | ||
| case kAudioFormatLinearPCM: return "kAudioFormatLinearPCM" | ||
| case kAudioFormatMACE3: return "kAudioFormatMACE3" | ||
| case kAudioFormatMACE6: return "kAudioFormatMACE6" | ||
| case kAudioFormatMIDIStream: return "kAudioFormatMIDIStream" | ||
| case kAudioFormatMPEG4AAC: return "kAudioFormatMPEG4AAC" | ||
| case kAudioFormatMPEG4AAC_ELD: return "kAudioFormatMPEG4AAC_ELD" | ||
| case kAudioFormatMPEG4AAC_ELD_SBR: return "kAudioFormatMPEG4AAC_ELD_SBR" | ||
| case kAudioFormatMPEG4AAC_ELD_V2: return "kAudioFormatMPEG4AAC_ELD_V2" | ||
| case kAudioFormatMPEG4AAC_HE: return "kAudioFormatMPEG4AAC_HE" | ||
| case kAudioFormatMPEG4AAC_HE_V2: return "kAudioFormatMPEG4AAC_HE_V2" | ||
| case kAudioFormatMPEG4AAC_LD: return "kAudioFormatMPEG4AAC_LD" | ||
| case kAudioFormatMPEG4AAC_Spatial: return "kAudioFormatMPEG4AAC_Spatial" | ||
| case kAudioFormatMPEG4CELP: return "kAudioFormatMPEG4CELP" | ||
| case kAudioFormatMPEG4HVXC: return "kAudioFormatMPEG4HVXC" | ||
| case kAudioFormatMPEG4TwinVQ: return "kAudioFormatMPEG4TwinVQ" | ||
| case kAudioFormatMPEGD_USAC: return "kAudioFormatMPEGD_USAC" | ||
| case kAudioFormatMPEGLayer1: return "kAudioFormatMPEGLayer1" | ||
| case kAudioFormatMPEGLayer2: return "kAudioFormatMPEGLayer2" | ||
| case kAudioFormatMPEGLayer3: return "kAudioFormatMPEGLayer3" | ||
| case kAudioFormatMicrosoftGSM: return "kAudioFormatMicrosoftGSM" | ||
| case kAudioFormatOpus: return "kAudioFormatOpus" | ||
| case kAudioFormatParameterValueStream: return "kAudioFormatParameterValueStream" | ||
| case kAudioFormatQDesign: return "kAudioFormatQDesign" | ||
| case kAudioFormatQDesign2: return "kAudioFormatQDesign2" | ||
| case kAudioFormatQUALCOMM: return "kAudioFormatQUALCOMM" | ||
| case kAudioFormatTimeCode: return "kAudioFormatTimeCode" | ||
| case kAudioFormatULaw: return "kAudioFormatULaw" | ||
| case kAudioFormatiLBC: return "kAudioFormatiLBC" | ||
| default: return "unknown" | ||
| } | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😅