-
Notifications
You must be signed in to change notification settings - Fork 12
AudioVisualizer component (Bars) #14
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
Merged
Merged
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
334bb2a
Implement
hiroshihorie 9052e3d
centered
hiroshihorie 8f16612
barSpacingFactor
hiroshihorie 134376a
Optimize
hiroshihorie ddbda58
adjustments
hiroshihorie 8b35e3d
Move code from sdk
hiroshihorie e8372fe
Docs
hiroshihorie 5c96db9
Require 2.0.17
hiroshihorie 506c719
Merge branch 'main' into hiroshi/audio-visualizer
hiroshihorie 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 hidden or 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 hidden or 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,93 @@ | ||
| /* | ||
| * Copyright 2024 LiveKit | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| import AVFoundation | ||
| import LiveKit | ||
| import SwiftUI | ||
|
|
||
| class AudioProcessor: ObservableObject, AudioRenderer { | ||
| private weak var _track: AudioTrack? | ||
| // Normalized to 0.0-1.0 range. | ||
| @Published var bands: [Float] = [] | ||
|
|
||
| private let _processor: AudioVisualizeProcessor | ||
|
|
||
| init(track: AudioTrack?, bandCount: Int, isCentered: Bool) { | ||
| _processor = AudioVisualizeProcessor(bandsCount: bandCount, isCentered: isCentered) | ||
| _track = track | ||
| _track?.add(audioRenderer: self) | ||
| } | ||
|
|
||
| deinit { | ||
| _track?.remove(audioRenderer: self) | ||
| } | ||
|
|
||
| func render(pcmBuffer: AVAudioPCMBuffer) { | ||
| let bands = _processor.process(pcmBuffer: pcmBuffer) | ||
| guard let bands else { return } | ||
| DispatchQueue.main.async { [weak self] in | ||
| self?.bands = bands | ||
| } | ||
| } | ||
| } | ||
|
|
||
| struct BarAudioVisualizer: View { | ||
| public let barCount: Int | ||
| public let barColor: Color | ||
| public let barCornerRadius: CGFloat | ||
| public let barSpacingFactor: CGFloat | ||
| public let isCentered: Bool | ||
|
|
||
| public let audioTrack: AudioTrack | ||
|
|
||
| @StateObject private var audioProcessor: AudioProcessor | ||
|
|
||
| init(audioTrack: AudioTrack, | ||
| barColor: Color = .white, | ||
| barCount: Int = 7, | ||
| barCornerRadius: CGFloat = 100, | ||
| barSpacingFactor: CGFloat = 0.015, | ||
| isCentered: Bool = true) | ||
| { | ||
| self.audioTrack = audioTrack | ||
| self.barColor = barColor | ||
| self.barCount = barCount | ||
| self.barCornerRadius = barCornerRadius | ||
| self.barSpacingFactor = barSpacingFactor | ||
| self.isCentered = isCentered | ||
|
|
||
| _audioProcessor = StateObject(wrappedValue: AudioProcessor(track: audioTrack, | ||
| bandCount: barCount, | ||
| isCentered: isCentered)) | ||
| } | ||
|
|
||
| var body: some View { | ||
| GeometryReader { geometry in | ||
| HStack(alignment: .center, spacing: geometry.size.width * barSpacingFactor) { | ||
| ForEach(0 ..< audioProcessor.bands.count, id: \.self) { index in | ||
| VStack { | ||
| Spacer() | ||
| RoundedRectangle(cornerRadius: barCornerRadius) | ||
| .fill(barColor.opacity(Double(audioProcessor.bands[index]))) | ||
| .frame(height: CGFloat(audioProcessor.bands[index]) * geometry.size.height) | ||
| Spacer() | ||
| } | ||
| } | ||
| } | ||
| } | ||
| .padding() | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
can you add doc strings to this class? What does isCentered do? I expected it to be used in the UI but it looks like it's just used in the AudioProcessor?
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.
Good point, maybe I should move it to the UI.
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.
Docs have been added.